[Python-checkins] python/dist/src/PCbuild _tkinter.dsp,1.20,1.21 python.dsp,1.15,1.16 python20.wse,1.104,1.105 readme.txt,1.25,1.26
tim_one@users.sourceforge.net
tim_one@users.sourceforge.net
2002年11月14日 15:24:42 -0800
Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv7515/python/PCbuild
Modified Files:
_tkinter.dsp python.dsp python20.wse readme.txt
Log Message:
Windows changes to move from Tcl/Tk 8.3.2 to 8.4.1. I tested this by
running IDLE, and since I'm not a Tcl Guy I'm not sure what else to do.
Up to you! See XXX comments in PCbuild\readme.txt for cautions.
Also repaired typos in the new bz2-for-Windows instructions.
Index: _tkinter.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/_tkinter.dsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** _tkinter.dsp 23 Jul 2002 06:31:15 -0000 1.20
--- _tkinter.dsp 14 Nov 2002 23:24:40 -0000 1.21
***************
*** 45,49 ****
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
--- 45,49 ----
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\tcl84\include" /I "..\Include" /I "..\PC" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 55,59 ****
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 ..\..\tcl\lib\tk83.lib ..\..\tcl\lib\tcl83.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib"
# SUBTRACT LINK32 /pdb:none
--- 55,59 ----
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 ..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter_d.pyd" /pdbtype:sept /libpath:"C:\Program Files\Tcl\lib"
# SUBTRACT LINK32 /pdb:none
***************
*** 73,77 ****
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\tcl\include" /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 73,77 ----
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\tcl84\include" /I "..\Include" /I "..\PC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 83,87 ****
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 ..\..\tcl\lib\tk83.lib ..\..\tcl\lib\tcl83.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib"
# SUBTRACT LINK32 /pdb:none
--- 83,87 ----
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 ..\..\tcl84\lib\tk84.lib ..\..\tcl84\lib\tcl84.lib odbc32.lib odbccp32.lib user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib"
# SUBTRACT LINK32 /pdb:none
Index: python.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** python.dsp 10 Jul 2002 06:22:10 -0000 1.15
--- python.dsp 14 Nov 2002 23:24:40 -0000 1.16
***************
*** 5,9 ****
# TARGTYPE "Win32 (x86) Console Application" 0x0103
! CFG=python - Win32 Alpha Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
--- 5,9 ----
# TARGTYPE "Win32 (x86) Console Application" 0x0103
! CFG=python - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
***************
*** 14,18 ****
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Alpha Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
--- 14,18 ----
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
! !MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** python20.wse 9 Nov 2002 08:24:58 -0000 1.104
--- python20.wse 14 Nov 2002 23:24:40 -0000 1.105
***************
*** 32,37 ****
Variable Flags1=00001000
Variable Name2=_TCLMINOR_
! Variable Description2=Tcl/Tk Minor Version (e.g. the "3" in "8.3.1")
! Variable Default2=3
Variable Flags2=00001000
Variable Name3=_DOC_
--- 32,37 ----
Variable Flags1=00001000
Variable Name2=_TCLMINOR_
! Variable Description2=Tcl/Tk Minor Version (e.g. the "4" in "8.4.1")
! Variable Default2=4
Variable Flags2=00001000
Variable Name3=_DOC_
***************
*** 2049,2053 ****
end
item: Install File
! Source=..\..\tcl\bin\tcl8%_tclminor_%.dll
Destination=%MAINDIR%\DLLs\tcl8%_TCLMINOR_%.dll
Description=Tcl/Tk binaries and libraries
--- 2049,2053 ----
end
item: Install File
! Source=..\..\tcl84\bin\tcl8%_tclminor_%.dll
Destination=%MAINDIR%\DLLs\tcl8%_TCLMINOR_%.dll
Description=Tcl/Tk binaries and libraries
***************
*** 2055,2059 ****
end
item: Install File
! Source=..\..\tcl\bin\tk8%_tclminor_%.dll
Destination=%MAINDIR%\DLLs\tk8%_TCLMINOR_%.dll
Description=Tcl/Tk binaries and libraries
--- 2055,2059 ----
end
item: Install File
! Source=..\..\tcl84\bin\tk8%_tclminor_%.dll
Destination=%MAINDIR%\DLLs\tk8%_TCLMINOR_%.dll
Description=Tcl/Tk binaries and libraries
***************
*** 2061,2065 ****
end
item: Install File
! Source=..\..\tcl\lib\*.*
Destination=%MAINDIR%\tcl
Description=Tcl/Tk binaries and libraries
--- 2061,2065 ----
end
item: Install File
! Source=..\..\tcl84\lib\*.*
Destination=%MAINDIR%\tcl
Description=Tcl/Tk binaries and libraries
Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** readme.txt 9 Nov 2002 04:48:58 -0000 1.25
--- readme.txt 14 Nov 2002 23:24:40 -0000 1.26
***************
*** 72,79 ****
_tkinter
! Python wrapper for the Tk windowing system. Requires tcl832.exe from
! http://dev.scriptics.com/software/tcltk/downloadnow83.html
! Run the installer, forcing installation into dist\Tcl.
! Be sure to install everything, including the Tcl/Tk header files.
zlib
--- 72,122 ----
_tkinter
! Python wrapper for the Tk windowing system. Requires building
! Tcl/Tk first. Following are instructions for Tcl/Tk 8.4.1:
!
! Get source
! ----------
! Go to
! http://prdownloads.sourceforge.net/tcl/
! and download
! tcl841-src.zip
! tk841-src.zip
! Unzip into
! dist\tcl8.4.1\
! dist\tk8円.4.1\
! respectively.
!
! Build Tcl first (done here w/ MSVC 6 on Win2K)
! ----------------------------------------------
! cd dist\tcl8.4.1\win
! run vcvars32.bat [necessary even on Win2K]
! nmake -f makefile.vc
! nmake -f makefile.vc INSTALLDIR=..\..\tcl84 install
!
! XXX Should we compile with OPTS=threads?
!
! 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.3.4 to the 2.2 line
! XXX too, I've got to be able to build using more than oneX 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
! nmake -f makefile.vc TCLDIR=..\..\tcl8.4.1
! nmake -f makefile.vc TCLDIR=..\..\tcl8.4.1 INSTALLDIR=..\..\tcl84 install
!
! XXX Should we compile with OPTS=threads?
!
! XXX Some tests failed in "nmake -f makefile.vc test".
!
! 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?
!
zlib
***************
*** 93,103 ****
http://sources.redhat.com/bzip2/
Download the source tarball, bzip2-1.0.2.tar.gz.
! Unpack into dist\bzip2-1.0.2. WARNING: If you using WinZip, you
must disable its "TAR file smart CR/LF conversion" feature (under
Options -> Configuration -> Miscellaneous -> Other) for the duration.
Don't bother trying to use libbz2.dsp with MSVC. After 10 minutes
of fiddling, I couldn't get it to work. Perhaps it works with
MSVC 5 (I used MSVC 6). It's better to run the by-hand makefile
! anyway, because it runs a helpful test step at the end.
cd into dist\bzip2-1.0.2, and run
nmake -f makefile.msc
--- 136,148 ----
http://sources.redhat.com/bzip2/
Download the source tarball, bzip2-1.0.2.tar.gz.
! Unpack into dist\bzip2-1.0.2. WARNING: If you're using WinZip, you
must disable its "TAR file smart CR/LF conversion" feature (under
Options -> Configuration -> Miscellaneous -> Other) for the duration.
+
Don't bother trying to use libbz2.dsp with MSVC. After 10 minutes
of fiddling, I couldn't get it to work. Perhaps it works with
MSVC 5 (I used MSVC 6). It's better to run the by-hand makefile
! anyway, because it runs a helpful test step at the end.
!
cd into dist\bzip2-1.0.2, and run
nmake -f makefile.msc
***************
*** 107,115 ****
step in an enviroment that already has the correct envars set up).
]
! The make step should yield any warnings or errors, and should end
by displaying 6 blocks each terminated with
FC: no differences encountered
If FC finds differences, see the warning abou WinZip above (when I
first tried it, sample3.ref failed due to CRLF conversion).
All of this managed to build bzip2-1.0.2\libbz2.lib, which the Python
project links in.
--- 152,161 ----
step in an enviroment that already has the correct envars set up).
]
! The make step shouldn't yield any warnings or errors, and should end
by displaying 6 blocks each terminated with
FC: no differences encountered
If FC finds differences, see the warning abou WinZip above (when I
first tried it, sample3.ref failed due to CRLF conversion).
+
All of this managed to build bzip2-1.0.2\libbz2.lib, which the Python
project links in.