From: Julian Smart Date: Wed, 13 Oct 1999 16:30:46 +0000 (+0000) Subject: Added some setup files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/07e632909b568e4eddd9837021b3ebb9a55d9286 Added some setup files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 8e27b835b2..281cf708fe 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -19,6 +19,8 @@ makefile.unx.in distrib/msw/*.rsp distrib/msw/*.bat +distrib/msw/*.cpp +distrib/msw/*.txt distrib/msw/tardist distrib/msw/tmake/*.t distrib/msw/tmake/Makefile @@ -26,6 +28,7 @@ distrib/msw/tmake/filelist.txt distrib/msw/tmake/makeall.bat distrib/msw/tmake/makeall.sh distrib/msw/tmake/wxwin.pro +distrib/msw/tmake/tmake.conf distrib/gtk/* locale/*.po diff --git a/distrib/msw/readme.txt b/distrib/msw/readme.txt new file mode 100644 index 0000000000..a701e56380 --- /dev/null +++ b/distrib/msw/readme.txt @@ -0,0 +1,36 @@ +Distribution scripts and lists +----------------------------------------------------------------- + +This directory (distrib\msw) contains some 4DOS batch files +(.bat) and 'response' files (.rsp) to simplify the job of +producing distributions. The .rsp files specify which files are +associated with a particular module, e.g. wx200vc.rsp refers to +the VC++ project files, wx200gen.rsp represents the generic files, +wx200msw.rsp specifies the Windows specific files, etc. + +When making a distribution on Windows, I call zipdist.bat to prepare +zip files with everything needed for Windows, +GTK and Motif. zipdist then unzips some of them into +deliver\wx, removes and adds a few files to perfect the +distribution. + +zipdist then calls 'makewise.bat' to generate a new wxwin2.wse +script, for WISE Installer. It takes wisetop.txt, wisebott.txt +and adds the section for file installation. (If you've modified +wxwin2.wse using WISE Installer, simply compile and run splitwise.exe +to put back up-to-date wisetop.txt, wisebott.txt files before +running zipdist.) + +Finally, zipdist runs WISE Installer using a command line +argument to produce the setup.* files automatically. + +Note that although zipdist.bat produces archives for 3 platforms, +I only use a subset of these to produce the Windows-specific +setup.exe. I then have the option of distributing the zip files +as well. + +You may need to install 4DOS to run these scripts. If anyone +wishes to remove 4DOS dependency, that's fine with me. + +Julian Smart, 11th October 1999 + diff --git a/distrib/msw/splitwise.cpp b/distrib/msw/splitwise.cpp new file mode 100644 index 0000000000..65a9624272 --- /dev/null +++ b/distrib/msw/splitwise.cpp @@ -0,0 +1,106 @@ +/////////////////////////////////////////////////////////////////////////////// +// Name: splitwise.cpp +// Purpose: Use this to split wxwin2.wse in the distrib/msw directory +// into wisetop.txt, wisebott.txt. This allows you to do the +// following: +// +// 1) Edit the existing wxwin2.wse in WISE Install. +// 2) Call splitwise.exe to split off the non-file bits (i.e. +// preserve everything except the "item: Install File" lines). +// 3) Call makewise.bat to generate a new wxwin2.wse from +// wisetop.txt, wisebott.txt and the file list generated +// from the files in deliver\wx (which themselves have been +// put there by zipdist.bat). +// +// If you don't wish to change the WISE settings, then there's no +// need to use splitwise, but it's very likely that settings will +// be altered, e.g. to change the version number, what's installed, +// etc. +// +// Author: Julian Smart +// Modified by: +// Created: 13/10/99 +// RCS-ID: $Id$ +// Copyright: (c) Julian Smart +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// + + +#include +#include +#include + +char g_Line[1024]; + +int ReadLine(FILE* fd, char* buf) +{ + int ch; + int i = 0; + while (((ch = getc(fd)) != EOF) && (ch != '\n')) + { + buf[i] = ch; + i ++; + } + buf[i] = 0; + + if (ch == EOF && (i == 0)) + return 0; + else + return 1; +} + +void WriteLine(FILE* fd, char* buf) +{ + int len = strlen(buf); + int i; + for (i = 0; i < len; i++) + putc(buf[i], fd); + putc('\n', fd); +} + +int main(int argc, char* argv[]) +{ + FILE* wiseTop = fopen("wisetop.txt", "w"); + if (!wiseTop) + return 1; + + FILE* wiseBottom = fopen("wisebott.txt", "w"); + if (!wiseBottom) + return 1; + + FILE* wiseWhole = fopen("wxwin2.wse", "r"); + if (!wiseWhole) + return 1; + + // Write out the top of the file + g_Line[0] = 0; + while (ReadLine(wiseWhole, g_Line)) + { + if (strcmp(g_Line, "item: Install File") == 0) + break; + else + WriteLine(wiseTop, g_Line); + } + // Skip to the end of the file items + while (ReadLine(wiseWhole, g_Line)) + { + if ((strncmp(g_Line, "item:", 5) == 0) && (strcmp(g_Line, "item: Install File") != 0)) + { + WriteLine(wiseBottom, g_Line); + break; + } + } + // Write the rest of the bottom + while (ReadLine(wiseWhole, g_Line)) + { + WriteLine(wiseBottom, g_Line); + } + + fclose(wiseTop); + fclose(wiseBottom); + fclose(wiseWhole); + + return 0; +} + + diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 880244dbc3..3c119d4848 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -333,7 +333,7 @@ rcparser: nmake -f makefile.vc FINAL=$(FINAL) cd $(WXDIR)\src\msw -clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm +clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg -erase $(LIBTARGET) -erase $(WXDIR)\lib\$(WXLIBNAME).pdb -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll diff --git a/distrib/msw/wisebott.txt b/distrib/msw/wisebott.txt new file mode 100644 index 0000000000..b36f13710d --- /dev/null +++ b/distrib/msw/wisebott.txt @@ -0,0 +1,241 @@ +item: Set Variable + Variable=MAINDIR + Value=%MAINDIR% + Flags=00010100 +end +item: Include Script + Pathname=c:\Program Files\WISE\INCLUDE\uninstal.wse +end +item: Check Configuration + Flags=10111011 +end +item: Get Registry Key Value + Variable=GROUPDIR + Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders + Default=%WIN%\Start Menu\Programs + Value Name=Programs + Flags=00000010 +end +item: Set Variable + Variable=GROUP + Value=%GROUPDIR%\%GROUP% +end +item: Create Shortcut + Source=%MAINDIR%\Docs\Winhelp\Wx.hlp + Destination=%GROUP%\wxWindows Manual.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\Docs\Readme.txt + Destination=%GROUP%\ReadMe.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\docs\winhelp\dialoged.hlp + Destination=%GROUP%\Dialog Editor Help.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\docs\winhelp\ogl.hlp + Destination=%GROUP%\Object Graphics Library Help.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\docs\winhelp\prop.hlp + Destination=%GROUP%\wxProperty Classes Help.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\docs\winhelp\tex2rtf.hlp + Destination=%GROUP%\Tex2RTF Help.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\docs\winhelp\wxtree.hlp + Destination=%GROUP%\wxTree Help.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\docs\html\index.htm + Destination=%GROUP%\HTML Docs Index.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\docs\msw\install.txt + Destination=%GROUP%\Compiling wxWindows.lnk + Working Directory=%MAINDIR% +end +item: Create Shortcut + Source=%MAINDIR%\bin\dialoged.exe + Destination=%GROUP%\Dialog Editor.lnk + Working Directory=%MAINDIR% +end +item: Else Statement +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=Dialog Editor + Command Line=%MAINDIR%\bin\dialoged.exe + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=wxWindows Manual + Command Line=%MAINDIR%\Docs\Winhelp\Wx.hlp + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=Compiling wxWindows + Command Line=%MAINDIR%\docs\msw\install.txt + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=ReadMe + Command Line=%MAINDIR%\Docs\Readme.txt + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=HTML Docs Index + Command Line=%MAINDIR%\docs\html\index.htm + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=Dialog Editor Help + Command Line=%MAINDIR%\docs\winhelp\dialoged.hlp + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=Object Graphics Library Help + Command Line=%MAINDIR%\docs\winhelp\ogl.hlp + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=wxProperty Classes Help + Command Line=%MAINDIR%\docs\winhelp\prop.hlp + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=Tex2RTF Help + Command Line=%MAINDIR%\docs\winhelp\tex2rtf.hlp + Default Directory=%MAINDIR% +end +item: Add ProgMan Icon + Group=%GROUP% + Icon Name=wxTree Help + Command Line=%MAINDIR%\docs\winhelp\wxtree.hlp + Default Directory=%MAINDIR% +end +item: End Block +end +item: Self-Register OCXs/DLLs + Description=Updating System Configuration, Please Wait... +end +item: Add to AUTOEXEC.BAT + New Text=SET WXWIN=%MAINDIR% + Search Text=SET WXWIN + Line Number=0 + Flags=00010110 +end +item: Wizard Block + Direction Variable=DIRECTION + Display Variable=DISPLAY + Bitmap Pathname=c:\Program Files\WISE\DIALOGS\TEMPLATE\WIZARD.BMP + X Position=9 + Y Position=10 + Filler Color=8421440 + Flags=00000011 +end +item: Custom Dialog Set + Name=Finished + Display Variable=DISPLAY + item: Dialog + Title=%APPTITLE% Installation + Title French=Installation de %APPTITLE% + Title German=Installation von %APPTITLE% + Title Spanish=Instalación de %APPTITLE% + Title Italian=Installazione di %APPTITLE% + Width=271 + Height=224 + Font Name=Helv + Font Size=8 + item: Push Button + Rectangle=150 187 195 202 + Variable=DIRECTION + Value=N + Create Flags=01010000000000010000000000000001 + Text=&Finish + Text French=&Fin + Text German=&Weiter + Text Spanish=&Terminar + Text Italian=&Fine + 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 + Value=! + Action=3 + Create Flags=01010000000000010000000000000000 + Text=&Cancel + Text French=&Annuler + Text German=&Abbrechen + Text Spanish=&Cancelar + Text Italian=&Annulla + end + item: Static + Rectangle=8 180 256 181 + Action=3 + Create Flags=01010000000000000000000000000111 + end + item: Static + Rectangle=86 8 258 42 + 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=Installation Completed! + Text French=Installation terminée ! + Text German=Die Installation ist abgeschlossen! + Text Spanish=¡Instalación terminada! + Text Italian=Installazione completata! + end + item: Static + Rectangle=86 42 256 102 + Create Flags=01010000000000000000000000000000 + Text=The %APPTITLE% source files have been successfully installed. You will need to compile the library and any demo files you wish to run: please see docs\msw\install.txt for details. + Text= + Text=Press the Finish button to exit this installation. + Text French=%APPTITLE% est maintenant installé. + Text French= + Text French=Cliquez sur le bouton Fin pour quitter l'installation. + Text German=%APPTITLE% wurde erfolgreich installiert. + Text German= + Text German=Klicken Sie auf "Weiter", um die Installation zu beenden. + Text Spanish=%APPTITLE% se ha instalado con éxito. + Text Spanish= + Text Spanish=Presione el botón Terminar para salir de esta instalación. + Text Italian=L'installazione %APPTITLE% è stata portata a termine con successo. + Text Italian= + Text Italian=Premere il pulsante Fine per uscire dall'installazione. + end + end +end +item: End Block +end diff --git a/distrib/msw/wisetop.txt b/distrib/msw/wisetop.txt new file mode 100644 index 0000000000..27bc859ddb --- /dev/null +++ b/distrib/msw/wisetop.txt @@ -0,0 +1,604 @@ +Document Type: WSE +item: Global + Version=5.0 + Title=wxWindows 2.1.10 Installation + Flags=00000100 + Split=1420 + Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + Japanese Font Name=MS Gothic + Japanese Font Size=10 + Start Gradient=0 0 255 + End Gradient=0 0 0 + Windows Flags=00000000000000010010110000001000 + Log Pathname=%MAINDIR%\INSTALL.LOG + Message Font=MS Sans Serif + Font Size=8 + Disk Filename=SETUP + Patch Flags=0000000000000001 + Patch Threshold=85 + Patch Memory=4000 + EXE Filename=D:\wx2\wxWindows\deliver\setup.exe + FTP Cluster Size=20 + Variable Name1=_SYS_ + Variable Default1=C:\WINDOWS\SYSTEM + Variable Flags1=00001000 + Variable Name2=_ODBC16_ + Variable Default2=C:\WINDOWS\SYSTEM + Variable Flags2=00001000 + Variable Name3=_ODBC32_ + Variable Default3=C:\WINDOWS\SYSTEM + Variable Flags3=00001000 + Variable Name4=_WISE_ + Variable Default4=C:\PROGRAM FILES\WISE + Variable Flags4=00001000 +end +item: Open/Close INSTALL.LOG + Flags=00000001 +end +item: Check if File/Dir Exists + Pathname=%SYS% + Flags=10000100 +end +item: Set Variable + Variable=SYS + Value=%WIN% +end +item: End Block +end +item: Set Variable + Variable=APPTITLE + Value=wxWindows 2.1.10 +end +item: Set Variable + Variable=GROUP + Value=wxWindows 2 +end +item: Set Variable + Variable=DISABLED + Value=! +end +item: Set Variable + Variable=MAINDIR + Value=wx2 +end +item: Check Configuration + Flags=10111011 +end +item: Get Registry Key Value + Variable=COMMON + Key=SOFTWARE\Microsoft\Windows\CurrentVersion + Default=C:\Program Files\Common Files + Value Name=CommonFilesDir + Flags=00000100 +end +item: Get Registry Key Value + Variable=PROGRAM_FILES + Key=SOFTWARE\Microsoft\Windows\CurrentVersion + Default=C:\Program Files + Value Name=ProgramFilesDir + Flags=00000100 +end +item: Set Variable + Variable=MAINDIR + Value=%PROGRAM_FILES%\%MAINDIR% +end +item: Set Variable + Variable=EXPLORER + Value=1 +end +item: Else Statement +end +item: Set Variable + Variable=MAINDIR + Value=C:\%MAINDIR% +end +item: End Block +end +item: Set Variable + Variable=BACKUP + Value=%MAINDIR%\BACKUP +end +item: Set Variable + Variable=DOBACKUP + Value=B +end +item: Set Variable + Variable=BRANDING + Value=0 +end +item: If/While Statement + Variable=BRANDING + Value=1 +end +item: Read INI Value + Variable=NAME + Pathname=%INST%\CUSTDATA.INI + Section=Registration + Item=Name +end +item: Read INI Value + Variable=COMPANY + Pathname=%INST%\CUSTDATA.INI + Section=Registration + Item=Company +end +item: If/While Statement + Variable=NAME +end +item: Set Variable + Variable=DOBRAND + Value=1 +end +item: End Block +end +item: End Block +end +item: Wizard Block + Direction Variable=DIRECTION + Display Variable=DISPLAY + Bitmap Pathname=c:\Program Files\WISE\DIALOGS\TEMPLATE\WIZARD.BMP + X Position=9 + Y Position=10 + Filler Color=8421440 + Dialog=Select Program Manager Group + Dialog=Select Backup Directory + Dialog=Display Registration Information + Dialog=Get Registration Information + Variable=EXPLORER + Variable=DOBACKUP + Variable=DOBRAND + Variable=DOBRAND + Value=1 + Value=A + Value=1 + Value=1 + Compare=0 + Compare=1 + Compare=0 + Compare=1 + Flags=00000011 +end +item: Custom Dialog Set + Name=Welcome + Display Variable=DISPLAY + item: Dialog + Title=%APPTITLE% Installation + Title French=Installation de %APPTITLE% + Title German=Installation von %APPTITLE% + Title Spanish=Instalación de %APPTITLE% + Title Italian=Installazione di %APPTITLE% + Width=271 + Height=224 + Font Name=Helv + Font Size=8 + item: Static + Rectangle=86 8 258 42 + 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=Welcome! + Text French=Bienvenue ! + Text German=Willkommen! + Text Spanish=¡Bienvenido! + Text Italian=Benvenuti! + end + item: Push Button + Rectangle=150 187 195 202 + Variable=DIRECTION + Value=N + Create Flags=01010000000000010000000000000001 + Text=&Next > + Text French=&Suite > + Text German=&Weiter > + Text Spanish=&Siguiente > + Text Italian=&Avanti > + 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 + Action=3 + Create Flags=01010000000000010000000000000000 + Text=&Cancel + Text French=&Annuler + Text German=&Abbrechen + Text Spanish=&Cancelar + Text Italian=&Annulla + end + item: Static + Rectangle=86 41 256 130 + Create Flags=01010000000000000000000000000000 + Text=This installation program will install %APPTITLE%. It will need about 18 MB of hard disk space. + Text= + Text=Press the Next button to start the installation. You can press the Cancel button now if you do not want to install %APPTITLE% at this time. + Text French=Ce programme d'installation va installer %APPTITLE%. + Text French= + Text French=Cliquez sur le bouton Suite pour démarrer l'installation. Vous pouvez cliquer sur le bouton Quitter l'installation si vous ne voulez pas installer %APPTITLE% tout de suite. + Text German=Mit diesem Installationsprogramm wird %APPTITLE% installiert. + Text German= + Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Abbrechen", um die Installation von %APPTITLE% abzubrechen. + Text Spanish=Este programa de instalación instalará %APPTITLE%. + Text Spanish= + Text Spanish=Presione el botón Siguiente para iniciar la instalación. Puede presionar el botón Salir de instalación si no desea instalar %APPTITLE% en este momento. + Text Italian=Questo programma installerà %APPTITLE%. + Text Italian= + Text Italian=Per avvviare l'installazione premere il pulsante Avanti. Se non si desidera installare %APPTITLE% ora, premere il pulsante Esci dall'installazione. + end + item: Static + Rectangle=8 180 256 181 + Action=3 + Create Flags=01010000000000000000000000000111 + end + end +end +item: Custom Dialog Set + Name=Select Destination Directory + Display Variable=DISPLAY + item: Dialog + Title=%APPTITLE% Installation + Title French=Installation de %APPTITLE% + Title German=Installation von %APPTITLE% + Title Spanish=Instalación de %APPTITLE% + Title Italian=Installazione di %APPTITLE% + Width=271 + Height=224 + Font Name=Helv + Font Size=8 + item: Push Button + Rectangle=150 187 195 202 + Variable=DIRECTION + Value=N + Create Flags=01010000000000010000000000000001 + Text=&Next > + Text French=&Suite > + Text German=&Weiter > + Text Spanish=&Siguiente > + Text Italian=&Avanti > + 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 + Create Flags=01010000000000010000000000000000 + Text=&Cancel + Text French=&Annuler + Text German=&Abbrechen + Text Spanish=&Cancelar + Text Italian=&Annulla + end + item: Static + Rectangle=8 180 256 181 + Action=3 + Create Flags=01010000000000000000000000000111 + end + item: Static + Rectangle=86 8 258 42 + 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=Select Destination Directory + Text French=Sélectionner le répertoire de destination + Text German=Zielverzeichnis wählen + 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 %APPTITLE% files are to be installed. + Text= + Text=Important: do not install into a directory with a space in the name, such as Program Files. + 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=B&rowse + 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 + item: Dialog + Title=Select Destination Directory + Title French=Sélectionner le répertoire de destination + Title German=Zielverzeichnis wählen + Title Spanish=Seleccione el directorio de destino + Title Italian=Selezionare Directory di destinazione + Width=221 + Height=173 + Font Name=Helv + Font Size=8 + item: Listbox + Rectangle=5 5 163 149 + Variable=MAINDIR + Create Flags=01010000100000010000000101000000 + Flags=0000110000100010 + Text=%MAINDIR% + Text French=%MAINDIR% + Text German=%MAINDIR% + Text Spanish=%MAINDIR% + Text Italian=%MAINDIR% + end + item: Push Button + Rectangle=167 6 212 21 + Create Flags=01010000000000010000000000000001 + Text=OK + Text French=OK + Text German=OK + Text Spanish=Aceptar + Text Italian=OK + end + item: Push Button + Rectangle=167 25 212 40 + Variable=MAINDIR + Value=%MAINDIR_SAVE% + Create Flags=01010000000000010000000000000000 + Flags=0000000000000001 + Text=Cancel + Text French=Annuler + Text German=Abbrechen + Text Spanish=Cancelar + Text Italian=Annulla + end + end +end +item: Custom Dialog Set + Name=Select Program Manager Group + Display Variable=DISPLAY + item: Dialog + Title=%APPTITLE% Installation + Title French=Installation de %APPTITLE% + Title German=Installation von %APPTITLE% + Title Spanish=Instalación de %APPTITLE% + Title Italian=Installazione di %APPTITLE% + Width=271 + Height=224 + Font Name=Helv + Font Size=8 + item: Push Button + Rectangle=150 187 195 202 + Variable=DIRECTION + Value=N + Create Flags=01010000000000010000000000000001 + Text=&Next > + Text French=&Suite > + Text German=&Weiter > + Text Spanish=&Siguiente > + Text Italian=&Avanti > + 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 + Create Flags=01010000000000010000000000000000 + Text=&Cancel + Text French=&Annuler + Text German=&Abbrechen + Text Spanish=&Cancelar + Text Italian=&Annulla + end + item: Static + Rectangle=8 180 256 181 + Action=3 + Create Flags=01010000000000000000000000000111 + end + item: Static + Rectangle=86 8 258 42 + 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=Select ProgMan 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 + Text Italian=Selezionare il gruppo ProgMan + end + item: Static + Rectangle=86 44 256 68 + Create Flags=01010000000000000000000000000000 + Text=Enter the name of the Program Manager group to add the %APPTITLE% icons to: + 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%: + Text Italian=Inserire il nome del gruppo Program Manager per aggiungere le icone %APPTITLE% a: + end + item: Combobox + Rectangle=86 69 256 175 + Variable=GROUP + Create Flags=01010000001000010000001100000001 + Flags=0000000000000001 + Text=%GROUP% + Text French=%GROUP% + Text German=%GROUP% + Text Spanish=%GROUP% + Text Italian=%GROUP% + end + end +end +item: Custom Dialog Set + Name=Start Installation + Display Variable=DISPLAY + item: Dialog + Title=%APPTITLE% Installation + Title French=Installation de %APPTITLE% + Title German=Installation von %APPTITLE% + Title Spanish=Instalación de %APPTITLE% + Title Italian=Installazione di %APPTITLE% + Width=271 + Height=224 + Font Name=Helv + Font Size=8 + item: Push Button + Rectangle=150 187 195 202 + Variable=DIRECTION + Value=N + Create Flags=01010000000000010000000000000001 + Text=&Next > + Text French=&Suite > + Text German=&Weiter > + Text Spanish=&Siguiente > + Text Italian=&Avanti > + end + item: Push Button + Rectangle=105 187 150 202 + Variable=DIRECTION + Value=B + 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 + Action=3 + Create Flags=01010000000000010000000000000000 + Text=&Cancel + Text French=&Annuler + Text German=&Abbrechen + Text Spanish=&Cancelar + Text Italian=&Annulla + end + item: Static + Rectangle=8 180 256 181 + Action=3 + Create Flags=01010000000000000000000000000111 + end + item: Static + Rectangle=86 8 258 42 + 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=Ready to Install! + Text French=Prêt à installer ! + Text German=Installationsbereit! + Text Spanish=¡Preparado para la instalación! + Text Italian=Pronto per l'installazione! + end + item: Static + Rectangle=86 42 256 102 + 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 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. + Text German=Sie können %APPTITLE% nun installieren. + Text German= + Text German=Klicken Sie auf "Weiter", um mit der Installation zu beginnen. Klicken Sie auf "Zurück", um die Installationsinformationen neu einzugeben. + Text Spanish=Ya está listo para instalar %APPTITLE%. + Text Spanish= + Text Spanish=Presione el botón Siguiente para comenzar la instalación o presione Atrás para volver a ingresar la información para la instalación. + Text Italian=Ora è possibile installare %APPTITLE%. + Text Italian= + Text Italian=Premere il pulsante Avanti per avviare l'installazione o il pulsante Indietro per reinserire le informazioni di installazione. + end + end +end +item: If/While Statement + Variable=DISPLAY + Value=Select Destination Directory +end +item: Set Variable + Variable=BACKUP + Value=%MAINDIR%\BACKUP +end +item: End Block +end +item: End Block +end +item: If/While Statement + Variable=DOBACKUP + Value=A +end +item: Set Variable + Variable=BACKUPDIR + Value=%BACKUP% +end +item: End Block +end +item: If/While Statement + Variable=BRANDING + Value=1 +end +item: If/While Statement + Variable=DOBRAND + Value=1 +end +item: Edit INI File + Pathname=%INST%\CUSTDATA.INI + Settings=[Registration] + Settings=NAME=%NAME% + Settings=COMPANY=%COMPANY% + Settings= +end +item: End Block +end +item: End Block +end +item: Open/Close INSTALL.LOG +end +item: Check Disk Space + Component=COMPONENTS +end + diff --git a/distrib/msw/wxwin01.bmp b/distrib/msw/wxwin01.bmp new file mode 100644 index 0000000000..19decec48e Binary files /dev/null and b/distrib/msw/wxwin01.bmp differ diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat index 501e56dd14..4ec3c6d850 100755 --- a/distrib/msw/zipdist.bat +++ b/distrib/msw/zipdist.bat @@ -10,12 +10,16 @@ echo To %dest echo CTRL-C if this is not correct. pause +rem goto dounzip + erase %dest\wx200*.zip erase %dest\glcanvas.zip erase %dest\ogl3.zip erase %dest\tex2rtf2.zip erase %dest\jpeg.zip +if direxist %dest\wx deltree /Y %dest\wx + cd %src echo Zipping... @@ -68,6 +72,52 @@ copy %src\docs\readme.txt %dest copy %src\docs\motif\makewxmotif %dest copy %src\docs\gtk\makewxgtk %dest +:dounzip + +cd %dest + +rem Unzip the Windows files into 'wx' +mkdir %dest\wx + +Rem After this change of directory, we're in the +Rem temporary 'wx' directory and not acting on +Rem the source wxWindows directory. +cd %dest\wx +unzip32 -o ..\wx200msw.zip +unzip32 -o ..\wx200gen.zip +unzip32 -o ..\wx200vc.zip +unzip32 -o ..\wx200hlp.zip +unzip32 -o ..\glcanvas.zip +unzip32 -o ..\treedraw.zip +unzip32 -o ..\ogl3.zip +unzip32 -o ..\jpeg.zip + +rem unzip32 -o ..\wx200doc.zip +rem unzip32 -o ..\wx200bc.zip +rem unzip32 -o ..\wx200cw.zip + +rem Now delete a few files that are unnecessary +erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh +erase /SY Makefile.in +erase /Y docs\pdf\ogl.pdf +deltree /Y docs\html\ogl + +rem Now copy some binary files to 'bin' +if not isdir bin mkdir bin +copy %src\bin\dialoged.exe bin +copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin + +rem Time to regenerate the WISE install script, wxwin2.wse. +rem NB: if you've changed wxwin2.wse using WISE, call splitwise.exe +rem from within distrib\msw, to split off wisetop.txt and wisebott.txt. +echo Calling 'makewise' to generate wxwin2.wse... +call %WXWIN\distrib\msw\makewise.bat + +rem Now invoke WISE install on the new wxwin2.wse +set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse +echo Invoking %wisecmd... +start /w %wisecmd + cd %dest echo wxWindows archived.