[Python-checkins] python/dist/src/PCbuild python20.wse,1.105,1.106 readme.txt,1.27,1.28

[tim_one@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/PCbuild
In directory sc8-pr-cvs1:/tmp/cvs-serv26560/python/PCbuild

Modified Files:
	python20.wse readme.txt 
Log Message:
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.


Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** python20.wse	14 Nov 2002 23:24:40 -0000	1.105
--- python20.wse	19 Nov 2002 17:38:26 -0000	1.106
***************
*** 31,37 ****
    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 Flags2=00001000
    Variable Name3=_DOC_
--- 31,39 ----
    Variable Default1=C:\PROGRAM FILES\WISE INSTALLMASTER 8.1
    Variable Flags1=00001000
!   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_
***************
*** 95,98 ****
--- 97,108 ----
  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
***************
*** 2049,2065 ****
  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
    Description=Tcl/Tk binaries and libraries
    Flags=0000000000000010
  end
  item: Install File
!   Source=..\..\tcl84\lib\*.*
    Destination=%MAINDIR%\tcl
    Description=Tcl/Tk binaries and libraries
--- 2059,2069 ----
  end
  item: Install File
!   Source=..\..\%_tcldir_%\bin\*.dll
!   Destination=%MAINDIR%\DLLs
    Description=Tcl/Tk binaries and libraries
    Flags=0000000000000010
  end
  item: Install File
!   Source=..\..\%_tcldir_%\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.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** readme.txt	15 Nov 2002 18:36:11 -0000	1.27
--- readme.txt	19 Nov 2002 17:38:27 -0000	1.28
***************
*** 98,108 ****
      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
      --------
--- 98,101 ----
***************
*** 117,120 ****
--- 110,120 ----
      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.