diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-06-05 16:44:22 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-06-05 16:44:22 (GMT) |
| commit | 4a01fd2d65c8db3b9c66aa523673c994731e8517 (patch) | |
| tree | fadf92cde61c056b695c21bd2c00333ca515c641 | |
| parent | f9e49dd346711dff6d4301a2edc0ca23f7f12b6f (diff) | |
| download | cpython-4a01fd2d65c8db3b9c66aa523673c994731e8517.zip cpython-4a01fd2d65c8db3b9c66aa523673c994731e8517.tar.gz cpython-4a01fd2d65c8db3b9c66aa523673c994731e8517.tar.bz2 | |
Clean up Tcl/Tk building in the Windows buildbot scripts.
- Nix the 'noxp' option, it was for Win2k compatibility (which was dropped
with Python 3.3) and made default ttk ugly on post-Win2k systems (#21665)
- Use 'OPTS=symbols' instead of 'DEBUG=1'; symbols is the official method
- Use core, shell, dlls, install-binaries, and install-libraries targets
instead of all and install to avoid trying to 1) build packages that don't
work with MSVC 10+ and 2) install unnecessary bits and pieces.
| -rw-r--r-- | Tools/buildbot/external-amd64.bat | 10 | ||||
| -rw-r--r-- | Tools/buildbot/external.bat | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat index 4c3b67b..3ee125e 100644 --- a/Tools/buildbot/external-amd64.bat +++ b/Tools/buildbot/external-amd64.bat @@ -6,16 +6,16 @@ call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 if not exist tcltk64\bin\tcl86tg.dll ( cd tcl-8.6.1.0\win - nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all - nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install + nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean core shell dlls + nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install-binaries install-libraries cd ..\.. ) if not exist tcltk64\bin\tk86tg.dll ( cd tk-8.6.1.0\win - nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 clean - nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 all - nmake -f makefile.vc OPTS=noxp DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install + nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 clean + nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 all + nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries cd ..\.. ) diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat index c580a14..2365160 100644 --- a/Tools/buildbot/external.bat +++ b/Tools/buildbot/external.bat @@ -7,15 +7,15 @@ call "%VS100COMNTOOLS%\vsvars32.bat" if not exist tcltk\bin\tcl86tg.dll ( @rem all and install need to be separate invocations, otherwise nmakehlp is not found on install cd tcl-8.6.1.0\win - nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk clean all - nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install + nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk clean core shell dlls + nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk install-binaries install-libraries cd ..\.. ) if not exist tcltk\bin\tk86tg.dll ( cd tk-8.6.1.0\win - nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 clean - nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 all - nmake -f makefile.vc OPTS=noxp DEBUG=1 INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install + nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 clean + nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 all + nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries cd ..\.. ) |