[Python-checkins] CVS: python/dist/src/PCbuild Uninstal.wse,NONE,1.3.2.1 python20.wse,1.40.2.6,1.40.2.7 pythoncore.dsp,1.15.2.6,1.15.2.7

Tim Peters tim_one@users.sourceforge.net
Wed, 01 Aug 2001 19:40:46 -0700


Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv23606/descr/dist/src/PCbuild

Modified Files:
      Tag: descr-branch
	python20.wse pythoncore.dsp 
Added Files:
      Tag: descr-branch
	Uninstal.wse 
Log Message:
Mrege of trunk tag delta date2001-07-30 to date2001-08-01.


--- NEW FILE: Uninstal.wse ---
Document Type: WSE
item: Global
  Version=8.14
  Flags=00000100
  Split=1420
  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
  Copy Default=1
  Japanese Font Name=MS Gothic
  Japanese Font Size=10
  Start Gradient=0 0 255
  End Gradient=0 0 0
  Windows Flags=00000000000000000000101000001000
  Message Font=MS Sans Serif
  Font Size=8
  Disk Label=GLBS
  Disk Filename=INSTALL
  Patch Flags=0000000000000001
  Patch Threshold=200
  Patch Memory=4096
  Per-User Version ID=1
  Crystal Format=10111100101100000010001001001001
  Step View=&Properties
end
item: Remark
  Text=Note from Tim:  This is a verbatim copy of Wise's Uninstal.wse, altered at the end to write
end
item: Remark
  Text=uninstall info under HKCU instead of HKLM if the user doesn't have Admin privs.
end
item: Remark
end
item: Remark
  Text=     Install Support for uninstalling the application.
end
item: Remark
end
item: Set Variable
  Variable=UNINSTALL_PATH
  Value=%_LOGFILE_PATH_%
  Flags=00000010
end
item: Set Variable
  Variable=UNINSTALL_PATH
  Value=%UNINSTALL_PATH%\UNWISE.EXE
end
item: Compiler Variable If
  Variable=_EXE_OS_TYPE_
  Value=WIN32
end
item: Install File
  Source=%_WISE_%\UNWISE32.EXE
  Destination=%UNINSTALL_PATH%
  Flags=0000000000000010
end
item: Compiler Variable Else
end
item: Install File
  Source=%_WISE_%\UNWISE.EXE
  Destination=%UNINSTALL_PATH%
  Flags=0000000000000010
end
item: Compiler Variable End
end
item: Remark
end
item: Remark
  Text=     Install Support for multiple languages
end
item: Remark
end
item: Set Variable
  Variable=UNINSTALL_LANG
  Value=%UNINSTALL_PATH%
  Flags=00000010
end
item: Set Variable
  Variable=UNINSTALL_LANG
  Value=%UNINSTALL_LANG%\UNWISE.INI
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=C
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.FRA
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_C_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.FRA
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=D
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.FRA
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_D_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.FRA
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=E
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.DEU
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_E_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.DEU
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=F
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.PTG
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_F_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.PTG
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=G
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.ESP
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_G_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.ESP
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=H
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.ESP
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_H_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.ESP
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=I
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.ITA
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_I_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.ITA
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=J
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.DAN
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_J_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.DAN
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=K
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.FIN
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_K_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.FIN
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=L
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.ISL
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_L_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.ISL
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=M
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.NLD
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_M_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.NLD
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=N
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.NOR
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_N_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.NOR
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=O
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.SVE
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_O_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.SVE
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Compiler Variable If
  Variable=_LANG_LIST_
  Value=P
  Flags=00000010
end
item: Compiler Variable If
  Value=%_WISE_%\LANGUAGE\UNWISE.JPN
  Flags=00000011
end
item: If/While Statement
  Variable=LANG
  Value=%_LANG_P_NAME_%
end
item: Install File
  Source=%_WISE_%\LANGUAGE\UNWISE.JPN
  Destination=%UNINSTALL_LANG%
  Flags=0000000000000010
end
item: End Block
end
item: Compiler Variable End
end
item: Compiler Variable End
end
item: Remark
end
item: Remark
  Text=     Install the add/remove or uninstall icon
end
item: Remark
end
item: Set Variable
  Variable=UNINSTALL_PATH
  Value=%UNINSTALL_PATH%
  Flags=00010100
end
item: Set Variable
  Variable=INST_LOG_PATH
  Value=%_LOGFILE_PATH_%
  Flags=00010100
end
item: Check Configuration
  Flags=10111011
end
item: Check Configuration
  Flags=10111111
end
item: Remark
  Text=Write uninstall info under HKLM.  This if/else/end block added by Tim.
end
item: Edit Registry
  Total Keys=1
  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
  New Value=%APPTITLE%
  Value Name=DisplayName
  Root=2
end
item: Edit Registry
  Total Keys=1
  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
  New Value=%UNINSTALL_PATH% %INST_LOG_PATH%
  New Value=
  Value Name=UninstallString
  Root=2
end
item: Else Statement
end
item: Remark
  Text=The same, but write under HKCU instead.
end
item: Edit Registry
  Total Keys=1
  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
  New Value=%APPTITLE%
  Value Name=DisplayName
  Root=1
end
item: Edit Registry
  Total Keys=1
  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
  New Value=%UNINSTALL_PATH% %INST_LOG_PATH%
  New Value=
  Value Name=UninstallString
  Root=1
end
item: End Block
end
item: Else Statement
end
item: Add ProgMan Icon
  Group=%GROUP%
  Icon Name=Uninstall %APPTITLE%
  Command Line=%UNINSTALL_PATH% %INST_LOG_PATH%
end
item: End Block
end
item: Check Configuration
  Flags=11110010
end
item: If/While Statement
  Variable=DOBRAND
  Value=1
end
item: Edit Registry
  Total Keys=2
  item: Key
    Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
    New Value=%COMPANY%
    Value Name=RegCompany
    Root=2
  end
  item: Key
    Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
    New Value=%NAME%
    Value Name=RegOwner
    Root=2
  end
end
item: End Block
end
item: End Block
end

Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.40.2.6
retrieving revision 1.40.2.7
diff -C2 -d -r1.40.2.6 -r1.40.2.7
*** python20.wse	2001/07/30 04:08:14	1.40.2.6
--- python20.wse	2001/08/02 02:40:43	1.40.2.7
***************
*** 13,17 ****
    Message Font=MS Sans Serif
    Font Size=8
!   Pages Modified=00010000001101000000000100000010
    Extra Pages=00000000000000000000000010110010
    Disk Filename=SETUP
--- 13,17 ----
    Message Font=MS Sans Serif
    Font Size=8
!   Pages Modified=00010000011101000000000100000010
    Extra Pages=00000000000000000000000010110010
    Disk Filename=SETUP
***************
*** 20,23 ****
--- 20,24 ----
    Patch Memory=4000
    EXE Filename=Python-2.2a1.exe
+   Dialogs Version=8
    Version File=2.2a1
    Version Description=Python Programming Language
***************
*** 72,75 ****
--- 73,79 ----
  end
  item: Remark
+   Text=    The APPTITLE setting above.
+ end
+ item: Remark
    Text=    The "Title:" in the upper left corner of the GUI.
  end
***************
*** 190,194 ****
    Variable=DOBACKUP
    Value=A
-   Flags=10000000
  end
  item: Remark
--- 194,197 ----
***************
*** 257,264 ****
    Text=D: test suite
  end
  item: Set Variable
    Variable=COMPONENTS
!   Value=ABCD
  end
  item: Wizard Block
    Direction Variable=DIRECTION
--- 260,284 ----
    Text=D: test suite
  end
+ item: Remark
+   Text=E: register file extensions (requires Admin privs)
+ end
+ item: Check Configuration
+   Flags=10111111
+ end
  item: Set Variable
    Variable=COMPONENTS
!   Value=ABCDE
! end
! item: Else Statement
  end
+ item: Remark
+   Text=Lowercase E grays out the "register file extension" choice.
+ end
+ item: Set Variable
+   Variable=COMPONENTS
+   Value=ABCDe
+ end
+ item: End Block
+ end
  item: Wizard Block
    Direction Variable=DIRECTION
***************
*** 295,310 ****
      end
      item: Push Button
-       Rectangle=105 187 150 202
-       Variable=DIRECTION
-       Value=B
-       Create Flags=01010000000000010000000000000000
-       Flags=0000000000000001
-       Text=< &Back
-       Text French=< &Retour
-       Text German=< &Zurück
-       Text Spanish=< &Atrás
-       Text Italian=< &Indietro
-     end
-     item: Push Button
        Rectangle=211 187 256 202
        Action=3
--- 315,318 ----
***************
*** 322,326 ****
      end
      item: Static
!       Rectangle=86 8 258 42
        Create Flags=01010000000000000000000000000000
        Flags=0000000000000001
--- 330,334 ----
      end
      item: Static
!       Rectangle=86 9 258 34
        Create Flags=01010000000000000000000000000000
        Flags=0000000000000001
***************
*** 332,371 ****
        Text Spanish=Seleccione el directorio de destino
        Text Italian=Selezionare Directory di destinazione
-     end
-     item: Static
-       Rectangle=86 42 256 82
-       Create Flags=01010000000000000000000000000000
-       Text=Please select the directory where the %APPTITLE% files are to be installed.
-       Text French=Veuillez sélectionner le répertoire dans lequel les fichiers %APPTITLE% doivent être installés.
-       Text German=Geben Sie an, in welchem Verzeichnis die %APPTITLE%-Dateien installiert werden sollen.
-       Text Spanish=Por favor seleccione el directorio donde desee instalar los archivos de %APPTITLE%.
-       Text Italian=Selezionare la directory dove verranno installati i file %APPTITLE%.
      end
!     item: Static
!       Rectangle=86 98 256 125
!       Action=1
!       Create Flags=01010000000000000000000000000111
!     end
!     item: Push Button
!       Rectangle=208 106 253 121
!       Variable=MAINDIR_SAVE
!       Value=%MAINDIR%
!       Destination Dialog=1
!       Action=2
!       Create Flags=01010000000000010000000000000000
!       Text=Browse
!       Text French=Parcourir
!       Text German=Durchsuchen
!       Text Spanish=Buscar
!       Text Italian=Sfoglie
      end
      item: Static
!       Rectangle=90 109 206 120
        Create Flags=01010000000000000000000000000000
!       Text=%MAINDIR%
!       Text French=%MAINDIR%
!       Text German=%MAINDIR%
!       Text Spanish=%MAINDIR%
!       Text Italian=%MAINDIR%
      end
    end
--- 340,358 ----
        Text Spanish=Seleccione el directorio de destino
        Text Italian=Selezionare Directory di destinazione
      end
!     item: Listbox
!       Rectangle=86 50 257 175
!       Variable=MAINDIR
!       Enabled Color=00000000000000001111111111111111
!       Create Flags=01010000100000010000000101000001
!       Flags=0000110000001010
!       Text=%MAINDIR%
!       Text=
      end
      item: Static
!       Rectangle=86 34 250 49
!       Enabled Color=00000000000000001111111111111111
        Create Flags=01010000000000000000000000000000
!       Text=Please select a directory for the %APPTITLE% files.
      end
    end
***************
*** 415,418 ****
--- 402,686 ----
  end
  item: Custom Dialog Set
+   Name=Backup Replaced Files
+   Display Variable=DISPLAY
+   item: Dialog
+     Title=%APPTITLE% Installation
+     Title French=Fichiers de Sauvegarde Remplacés
+     Title German=Sicherungskopie von ersetzten Dateien erstellen
+     Title Portuguese=Ficheiros substituídos de segurança
+     Title Spanish=Copias de seguridad de los archivos reemplazados
+     Title Italian=Backup file sostituiti
+     Title Danish=Sikkerhedskopiering af erstattede filer
+     Title Dutch=Vervangen bestanden kopiëren
+     Title Norwegian=Sikkerhetskopiere erstattede filer
+     Title Swedish=Säkerhetskopiera utbytta filer
+     Width=280
+     Height=224
+     Font Name=Helv
+     Font Size=8
+     item: Push Button
+       Rectangle=150 187 195 201
+       Variable=DIRECTION
+       Value=N
+       Create Flags=01010000000000010000000000000001
+       Text=&Next >
+       Text French=&Suivant>
+       Text German=&Weiter>
+       Text Portuguese=&Próximo>
+       Text Spanish=&Siguiente >
+       Text Italian=&Avanti >
+       Text Danish=&Næste>
+       Text Dutch=&Volgende>
+       Text Norwegian=&Neste>
+       Text Swedish=&Nästa >
+     end
+     item: Push Button
+       Rectangle=105 187 150 201
+       Variable=DIRECTION
+       Value=B
+       Create Flags=01010000000000010000000000000000
+       Text=< &Back
+       Text French=<&Retour
+       Text German=<&Zurück
+       Text Portuguese=<&Retornar
+       Text Spanish=<&Retroceder
+       Text Italian=< &Indietro
+       Text Danish=<&Tilbage
+       Text Dutch=<&Terug
+       Text Norwegian=<&Tilbake
+       Text Swedish=< &Tillbaka
+     end
+     item: Push Button
+       Rectangle=222 187 264 201
+       Action=3
+       Create Flags=01010000000000010000000000000000
+       Text=Cancel
+       Text French=Annuler
+       Text German=Abbrechen
+       Text Portuguese=Cancelar
+       Text Spanish=Cancelar
+       Text Italian=Annulla
+       Text Danish=Annuller
+       Text Dutch=Annuleren
+       Text Norwegian=Avbryt
+       Text Swedish=Avbryt
+     end
+     item: Static
+       Rectangle=9 177 263 178
+       Action=3
+       Create Flags=01010000000000000000000000000111
+     end
+     item: Static
+       Rectangle=86 37 256 101
+       Create Flags=01010000000000000000000000000000
+       Text=This installation program can create backup copies of all files replaced during the installation. These files will be used when the software is uninstalled and a rollback is requested.  If backup copies are not created, you will only be able to uninstall the software and not roll the system back to a previous state.
+       Text=
+       Text=Do you want to create backups of replaced files?
+       Text French=Le programme d'installation peut créer des copies de sauvegarde de tous les fichiers remplacés pendant l'installation. Ces fichiers sont utilisés au cas où le logiciel est désinstallé et que l'on procède à la reprise du système. Si les copies de sauvegarde ne sont pas créées, on ne pourra que désinstaller le logiciel sans reprendre le système à un état précédent. Voulez-vous créer une sauvegarde des fichiers remplacés ?
+       Text German=Dieses Installationsprogramm kann Sicherungskopien von allen während der Installation ersetzten Dateien erstellen. Diese Dateien werden zur Rückgängigmachung der Installation und bei Anforderung eines Rollbacks verwendet. Ohne Sicherungskopien ist nur eine Rückgängigmachung der Installation möglich, nicht aber ein Rollback des Systems. Sicherungskopien der ersetzten Dateien erstellen?
+       Text Portuguese=Este programa de instalação pode criar cópias de segurança de todos os ficheiros substituídos durante a instalação. Estes ficheiros serão utilizados quando o programa for desinstalado  e for requisitada uma retomada. Se as cópias de segurança não forem criadas, só poderá desinstalar o programa e não pode retomar  um estado anterior do sistema. Deseja criar cópias de segurança dos ficheiros substituídos?
+       Text Spanish=Este programa de instalación puede crear copias de seguridad de todos los archivos reemplazados durante la instalación. Estos archivos se utilizarán cuando se desinstale el software y se solicite volver al estado anterior. Si no se crean copias de seguridad, únicamente podrá desinstalar el software y no podrá devolver el sistema al estado anterior. ¿Desea crear archivos de seguridad de los archivos reemplazados?
+       Text Italian=Questo programma di installazione può creare copie di backup di tutti i file sostituiti durante l’installazione. Questi file saranno usati quando il software sarà disinstallato e sarà richiesto un ritorno allo stato precedente. Se non crei le copie di backup, potrai solo disinstallare il software, ma non potrai riportare il sistema allo stato precedente. Vuoi creare i file di backup dei file sostituiti?
+       Text Danish=Dette installationsprogram kan oprette sikkerhedskopier af alle filer, som erstattes under installationen. Disse filer benyttes, når softwaren fjernes, og den tidligere systemkonfiguration genetableres. Hvis der ikke oprettes sikkerhedskopier, kan du kun fjerne den installerede software og ikke genetablere den tidligere systemkonfiguration. Vil du oprette sikkerhedskopier af filer, som erstattes?
+       Text Dutch=Dit installatieprogramma kan kopieën maken van alle bestanden die tijdens de installatie worden vervangen. Deze worden dan gebruikt als de software-installatie ongedaan wordt gemaakt en u het systeem wilt laten terugkeren naar de oorspronkelijke staat. Als er geen back-up kopieën worden gemaakt, kunt u de software enkel verwijderen maar het systeem niet in de oorspronkelijke staat terugbrengen. Wilt u een back-up maken van de vervangen bestanden?
+       Text Norwegian=Dette installasjonsprogrammet kan lage sikkerhetskopier av alle filer som blir erstattet under installasjonen. Disse filene vil tas i bruk når programvaren er avinstallert og det er behov for tilbakestilling. Hvis det ikke er laget sikkerhetskopier, kan du kun avinstallere programvaren og ikke stille systemet tilbake til tidligere status. Ønsker du å lage sikkerhetskopier av de filene som blir erstattet nå?
+       Text Swedish=Installationsprogrammet kan skapa säkerhetskopior av alla filer som byts ut under installationen. Dessa filer kan sedan användas när programvaran avinstalleras och du begär rollback. Om du då inte har några säkerhetskopior kan du bara avinstallera programvaran, inte återskapa systemet i dess tidigare skick. Vill du göra säkerhetskopior av de ersatta filerna?
+     end
+     item: Radio Button
+       Rectangle=113 100 212 126
+       Variable=DOBACKUP
+       Create Flags=01010000000000010000000000001001
+       Text=&Yes (make backups)
+       Text=N&o (do not make backups)
+       Text=
+       Text French=&Oui
+       Text French=N&on
+       Text French=
+       Text German=&Ja
+       Text German=N&ein  
+       Text German=
+       Text Portuguese=&Sim
+       Text Portuguese=Nã&o
+       Text Portuguese=
+       Text Spanish=&Sí
+       Text Spanish=N&o
+       Text Spanish=
+       Text Italian=&Sì
+       Text Italian=N&o
+       Text Italian=
+       Text Danish=&Ja
+       Text Danish=&Nej
+       Text Danish=
+       Text Dutch=&Ja
+       Text Dutch=N&ee
+       Text Dutch=
+       Text Norwegian=&Ja
+       Text Norwegian=&Nei
+       Text Norwegian=
+       Text Swedish=&Ja
+       Text Swedish=N&ej
+       Text Swedish=
+     end
+     item: Static
+       Control Name=BACK2
+       Rectangle=86 138 256 166
+       Action=1
+       Create Flags=01010000000000000000000000000111
+       Text=Backup File Destination Directory
+       Text French=Répertoire de destination des fichiers de sauvegarde
+       Text German=Zielverzeichnis für die Sicherungsdatei
+       Text Portuguese=Directório de destino de ficheiro de segurança
+       Text Spanish=Directorio de Destino de los Archivos de Seguridad
+       Text Italian=Directory di destinazione dei file di backup
+       Text Danish=Destinationsbibliotek til sikkerhedskopier
+       Text Dutch=Doeldirectory backup-bestand
+       Text Norwegian=Målkatalog for sikkerhetskopier
+       Text Swedish=Katalog för säkerhetskopierade filer
+     end
+     item: Push Button
+       Control Name=BACK3
+       Rectangle=212 148 254 162
+       Variable=BACKUP_SAVE
+       Value=%BACKUP%
+       Destination Dialog=1
+       Action=2
+       Create Flags=01010000000000010000000000000000
+       Text=B&rowse...
+       Text French=P&arcourir
+       Text German=B&lättern...
+       Text Portuguese=P&rocurar
+       Text Spanish=V&isualizar...
+       Text Italian=Sfoglia...
+       Text Danish=&Gennemse...
+       Text Dutch=B&laderen...
+       Text Norwegian=Bla igjennom
+       Text Swedish=&Bläddra
+     end
+     item: Static
+       Control Name=BACK4
+       Rectangle=103 150 203 160
+       Destination Dialog=2
+       Create Flags=01010000000000000000000000000000
+       Text=%BACKUP%
+       Text French=%BACKUP%
+       Text German=%BACKUP%
+       Text Portuguese=%BACKUP%
+       Text Spanish=%BACKUP%
+       Text Italian=%BACKUP%
+       Text Danish=%BACKUP%
+       Text Dutch=%BACKUP%
+       Text Norwegian=%BACKUP%
+       Text Swedish=%BACKUP%
+     end
+     item: Static
+       Rectangle=86 9 258 29
+       Create Flags=01010000000000000000000000000000
+       Flags=0000000000000001
+       Name=Times New Roman
+       Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
+       Text=Backup Replaced Files
+       Text French=Sélectionner les composants
+       Text German=Komponenten auswählen
+       Text Spanish=Seleccione componentes
+       Text Italian=Selezionare i componenti
+     end
+     item: If/While Statement
+       Variable=DOBACKUP
+       Value=B
+     end
+     item: Set Control Attribute
+       Control Name=BACK3
+       Operation=1
+     end
+     item: Set Control Attribute
+       Control Name=BACK4
+       Operation=1
+     end
+     item: Else Statement
+     end
+     item: Set Control Attribute
+       Control Name=BACK3
+     end
+     item: Set Control Attribute
+       Control Name=BACK4
+     end
+     item: End Block
+     end
+   end
+   item: Dialog
+     Title=Select Destination Directory
+     Title French=Choisissez le répertoire de destination
+     Title German=Zielverzeichnis wählen
+     Title Portuguese=Seleccionar Directório de Destino
+     Title Spanish=Seleccione el Directorio de Destino
+     Title Italian=Seleziona Directory di destinazione
+     Title Danish=Vælg Destinationsbibliotek
+     Title Dutch=Kies Doeldirectory
+     Title Norwegian=Velg målkatalog
+     Title Swedish=Välj destinationskalatog
+     Width=221
+     Height=173
+     Font Name=Helv
+     Font Size=8
+     item: Listbox
+       Rectangle=5 2 160 149
+       Variable=BACKUP
+       Create Flags=01010000100000010000000101000000
+       Flags=0000110000100010
+       Text=%BACKUP%
+       Text=
+       Text French=%BACKUP%
+       Text French=
+       Text German=%BACKUP%
+       Text German=
+       Text Portuguese=%BACKUP%
+       Text Portuguese=
+       Text Spanish=%BACKUP%
+       Text Spanish=
+       Text Italian=%BACKUP%
+       Text Italian=
+       Text Danish=%BACKUP%
+       Text Danish=
+       Text Dutch=%BACKUP%
+       Text Dutch=
+       Text Norwegian=%BACKUP%
+       Text Norwegian=
+       Text Swedish=%BACKUP%
+       Text Swedish=
+     end
+     item: Push Button
+       Rectangle=167 6 212 21
+       Create Flags=01010000000000010000000000000001
+       Text=OK
+       Text French=OK
+       Text German=OK
+       Text Portuguese=OK
+       Text Spanish=ACEPTAR
+       Text Italian=OK
+       Text Danish=OK
+       Text Dutch=OK
+       Text Norwegian=OK
+       Text Swedish=OK
+     end
+     item: Push Button
+       Rectangle=167 25 212 40
+       Variable=BACKUP
+       Value=%BACKUP_SAVE%
+       Create Flags=01010000000000010000000000000000
+       Flags=0000000000000001
+       Text=Cancel
+       Text French=Annuler
+       Text German=Abbrechen 
+       Text Portuguese=Cancelar
+       Text Spanish=Cancelar
+       Text Italian=Annulla
+       Text Danish=Slet
+       Text Dutch=Annuleren
+       Text Norwegian=Avbryt
+       Text Swedish=Avbryt
+     end
+   end
+ end
+ item: Custom Dialog Set
    Name=Select Components
    Display Variable=DISPLAY
***************
*** 477,481 ****
      end
      item: Checkbox
!       Rectangle=86 66 256 138
        Variable=COMPONENTS
        Create Flags=01010000000000010000000000000011
--- 745,749 ----
      end
      item: Checkbox
!       Rectangle=86 62 256 134
        Variable=COMPONENTS
        Create Flags=01010000000000010000000000000011
***************
*** 485,488 ****
--- 753,757 ----
        Text=Python utility scripts (Tools/)
        Text=Python test suite (Lib/test/)
+       Text=Register file extensons (requires Admin privs)
        Text=
        Text French=Python interpreter, library and Tcl/Tk
***************
*** 490,493 ****
--- 759,763 ----
        Text French=Python utility scripts (Tools/)
        Text French=Python test suite (Lib/test/)
+       Text French=Register file extensons (requires Admin privs)
        Text French=
        Text German=Python interpreter, library and Tcl/Tk
***************
*** 495,498 ****
--- 765,769 ----
        Text German=Python utility scripts (Tools/)
        Text German=Python test suite (Lib/test/)
+       Text German=Register file extensons (requires Admin privs)
        Text German=
        Text Spanish=Python interpreter, library and Tcl/Tk
***************
*** 500,503 ****
--- 771,775 ----
        Text Spanish=Python utility scripts (Tools/)
        Text Spanish=Python test suite (Lib/test/)
+       Text Spanish=Register file extensons (requires Admin privs)
        Text Spanish=
        Text Italian=Python interpreter, library and Tcl/Tk
***************
*** 505,508 ****
--- 777,781 ----
        Text Italian=Python utility scripts (Tools/)
        Text Italian=Python test suite (Lib/test/)
+       Text Italian=Register file extensons (requires Admin privs)
        Text Italian=
      end
***************
*** 542,546 ****
      end
      item: Static
!       Rectangle=86 42 256 61
        Create Flags=01010000000000000000000000000000
        Text=Choose which components to install by checking the boxes below.
--- 815,819 ----
      end
      item: Static
!       Rectangle=86 38 256 57
        Create Flags=01010000000000000000000000000000
        Text=Choose which components to install by checking the boxes below.
***************
*** 792,797 ****
    Text=This include script allows uninstall support
  end
  item: Include Script
!   Pathname=%_WISE_%\INCLUDE\uninstal.wse
  end
  item: Remark
--- 1065,1076 ----
    Text=This include script allows uninstall support
  end
+ item: Remark
+   Text=Note from Tim:  this is our own Uninstal.wse, a copy of Wise's except
+ end
+ item: Remark
+   Text=it writes to HKCU (instead of HKLM) if the user doesn't have admin privs.
+ end
  item: Include Script
!   Pathname=.\Uninstal.wse
  end
  item: Remark
***************
*** 898,905 ****
--- 1177,1200 ----
  item: Remark
  end
+ item: Check Configuration
+   Flags=10111111
+ end
  item: Set Variable
    Variable=DLLDEST
    Value=%SYS32%
  end
+ item: Else Statement
+ end
+ item: Set Variable
+   Variable=DLLDEST
+   Value=%MAINDIR%
+ end
+ item: End Block
+ end
+ item: Remark
+ end
+ item: Remark
+   Text=Install the license even if they deselect everything <wink>.
+ end
  item: Install File
    Source=..\license
***************
*** 920,923 ****
--- 1215,1232 ----
  end
  item: Remark
+   Text=These arrange to (recursively!) delete all .pyc and .pyo files at uninstall time.
+ end
+ item: Remark
+   Text=This "does the right thing":  any directories left empty at the end are removed.
+ end
+ item: Add Text to INSTALL.LOG
+   Text=File Tree: %MAINDIR%\*.pyc
+ end
+ item: Add Text to INSTALL.LOG
+   Text=File Tree: %MAINDIR%\*.pyo
+ end
+ item: Remark
+ end
+ item: Remark
    Text=A: interpreter, libraries and Tcl/Tk
  end
***************
*** 1142,1153 ****
    Text=Libraries (Lib/)
  end
- item: Remark
-   Text=Remove entire Lib directory at uninstall time.
- end
- item: Add Text to INSTALL.LOG
-   Text=File Tree: %MAINDIR%\Lib\*.*
- end
- item: Remark
- end
  item: Install File
    Source=..\lib\*.py
--- 1451,1454 ----
***************
*** 1321,1332 ****
    Flags=00001010
  end
- item: Remark
-   Text=Delete entire Tools directory at uninstall time.
- end
- item: Add Text to INSTALL.LOG
-   Text=File Tree: %MAINDIR%\Tools\*.*
- end
- item: Remark
- end
  item: Install File
    Source=..\tools\scripts\*.py
--- 1622,1625 ----
***************
*** 1527,1530 ****
--- 1820,1831 ----
  end
  item: Remark
+   Text=Registering file extensions requires Admin privs.
+ end
+ item: If/While Statement
+   Variable=COMPONENTS
+   Value=E
+   Flags=00001010
+ end
+ item: Remark
    Text=Register file extensions.
  end
***************
*** 1606,1609 ****
--- 1907,1912 ----
    New Value=%MAINDIR%\pyc.ico
  end
+ item: End Block
+ end
  item: Remark
  end
***************
*** 1732,1735 ****
--- 2035,2044 ----
    Text=Well, *this* is cryptic!  It's setting up the app publisher and URL entries for Win2K add/remove.
  end
+ item: Remark
+   Text=Ack, and "Win2K" isn't enough either -- you can't actually do this without Admin privs too.
+ end
+ item: Check Configuration
+   Flags=10111111
+ end
  item: Edit Registry
    Total Keys=3
***************
*** 1753,1759 ****
--- 2062,2111 ----
    end
  end
+ item: Else Statement
+ end
+ item: Remark
+   Text=Same thing, except write to HKCU instead.
+ end
  item: Remark
+   Text=Damn -- this "edit keys" cmd was created by the Installation Expert view, and I duplicated and
+ end
+ item: Remark
+   Text=edited it by hand.  The info comes from the "Windows 2000" section of the Properties view,
  end
  item: Remark
+   Text=and if you change it there it will only show up in the "if" block above.
+ end
+ item: Remark
+   Text=Easiest to make corresponding changes in *this* block by editing this script in
+ end
+ item: Remark
+   Text=a plain text editor.
+ end
+ item: Edit Registry
+   Total Keys=3
+   item: Key
+     Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
+     New Value=http://www.python.org/
+     Value Name=HelpLink
+     Root=1
+   end
+   item: Key
+     Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
+     New Value=PythonLabs at Zope Corporation
+     Value Name=Publisher
+     Root=1
+   end
+   item: Key
+     Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
+     New Value=http://www.python.org/
+     Value Name=URLInfoAbout
+     Root=1
+   end
+ end
+ item: End Block
+ end
+ item: Remark
+ end
+ item: Remark
    Text=Populate Start Menu
  end
***************
*** 1834,1841 ****
    Direction Variable=DIRECTION
    Display Variable=DISPLAY
!   Bitmap Pathname=%_WISE_%\Dialogs\Template\Wizard.bmp
!   X Position=0
!   Y Position=0
!   Filler Color=0
  end
  item: Custom Dialog Set
--- 2186,2194 ----
    Direction Variable=DIRECTION
    Display Variable=DISPLAY
!   Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP
!   X Position=9
!   Y Position=10
!   Filler Color=8421440
!   Flags=00000011
  end
  item: Custom Dialog Set
***************
*** 1864,1878 ****
      end
      item: Push Button
-       Rectangle=105 187 150 202
-       Variable=DISABLED
-       Value=!
-       Create Flags=01010000000000010000000000000000
-       Text=< &Back
-       Text French=< &Retour
-       Text German=< &Zurück
-       Text Spanish=< &Atrás
-       Text Italian=< &Indietro
-     end
-     item: Push Button
        Rectangle=211 187 256 202
        Variable=DISABLED
--- 2217,2220 ----
***************
*** 1887,1895 ****
      end
      item: Static
-       Rectangle=8 180 256 181
-       Action=3
-       Create Flags=01010000000000000000000000000111
-     end
-     item: Static
        Rectangle=86 8 258 42
        Create Flags=01010000000000000000000000000000
--- 2229,2232 ----
***************
*** 1921,1924 ****
--- 2258,2266 ----
        Text Italian=
        Text Italian=Premere il pulsante Fine per uscire dall'installazione.
+     end
+     item: Static
+       Rectangle=8 180 256 181
+       Action=3
+       Create Flags=01010000000000000000000000000111
      end
    end

Index: pythoncore.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.dsp,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -C2 -d -r1.15.2.6 -r1.15.2.7
*** pythoncore.dsp	2001/07/17 04:51:54	1.15.2.6
--- pythoncore.dsp	2001/08/02 02:40:43	1.15.2.7
***************
*** 1179,1182 ****
--- 1179,1197 ----
  # Begin Source File
  
+ SOURCE=..\Python\mysnprintf.c
+ 
+ !IF  "$(CFG)" == "pythoncore - Win32 Release"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Debug"
+ 
+ !ELSEIF  "$(CFG)" == "pythoncore - Win32 Alpha Release"
+ 
+ !ENDIF 
+ 
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\Python\mystrtoul.c