[Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.17,1.18 python20.wse,1.8,1.9 readme.txt,1.11,1.12

Tim Peters python-dev@python.org
Thu, 24 Aug 2000 23:52:47 -0700


Update of /cvsroot/python/python/dist/src/PCbuild
In directory slayer.i.sourceforge.net:/tmp/cvs-serv17945/python/dist/src/pcbuild

Modified Files:
	_tkinter.dsp python20.wse readme.txt 
Log Message:
In readme.txt, make what's needed to build the "optional" subprojects
much more explicit.  Also document that we're moving to Tcl/Tk 8.3.2.
Simplify .dsp files by getting rid of useless include paths.
.wse file changed to reflect that my setup is different than Guido's:
if you *build* a Python distro using python20.wse, beware!


Index: _tkinter.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/_tkinter.dsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** _tkinter.dsp	2000/08/13 22:59:26	1.17
--- _tkinter.dsp	2000/08/25 06:52:44	1.18
***************
*** 110,114 ****
  CPP=cl.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" /I "..\..\tcl8.3\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
--- 110,114 ----
  CPP=cl.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
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 141,145 ****
  CPP=cl.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" /I "..\..\tcl8.3\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WITH_APPINIT" /YX /FD /c
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 141,145 ----
  CPP=cl.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
  MTL=midl.exe
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** python20.wse	2000/08/22 14:04:24	1.8
--- python20.wse	2000/08/25 06:52:44	1.9
***************
*** 27,35 ****
    Variable Name3=_SRC_
    Variable Description3=Python source directory
!   Variable Default3=C:\src\Python-2.0
    Variable Flags3=00001001
    Variable Name4=_DOC_
    Variable Description4=HTML documentation tree directory
!   Variable Default4=C:\src\Python-2.0\html
    Variable Flags4=00001001
    Variable Name5=_TCLMINOR_
--- 27,35 ----
    Variable Name3=_SRC_
    Variable Description3=Python source directory
!   Variable Default3=C:\code\python\dist\src
    Variable Flags3=00001001
    Variable Name4=_DOC_
    Variable Description4=HTML documentation tree directory
!   Variable Default4=C:\python16\doc
    Variable Flags4=00001001
    Variable Name5=_TCLMINOR_

Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** readme.txt	2000/08/11 23:20:32	1.11
--- readme.txt	2000/08/25 06:52:44	1.12
***************
*** 61,70 ****
  The following subprojects will generally NOT build out of the box.  They
  wrap code Python doesn't control, and you'll need to download the base
! packages first (study the subproject structure from within MSVC to see
! where each expects to find the unpacked packages):
  
  _tkinter
!     Python wrapper for the Tk windowing system.  Requires tcl831.exe from
          http://dev.scriptics.com/software/tcltk/downloadnow83.html
  
  zlib
--- 61,73 ----
  The following subprojects will generally NOT build out of the box.  They
  wrap code Python doesn't control, and you'll need to download the base
! packages first and unpack them into siblings of PCbuilds's parent
! directory; for example, if your PCbuild is  .......\dist\src\PCbuild\,
! unpack into new subdirectories of dist\.
  
  _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
***************
*** 73,76 ****
--- 76,81 ----
      and
          ftp://ftp.uu.net/graphics/png/src/zlib133.zip
+     Unpack the former into dist\zlib113dll.
+     Uppack the latter into dist\zlib113.
  
  bsddb
***************
*** 78,85 ****
--- 83,97 ----
      from the "bsd db" link at
          http://www.nightmare.com/software.html
+     Unpack into dist\bsddb.
+     You then need to compile it:  cd to dist\bsddb\Port\win32, and run
+         nmake -f makefile_nt.msc
+     This builds bsddb\Port\win32\db.lib, which the MSVC project links in.
+     Note that if you're running Win9X, you'll need to run vcvars32.bat
+     before running nmake (this batch file is in your MSVC installation).
  
  pyexpat
      Python wrapper for accelerated XML parsing.  Requires
          ftp://ftp.jclark.com/pub/xml/expat.zip
+     Unpack into dist\expat.