Some new stuff. Get the HTML docs via a new variable.

Comment out freeze script (doesn't work at all).
Add dialog to get program manager group.

diff --git a/PCbuild/python15.wse b/PCbuild/python15.wse
index 826238d9dac85c059b356966cccb7336cc0735f5..01c11d13a3e0586cd60e3e8d94ef92144f3ff540 100644 (file)
--- a/PCbuild/python15.wse
+++ b/PCbuild/python15.wse
@@ -26,8 +26,12 @@ item: Global
   Variable Description3=Root of Python Build Tree\r
   Variable Default3=D:\src\Python-1.5\r
   Variable Flags3=00001001\r
+  Variable Name4=_DOC_\r
+  Variable Description4=HTML documentation tree\r
+  Variable Default4=D:\src\Python-1.5\html\r
+  Variable Flags4=00001000\r
 end\r
-item: Open/Close INSTALL.LOG\r
+remarked item: Open/Close INSTALL.LOG\r
   Flags=00000001\r
 end\r
 item: Check if File/Dir Exists\r
@@ -496,90 +500,39 @@ item: Custom Dialog Set
     end\r
   end\r
 end\r
-item: Custom Dialog Set\r
-  Name=Select Program Manager Group\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.5" is created.\r
+  Title=Group name for Python:\r
+  Default=Python 1.5\r
+end\r
+item: Wizard Block\r
+  Direction Variable=DIRECTION\r
   Display Variable=DISPLAY\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 the %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=01010000000000010000001000000001\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
+  Bitmap Pathname=%_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
   Name=Start Installation\r
@@ -829,12 +782,36 @@ item: Install File
   Description=Utility Scripts\r
   Flags=0000000000000010\r
 end\r
-item: Install File\r
-  Source=%_SRC_%\Tools\freeze\*.*\r
+remarked item: Install File\r
+  Source=%_SRC_%\Tools\freeze\*.py\r
+  Destination=%MAINDIR%\Tools\freeze\r
+  Description=Freeze tool\r
+  Flags=0000000000000010\r
+end\r
+remarked item: Install File\r
+  Source=%_SRC_%\Tools\freeze\*.ini\r
   Destination=%MAINDIR%\Tools\freeze\r
   Description=Freeze tool\r
   Flags=0000000000000010\r
 end\r
+remarked item: Install File\r
+  Source=%_SRC_%\Tools\freeze\*.html\r
+  Destination=%MAINDIR%\Tools\freeze\r
+  Description=Freeze tool\r
+  Flags=0000000000000010\r
+end\r
+remarked item: Install File\r
+  Source=%_SRC_%\Tools\freeze\README\r
+  Destination=%MAINDIR%\Tools\freeze\README.txt\r
+  Description=Freeze tool\r
+  Flags=0000000000000010\r
+end\r
+remarked item: Install File\r
+  Source=%_SRC_%\Python\frozenmain.c\r
+  Destination=%MAINDIR%\Tools\freeze\frozenmain.c\r
+  Description=Freeze tool\r
+  Flags=0000000000000010\r
+end\r
 item: Install File\r
   Source=%_SRC_%\Tools\webchecker\*.py\r
   Destination=%MAINDIR%\Tools\webchecker\r
@@ -883,6 +860,36 @@ item: Install File
   Description=IDLE bootstrap script\r
   Flags=0000000000000010\r
 end\r
+item: Install File\r
+  Source=%_SRC_%\Tools\pynche\*.py\r
+  Destination=%MAINDIR%\Tools\pynche\r
+  Description=pynche color editor\r
+  Flags=0000000000000010\r
+end\r
+item: Install File\r
+  Source=%_SRC_%\Tools\pynche\X\*.txt\r
+  Destination=%MAINDIR%\Tools\pynche\X\r
+  Description=pynche color editor - X files\r
+  Flags=0000000000000010\r
+end\r
+item: Install File\r
+  Source=%_SRC_%\Tools\pynche\README\r
+  Destination=%MAINDIR%\Tools\pynche\README.txt\r
+  Description=pynche color editor - README\r
+  Flags=0000000100000010\r
+end\r
+item: Install File\r
+  Source=%_SRC_%\Tools\pynche\pynche\r
+  Destination=%MAINDIR%\Tools\pynche\pynche.py\r
+  Description=pynche color editor - main\r
+  Flags=0000000100000010\r
+end\r
+item: Install File\r
+  Source=%_SRC_%\Tools\pynche\pynche.pyw\r
+  Destination=%MAINDIR%\Tools\pynche\pynche.pyw\r
+  Description=pynche color editor - noconsole main\r
+  Flags=0000000100000010\r
+end\r
 item: End Block\r
 end\r
 item: If/While Statement\r
@@ -891,43 +898,43 @@ item: If/While Statement
   Flags=00001010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Doc\index.html\r
+  Source=%_DOC_%\index.html\r
   Destination=%MAINDIR%\Doc\index.html\r
   Description=Python Documentation root (HTML)\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Doc\icons\*.*\r
+  Source=%_DOC_%\icons\*.*\r
   Destination=%MAINDIR%\Doc\icons\r
   Description=Python Documentation (HTML)\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Doc\tut\*.*\r
+  Source=%_DOC_%\tut\*.*\r
   Destination=%MAINDIR%\Doc\tut\r
   Description=Python Documentation (HTML)\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Doc\lib\*.*\r
+  Source=%_DOC_%\lib\*.*\r
   Destination=%MAINDIR%\Doc\lib\r
   Description=Python Documentation (HTML)\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Doc\ext\*.*\r
+  Source=%_DOC_%\ext\*.*\r
   Destination=%MAINDIR%\Doc\ext\r
   Description=Python Documentation (HTML)\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Doc\api\*.*\r
+  Source=%_DOC_%\api\*.*\r
   Destination=%MAINDIR%\Doc\api\r
   Description=Python Documentation (HTML)\r
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Doc\ref\*.*\r
+  Source=%_DOC_%\ref\*.*\r
   Destination=%MAINDIR%\Doc\ref\r
   Description=Python Documentation (HTML)\r
   Flags=0000000000000010\r