diff options
author | Tim Peters <tim.peters@gmail.com> | 2002-11-19 17:38:27 (GMT) |
---|---|---|
committer | Tim Peters <tim.peters@gmail.com> | 2002-11-19 17:38:27 (GMT) |
commit | a406b58619e3fd8fb26ced18ac64b475a48648d2 (patch) | |
tree | 924fb8019e2509f961e62397b418e6a22492e5e7 /PCbuild | |
parent | b9a21ad74d82095140fb522909039267d98dc3b7 (diff) | |
download | cpython-a406b58619e3fd8fb26ced18ac64b475a48648d2.zip cpython-a406b58619e3fd8fb26ced18ac64b475a48648d2.tar.gz cpython-a406b58619e3fd8fb26ced18ac64b475a48648d2.tar.bz2 |
Renamed Wise vrbl from _TCLMINOR_ to _TCLDIR_, to remove any script
dependence on the Tcl/Tk version number. Now you point it at the
Tcl/Tk install you want to ship, and that's what it ships.
Diffstat (limited to 'PCbuild')
-rw-r--r-- | PCbuild/python20.wse | 28 | ||||
-rw-r--r-- | PCbuild/readme.txt | 14 |
2 files changed, 23 insertions, 19 deletions
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse index 89c3f05..bfc1e30 100644 --- a/PCbuild/python20.wse +++ b/PCbuild/python20.wse @@ -30,9 +30,11 @@ item: Global Variable Description1=WISE root directory Variable Default1=C:\PROGRAM FILES\WISE INSTALLMASTER 8.1 Variable Flags1=00001000 - Variable Name2=_TCLMINOR_ - Variable Description2=Tcl/Tk Minor Version (e.g. the "4" in "8.4.1") - Variable Default2=4 + Variable Name2=_TCLDIR_ + Variable Description2=The directory in which the Tcl/Tk installation + Variable Description2=lives. This must be a sibling of the Python + Variable Description2=directory. + Variable Default2=tcl84 Variable Flags2=00001000 Variable Name3=_DOC_ Variable Description3=The unpacked HTML doc directory. @@ -94,6 +96,14 @@ item: Remark end item: Remark end +item: Remark + Text=When the version of Tcl/Tk changes, the compiler vrbl +end +item: Remark + Text=_TCLDIR_ may also need to be changed. +end +item: Remark +end item: Set Variable Variable=APPTITLE Value=Python %PYVER_STRING% @@ -2048,19 +2058,13 @@ item: Remark Text=Tcl/Tk end item: Install File - Source=..\..\tcl84\bin\tcl8%_tclminor_%.dll - Destination=%MAINDIR%\DLLs\tcl8%_TCLMINOR_%.dll - Description=Tcl/Tk binaries and libraries - Flags=0000000000000010 -end -item: Install File - Source=..\..\tcl84\bin\tk8%_tclminor_%.dll - Destination=%MAINDIR%\DLLs\tk8%_TCLMINOR_%.dll + Source=..\..\%_tcldir_%\bin\*.dll + Destination=%MAINDIR%\DLLs Description=Tcl/Tk binaries and libraries Flags=0000000000000010 end item: Install File - Source=..\..\tcl84\lib\*.* + Source=..\..\%_tcldir_%\lib\*.* Destination=%MAINDIR%\tcl Description=Tcl/Tk binaries and libraries Flags=0000000100000010 diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 1f61ec3..f6e8fcd 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -97,13 +97,6 @@ _tkinter XXX Some tests failed in "nmake -f makefile.vc test". - XXX Should rename destination directory to something more generic - XXX then tcl84. But unless I can backport 8.4.1 to the 2.2 line - XXX too, I've got to be able to build using more than one Tcl/Tk - XXX release, and that effectively reserves the "tcl" directory name - XXX for the duration. Nothing that requires thought is going to - XXX work when it comes to release crunch times. - Build Tk -------- cd dist\tk8.4.1\win @@ -117,6 +110,13 @@ _tkinter XXX Our installer copies a lot of stuff out of the Tcl/Tk install XXX directory. Is all of that really needed for Python use of Tcl/Tk? + Make sure the installer matches + ------------------------------- + Ensure that the Wise compiler vrbl _TCLDIR_ is set to the name of + the common Tcl/Tk installation directory (tcl84 for the instructions + above). This is needed so the installer can copy various Tcl/Tk + files into the Python distribution. + zlib Python wrapper for the zlib compression library. Get the source code |