diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2014-03-22 03:58:19 (GMT) |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2014-03-22 03:58:19 (GMT) |
commit | a191b91a4373937e7545b92d875160a5f66a2f3e (patch) | |
tree | bb510e5b0885a8823deb00b4c5362b597eb74233 /PCbuild/rt.bat | |
parent | 04ea84a20da667e39790827b978b21732753bd91 (diff) | |
download | cpython-a191b91a4373937e7545b92d875160a5f66a2f3e.zip cpython-a191b91a4373937e7545b92d875160a5f66a2f3e.tar.gz cpython-a191b91a4373937e7545b92d875160a5f66a2f3e.tar.bz2 |
Issue #15968: Incorporated Tcl, Tk, and Tix builds into the Windows build
solution.
Currently, Tix is not built in Debug configuration.
This change also:
- simplifies some Tcl/Tk-related msbuild properties for _tkinter
- copies the Tcl and Tk DLLs into the build output directory, meaning
they will always be available after a build without having to copy
them manually or change PATH
- removes PCbuild/build_tkinter.py: the solution does the build without
needing to invoke Python (so Tcl/Tk/Tix can be built in parallel with
the rest of the build using the `/m` msbuild command line switch)
- removes an outdated README concerning building Tcl/Tk on AMD64
Diffstat (limited to 'PCbuild/rt.bat')
-rw-r--r-- | PCbuild/rt.bat | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat index 7129e20..3db0fb9 100644 --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat @@ -30,15 +30,13 @@ set prefix=.\ set suffix= set qmode= set dashO= -set tcltk=tcltk :CheckOpts if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts -if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts +if "%1"=="-x64" (set prefix=amd64) & shift & goto CheckOpts -PATH %PATH%;%~dp0..\..\%tcltk%\bin set exe=%prefix%\python%suffix% set cmd=%exe% %dashO% -Wd -E -bb ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 if defined qmode goto Qmode |