[Python-checkins] cpython (3.4): Clean up Tcl/Tk building in the Windows buildbot scripts.
zach.ware
python-checkins at python.org
Thu Jun 5 19:02:05 CEST 2014
http://hg.python.org/cpython/rev/baac4ea2901b
changeset: 91034:baac4ea2901b
branch: 3.4
parent: 91031:d1712437cab2
user: Zachary Ware <zachary.ware at gmail.com>
date: Thu Jun 05 11:44:22 2014 -0500
summary:
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.
files:
Tools/buildbot/external-amd64.bat | 10 +++++-----
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
--- a/Tools/buildbot/external-amd64.bat
+++ b/Tools/buildbot/external-amd64.bat
@@ -6,16 +6,16 @@
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
--- a/Tools/buildbot/external.bat
+++ b/Tools/buildbot/external.bat
@@ -7,15 +7,15 @@
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 ..\..
)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list