Lots of cleanup things.

Added the bitmaps back, and added the wizard style program group
selection dialog.

Got rid of references to backup etc. inserted by the installer wizard
-- we don't use these.

Got rid of conditionals for Windows 3.1, ditto.

Changed version to 1.6a2.

Changed default install directory to "C:\Python16" (not really, but close).

Install only one copy of python16.lib.

Install the two MS DLLs (versioned) and python16.dll (unversioned) in
the system directory.

Install Tcl/Tk and expat in the DLLs directory.

diff --git a/PCbuild/python16.wse b/PCbuild/python16.wse
index 06a593e09a07ba0aa17029a63cdefe4bbfbf21f6..deb515a29fd767096a0e635fd7b5046844733b59 100644 (file)
--- a/PCbuild/python16.wse
+++ b/PCbuild/python16.wse
@@ -1,7 +1,7 @@
 Document Type: WSE\r
 item: Global\r
   Version=5.0\r
-  Title=Python 1.6 alpha 1\r
+  Title=Python 1.6 alpha 2\r
   Flags=00010100\r
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
   Japanese Font Name=MS Gothic\r
@@ -53,62 +53,31 @@ item: Check Configuration
 end\r
 item: Set Variable\r
   Variable=APPTITLE\r
-  Value=Python 1.6 alpha 1\r
+  Value=Python 1.6 alpha 2\r
 end\r
 item: Set Variable\r
   Variable=GROUP\r
   Value=Python 1.6\r
 end\r
-item: Set Variable\r
-  Variable=DISABLED\r
-  Value=!\r
-end\r
 item: Set Variable\r
   Variable=PY_VERSION\r
   Value=1.6\r
 end\r
 item: Set Variable\r
   Variable=MAINDIR\r
-  Value=Python-1.6\r
-end\r
-item: Check Configuration\r
-  Flags=10111011\r
+  Value=Python16\r
 end\r
 item: Get Registry Key Value\r
   Variable=PROGRAM_FILES\r
   Key=SOFTWARE\Microsoft\Windows\CurrentVersion\r
   Default=C:\Program Files\r
   Value Name=ProgramFilesDir\r
-  Flags=00000100\r
+  Flags=00000101\r
 end\r
 item: Set Variable\r
   Variable=MAINDIR\r
   Value=%PROGRAM_FILES%\%MAINDIR%\r
 end\r
-item: Set Variable\r
-  Variable=EXPLORER\r
-  Value=1\r
-end\r
-item: Else Statement\r
-end\r
-item: Set Variable\r
-  Variable=MAINDIR\r
-  Value=C:\%MAINDIR%\r
-end\r
-item: End Block\r
-end\r
-item: Set Variable\r
-  Variable=BACKUP\r
-  Value=%MAINDIR%\BACKUP\r
-end\r
-item: Set Variable\r
-  Variable=DOBACKUP\r
-  Value=B\r
-end\r
-item: Set Variable\r
-  Variable=BRANDING\r
-  Value=0\r
-end\r
 item: Set Variable\r
   Variable=COMPONENTS\r
   Value=ABCDE\r
@@ -116,25 +85,10 @@ end
 item: Wizard Block\r
   Direction Variable=DIRECTION\r
   Display Variable=DISPLAY\r
+  Bitmap Pathname=C:\Program Files\Wise\DIALOGS\TEMPLATE\WIZARD.BMP\r
   X Position=9\r
   Y Position=10\r
   Filler Color=8421440\r
-  Dialog=Welcome\r
-  Dialog=Select Destination Directory\r
-  Dialog=Select Components\r
-  Dialog=Select Program Manager Group\r
-  Variable=\r
-  Variable=\r
-  Variable=\r
-  Variable=EXPLORER\r
-  Value=\r
-  Value=\r
-  Value=\r
-  Value=1\r
-  Compare=0\r
-  Compare=0\r
-  Compare=0\r
-  Compare=0\r
   Flags=00000011\r
 end\r
 item: Custom Dialog Set\r
@@ -499,38 +453,90 @@ item: Custom Dialog Set
     end\r
   end\r
 end\r
-item: End Block\r
-end\r
-item: Get ProgMan Group\r
-  Variable=GROUP\r
-  Window=Select Start Menu Group\r
-  Description=Select the group where the Python shortcuts are installed in your start menu.  By default, a new group named "Python 1.6" is created.\r
-  Title=Group name for Python:\r
-  Default=Python 1.6\r
-end\r
-item: Wizard Block\r
-  Direction Variable=DIRECTION\r
+item: Custom Dialog Set\r
+  Name=Select Program Manager Group\r
   Display Variable=DISPLAY\r
-  X Position=9\r
-  Y Position=10\r
-  Filler Color=8421440\r
-  Dialog=Welcome\r
-  Dialog=Select Destination Directory\r
-  Dialog=Select Components\r
-  Dialog=Select Program Manager Group\r
-  Variable=\r
-  Variable=\r
-  Variable=\r
-  Variable=EXPLORER\r
-  Value=\r
-  Value=\r
-  Value=\r
-  Value=1\r
-  Compare=0\r
-  Compare=0\r
-  Compare=0\r
-  Compare=0\r
-  Flags=00000011\r
+  item: Dialog\r
+    Title=%APPTITLE% Installation\r
+    Title French=Installation de %APPTITLE%\r
+    Title German=Installation von %APPTITLE%\r
+    Title Spanish=Instalación de %APPTITLE%\r
+    Title Italian=Installazione di %APPTITLE%\r
+    Width=271\r
+    Height=224\r
+    Font Name=Helv\r
+    Font Size=8\r
+    item: Push Button\r
+      Rectangle=150 187 195 202\r
+      Variable=DIRECTION\r
+      Value=N\r
+      Create Flags=01010000000000010000000000000001\r
+      Text=&Next >\r
+      Text French=&Suite >\r
+      Text German=&Weiter >\r
+      Text Spanish=&Siguiente >\r
+      Text Italian=&Avanti >\r
+    end\r
+    item: Push Button\r
+      Rectangle=105 187 150 202\r
+      Variable=DIRECTION\r
+      Value=B\r
+      Create Flags=01010000000000010000000000000000\r
+      Flags=0000000000000001\r
+      Text=< &Back\r
+      Text French=< &Retour\r
+      Text German=< &Zurück\r
+      Text Spanish=< &Atrás\r
+      Text Italian=< &Indietro\r
+    end\r
+    item: Push Button\r
+      Rectangle=211 187 256 202\r
+      Action=3\r
+      Create Flags=01010000000000010000000000000000\r
+      Text=&Cancel\r
+      Text French=&Annuler\r
+      Text German=&Abbrechen\r
+      Text Spanish=&Cancelar\r
+      Text Italian=&Annulla\r
+    end\r
+    item: Static\r
+      Rectangle=8 180 256 181\r
+      Action=3\r
+      Create Flags=01010000000000000000000000000111\r
+    end\r
+    item: Static\r
+      Rectangle=86 8 258 42\r
+      Create Flags=01010000000000000000000000000000\r
+      Flags=0000000000000001\r
+      Name=Times New Roman\r
+      Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18\r
+      Text=Select ProgMan Group\r
+      Text French=Sélectionner le groupe du Gestionnaire de programme \r
+      Text German=Bestimmung der Programm-Managergruppe\r
+      Text Spanish=Seleccione grupo del Administrador de programas\r
+      Text Italian=Selezionare il gruppo ProgMan \r
+    end\r
+    item: Static\r
+      Rectangle=86 44 256 68\r
+      Create Flags=01010000000000000000000000000000\r
+      Text=Enter the name of the Program Manager group to add %APPTITLE% icons to:\r
+      Text French=Entrez le nom du groupe du Gestionnaire de programme dans lequel vous souhaitez ajouter les icônes de %APPTITLE% :\r
+      Text German=Geben Sie den Namen der Programmgruppe ein, der das Symbol %APPTITLE% hinzugefügt werden soll:\r
+      Text Spanish=Escriba el nombre del grupo del Administrador de programas en el que desea agregar los iconos de %APPTITLE%:\r
+      Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a:\r
+    end\r
+    item: Combobox\r
+      Rectangle=86 69 256 175\r
+      Variable=GROUP\r
+      Create Flags=01010000001000010000001100000001\r
+      Flags=0000000000000001\r
+      Text=%GROUP%\r
+      Text French=%GROUP%\r
+      Text German=%GROUP%\r
+      Text Spanish=%GROUP%\r
+      Text Italian=%GROUP%\r
+    end\r
+  end\r
 end\r
 item: Custom Dialog Set\r
   Name=Start Installation\r
@@ -615,26 +621,6 @@ item: Custom Dialog Set
     end\r
   end\r
 end\r
-item: If/While Statement\r
-  Variable=DISPLAY\r
-  Value=Select Destination Directory\r
-end\r
-item: Set Variable\r
-  Variable=BACKUP\r
-  Value=%MAINDIR%\BACKUP\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
-item: If/While Statement\r
-  Variable=DOBACKUP\r
-  Value=A\r
-end\r
-item: Set Variable\r
-  Variable=BACKUPDIR\r
-  Value=%BACKUP%\r
-end\r
 item: End Block\r
 end\r
 item: Open/Close INSTALL.LOG\r
@@ -642,11 +628,11 @@ end
 item: Remark\r
   Text=Where system DLLs are installed (choose one of the following):\r
 end\r
-item: Set Variable\r
+remarked item: Set Variable\r
   Variable=DLLDEST\r
   Value=%MAINDIR%\r
 end\r
-remarked item: Set Variable\r
+item: Set Variable\r
   Variable=DLLDEST\r
   Value=%SYS32%\r
 end\r
@@ -669,38 +655,21 @@ item: Install File
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\pcbuild\parser.pyd\r
-  Destination=%MAINDIR%\DLLs\parser.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=%_SRC_%\pcbuild\_tkinter.pyd\r
-  Destination=%MAINDIR%\DLLs\_tkinter.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=%_SRC_%\pcbuild\zlib.pyd\r
-  Destination=%MAINDIR%\DLLs\zlib.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=%_SRC_%\pcbuild\bsddb.pyd\r
-  Destination=%MAINDIR%\DLLs\bsddb.pyd\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=%_SRC_%\pcbuild\winreg.pyd\r
-  Destination=%MAINDIR%\DLLs\winreg.pyd\r
+  Source=%_SRC_%\pcbuild\*.pyd\r
+  Destination=%MAINDIR%\DLLs\r
+  Description=Extension modules\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\pcbuild\mmap.pyd\r
-  Destination=%MAINDIR%\DLLs\mmap.pyd\r
+  Source=%_SRC_%\..\expat\bin\xmlparse.dll\r
+  Destination=%MAINDIR%\DLLs\xmlparse.dll\r
+  Description=Expat library\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\pcbuild\_sre.pyd\r
-  Destination=%MAINDIR%\DLLs\_sre.pyd\r
+  Source=%_SRC_%\..\expat\bin\xmltok.dll\r
+  Destination=%MAINDIR%\DLLs\xmltok.dll\r
+  Description=Expat library\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
@@ -709,23 +678,9 @@ item: Install File
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\pcbuild\python16.lib\r
-  Destination=%DLLDEST%\python16.lib\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=%_SRC_%\Pc\pycon.ico\r
-  Destination=%MAINDIR%\pycon.ico\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=%_SRC_%\Pc\pyc.ico\r
-  Destination=%MAINDIR%\pyc.ico\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=%_SRC_%\Pc\py.ico\r
-  Destination=%MAINDIR%\py.ico\r
+  Source=%_SRC_%\Pc\*.ico\r
+  Destination=%MAINDIR%\r
+  Description=Icons\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
@@ -756,18 +711,12 @@ item: Install File
   Source=%_SRC_%\Lib\distutils\*.py\r
   Destination=%MAINDIR%\Lib\distutils\r
   Description=Distribution utility modules\r
-  Flags=0000000000000010\r
-end\r
-item: Install File\r
-  Source=%_SRC_%\Lib\distutils\command\*.py\r
-  Destination=%MAINDIR%\Lib\distutils\command\r
-  Description=Distribution utility modules\r
-  Flags=0000000000000010\r
+  Flags=0000000100000010\r
 end\r
 item: Install File\r
   Source=%_SRC_%\pcbuild\*.lib\r
   Destination=%MAINDIR%\libs\r
-  Description=.lib files\r
+  Description=Link library files\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
@@ -777,7 +726,7 @@ item: Install File
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Pc\config.h\r
+  Source=%_SRC_%\PC\config.h\r
   Destination=%MAINDIR%\include\config.h\r
   Description=Header files (config.h)\r
   Flags=0000000000000010\r
@@ -1146,12 +1095,6 @@ item: If/While Statement
   Value=D\r
   Flags=00001010\r
 end\r
-item: Check Configuration\r
-  Flags=10111011\r
-end\r
-item: Remark\r
-  Text=If NT, install in a common group\r
-end\r
 item: Get Registry Key Value\r
   Variable=GROUPDIR\r
   Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders\r
@@ -1217,29 +1160,6 @@ item: Create Shortcut
   Key Type=1536\r
   Flags=00000001\r
 end\r
-item: Else Statement\r
-end\r
-item: Add ProgMan Icon\r
-  Group=%GROUP%\r
-  Icon Name=Python\r
-  Command Line=%MAINDIR%\python.exe\r
-  Default Directory=%MAINDIR%\r
-end\r
-item: If/While Statement\r
-  Variable=COMPONENTS\r
-  Value=B\r
-  Flags=00001010\r
-end\r
-remarked item: Add ProgMan Icon\r
-  Group=%GROUP%\r
-  Icon Name=Python Manuals\r
-  Command Line=%MAINDIR%\Doc\index.html\r
-  Default Directory=%MAINDIR%\Doc\r
-end\r
-item: End Block\r
-end\r
-item: End Block\r
-end\r
 item: End Block\r
 end\r
 item: Self-Register OCXs/DLLs\r
@@ -1251,17 +1171,17 @@ item: If/While Statement
   Flags=00001010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\..\tcl8.3\bin\tcl83.dll\r
-  Destination=%MAINDIR%\tcl83.dll\r
+  Source=%_SRC_%\..\tcl8.2\bin\tcl82.dll\r
+  Destination=%MAINDIR%\DLLs\tcl82.dll\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\..\tcl8.3\bin\tk83.dll\r
-  Destination=%MAINDIR%\tk83.dll\r
+  Source=%_SRC_%\..\tcl8.2\bin\tk82.dll\r
+  Destination=%MAINDIR%\DLLs\tk82.dll\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\..\tcl8.3\lib\*.*\r
+  Source=%_SRC_%\..\tcl8.2\lib\*.*\r
   Destination=%MAINDIR%\tcl\r
   Flags=0000000100000010\r
 end\r
@@ -1270,6 +1190,7 @@ end
 item: Wizard Block\r
   Direction Variable=DIRECTION\r
   Display Variable=DISPLAY\r
+  Bitmap Pathname=C:\Program Files\Wise\DIALOGS\TEMPLATE\WIZARD.BMP\r
   X Position=9\r
   Y Position=10\r
   Filler Color=8421440\r