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.
This commit is contained in:
parent
f9e49dd346
commit
4a01fd2d65
|
@ -6,16 +6,16 @@ call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64
|
||||||
|
|
||||||
if not exist tcltk64\bin\tcl86tg.dll (
|
if not exist tcltk64\bin\tcl86tg.dll (
|
||||||
cd tcl-8.6.1.0\win
|
cd tcl-8.6.1.0\win
|
||||||
nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean all
|
nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 clean core shell dlls
|
||||||
nmake -f makefile.vc DEBUG=1 MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install
|
nmake -f makefile.vc OPTS=symbols MACHINE=AMD64 INSTALLDIR=..\..\tcltk64 install-binaries install-libraries
|
||||||
cd ..\..
|
cd ..\..
|
||||||
)
|
)
|
||||||
|
|
||||||
if not exist tcltk64\bin\tk86tg.dll (
|
if not exist tcltk64\bin\tk86tg.dll (
|
||||||
cd tk-8.6.1.0\win
|
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=symbols 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=symbols 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 install-binaries install-libraries
|
||||||
cd ..\..
|
cd ..\..
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -7,15 +7,15 @@ call "%VS100COMNTOOLS%\vsvars32.bat"
|
||||||
if not exist tcltk\bin\tcl86tg.dll (
|
if not exist tcltk\bin\tcl86tg.dll (
|
||||||
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
|
@rem all and install need to be separate invocations, otherwise nmakehlp is not found on install
|
||||||
cd tcl-8.6.1.0\win
|
cd tcl-8.6.1.0\win
|
||||||
nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk clean all
|
nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk clean core shell dlls
|
||||||
nmake -f makefile.vc DEBUG=1 INSTALLDIR=..\..\tcltk install
|
nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk install-binaries install-libraries
|
||||||
cd ..\..
|
cd ..\..
|
||||||
)
|
)
|
||||||
|
|
||||||
if not exist tcltk\bin\tk86tg.dll (
|
if not exist tcltk\bin\tk86tg.dll (
|
||||||
cd tk-8.6.1.0\win
|
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=symbols 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=symbols 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 install-binaries install-libraries
|
||||||
cd ..\..
|
cd ..\..
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue