diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-06-08 19:28:13 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-06-08 19:28:13 (GMT) |
| commit | 9789185e36be41ee82024ce462f29901a7cc1a76 (patch) | |
| tree | 4f6e5bbb549b399741aff718f4184ed883749bdd /Tools | |
| parent | c6a66ccb067778a9ade6574f979f80155974cf38 (diff) | |
| download | cpython-9789185e36be41ee82024ce462f29901a7cc1a76.zip cpython-9789185e36be41ee82024ce462f29901a7cc1a76.tar.gz cpython-9789185e36be41ee82024ce462f29901a7cc1a76.tar.bz2 | |
Issue #21683: Add Tix build to the Windows buildbot scripts.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/buildbot/external-amd64.bat | 9 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 4 | ||||
| -rw-r--r-- | Tools/buildbot/external.bat | 8 |
3 files changed, 19 insertions, 2 deletions
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat index 3ee125e..acd454e 100644 --- a/Tools/buildbot/external-amd64.bat +++ b/Tools/buildbot/external-amd64.bat @@ -12,10 +12,17 @@ if not exist tcltk64\bin\tcl86tg.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=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 ..\.. ) +if not exist tcltk64\lib\tix8.4.3\tix84g.dll ( + cd tix-8.4.3.4\win + nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 clean + nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 all + nmake -f python.mak DEBUG=1 MACHINE=AMD64 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk64 install + cd ..\.. +) diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index ebee25a..f3e2205 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -9,9 +9,10 @@ cd .. @rem if exist tcltk64 rd /s/q tcltk64 @rem if exist tcl-8.6.1.0 rd /s/q tcl-8.6.1.0 @rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0 +@rem if exist tix-8.4.3.4 rd /s/q tix-8.4.3.4 @rem if exist db-4.4.20 rd /s/q db-4.4.20 @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h -@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12 +@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12 @rem bzip if not exist bzip2-1.0.6 ( @@ -31,6 +32,7 @@ if not exist tcl-8.6.1.0 ( svn export http://svn.python.org/projects/external/tcl-8.6.1.0 ) if not exist tk-8.6.1.0 svn export http://svn.python.org/projects/external/tk-8.6.1.0 +if not exist tix-8.4.3.4 svn export http://svn.python.org/projects/external/tix-8.4.3.4 @rem sqlite3 if not exist sqlite-3.8.3.1 ( diff --git a/Tools/buildbot/external.bat b/Tools/buildbot/external.bat index 2365160..3877d8d 100644 --- a/Tools/buildbot/external.bat +++ b/Tools/buildbot/external.bat @@ -19,3 +19,11 @@ if not exist tcltk\bin\tk86tg.dll ( nmake -f makefile.vc OPTS=symbols INSTALLDIR=..\..\tcltk TCLDIR=..\..\tcl-8.6.1.0 install-binaries install-libraries cd ..\.. ) + +if not exist tcltk\lib\tix8.4.3\tix84g.dll ( + cd tix-8.4.3.4\win + nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk clean + nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk all + nmake -f python.mak DEBUG=1 MACHINE=IX86 TCL_DIR=..\..\tcl-8.6.1.0 TK_DIR=..\..\tk-8.6.1.0 INSTALL_DIR=..\..\tcltk install + cd ..\.. +) |