Prep the Windows installer for 2.0 final:

+ Bump the build number.
+ Changed app name in installer dialogs.
+ Fiddled dialogs to repair grammar and get rid of anachronisms (e.g.,
  "ProgMan" and "Program Manager" haven't made sense since Windows 3.1!).

diff --git a/PCbuild/BUILDno.txt b/PCbuild/BUILDno.txt
index a4643cc3f2850e665d8f06e574351f9be1654379..8b7fefbe95cf27152df8ff984cb345de428185f5 100644 (file)
--- a/PCbuild/BUILDno.txt
+++ b/PCbuild/BUILDno.txt
@@ -27,12 +27,14 @@ How to change the Windows build number:
 + Click OK.
 + This is not enough to convince MSDev to recompile getbuildinfo.c,
   so force that and relink.
-+ Verify that the new build number shows up in both release and debug 
++ Verify that the new build number shows up in both release and debug
   builds.
 
 
 Windows Python BUILD numbers
 ----------------------------
+   8    2.0 (final)
+        14-Oct-2000
    7    2.0c1
         07-Oct-2000
    6    2.0b2

diff --git a/PCbuild/python20.dsp b/PCbuild/python20.dsp
index e8e324cb681f112ae02cd6eca431fe6a874bf782..ac2d03d1e4cae8bc4a03533f7e6327dada2129d2 100644 (file)
--- a/PCbuild/python20.dsp
+++ b/PCbuild/python20.dsp
@@ -694,11 +694,11 @@ SOURCE=..\Modules\getbuildinfo.c
 \r
 !IF  "$(CFG)" == "python20 - Win32 Release"\r
 \r
-# ADD CPP /D BUILD=7\r
+# ADD CPP /D BUILD=8\r
 \r
 !ELSEIF  "$(CFG)" == "python20 - Win32 Debug"\r
 \r
-# ADD CPP /D BUILD=7\r
+# ADD CPP /D BUILD=8\r
 \r
 !ELSEIF  "$(CFG)" == "python20 - Win32 Alpha Debug"\r
 \r

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 1de1660b501fe1dfd38f30d36a953bc96b239470..a88508941cd5d9d00702b87065b4e8a379df21d1 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=5.0
-  Title=Python 2.0 Release Candidate 1
+  Title=Python 2.0
   Flags=00010100
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
@@ -64,7 +64,7 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=Python 2.0 Release Candidate 1
+  Value=Python 2.0
 end
 item: Set Variable
   Variable=GROUP
@@ -510,7 +510,7 @@ item: Custom Dialog Set
       Flags=0000000000000001
       Name=Times New Roman
       Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
-      Text=Select ProgMan Group
+      Text=Select Start Menu Group
       Text French=Sélectionner le groupe du Gestionnaire de programme 
       Text German=Bestimmung der Programm-Managergruppe
       Text Spanish=Seleccione grupo del Administrador de programas
@@ -519,7 +519,7 @@ item: Custom Dialog Set
     item: Static
       Rectangle=86 44 256 68
       Create Flags=01010000000000000000000000000000
-      Text=Enter the name of the Program Manager group to add %APPTITLE% icons to:
+      Text=Enter the name of the Start Menu program group to which to add the %APPTITLE% icons:
       Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les icônes de %APPTITLE% :
       Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugefügt werden soll:
       Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%:
@@ -605,7 +605,7 @@ item: Custom Dialog Set
       Create Flags=01010000000000000000000000000000
       Text=You are now ready to install %APPTITLE%.
       Text=
-      Text=Press the Next button to begin the installation or the Back button to reenter the installation information.
+      Text=Click the Next button to begin the installation, or the Back button to change choices made previously.
       Text French=Vous êtes maintenant prêt à installer les fichiers %APPTITLE%.
       Text French=
       Text French=Cliquez sur le bouton Suite pour commencer l'installation ou sur le bouton Retour pour entrer les informations d'installation à nouveau.
@@ -1072,11 +1072,13 @@ end
 item: Install File
   Source=%_SRC_%\Lib\test\*.xml
   Destination=%MAINDIR%\Lib\test
+  Description=Python Test files
   Flags=0000000000000010
 end
 item: Install File
   Source=%_SRC_%\Lib\test\*.out
   Destination=%MAINDIR%\Lib\test
+  Description=Python Test files
   Flags=0000000000000010
 end
 item: Install File
@@ -1350,11 +1352,13 @@ end
 item: Install File
   Source=%_SRC_%\..\tcl\bin\tk8%_TCLMINOR_%.dll
   Destination=%MAINDIR%\DLLs\tk8%_TCLMINOR_%.dll
+  Description=Tcl/Tk binaries and libraries
   Flags=0000000000000010
 end
 item: Install File
   Source=%_SRC_%\..\tcl\lib\*.*
   Destination=%MAINDIR%\tcl
+  Description=Tcl/Tk binaries and libraries
   Flags=0000000100000010
 end
 item: End Block