From 46f5ad7d2caf382080aea46b4a041ebbbf535008 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 29 Mar 2001 11:58:24 +0000 Subject: [PATCH] Added Inno Setup distrib files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/innobott.txt | 40 +++++++ distrib/msw/innotop.txt | 46 ++++++++ distrib/msw/makeinno.bat | 71 ++++++++++++ distrib/msw/zipdistinno.bat | 225 ++++++++++++++++++++++++++++++++++++ 4 files changed, 382 insertions(+) create mode 100644 distrib/msw/innobott.txt create mode 100644 distrib/msw/innotop.txt create mode 100755 distrib/msw/makeinno.bat create mode 100755 distrib/msw/zipdistinno.bat diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt new file mode 100644 index 0000000000..91a792de76 --- /dev/null +++ b/distrib/msw/innobott.txt @@ -0,0 +1,40 @@ + +[Icons] + Name: {group}\Dialog Editor; Filename: {app}\bin\dialoged.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\dialoged.exe; IconIndex: 0 + Name: {group}\Dialog Editor Help; Filename: {app}\bin\dialoged.hlp; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths + Name: {group}\Life! Demo; Filename: {app}\bin\life.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\life.exe; IconIndex: 0 + Name: {group}\Tex2rtf; Filename: {app}\bin\tex2rtf.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\tex2rtf.exe; IconIndex: 0 + Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.hlp; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths + Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths + Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths + Name: {group}\Debug View; Filename: {app}\bin\DBGVIEW.EXE; WorkingDir: {app}\bin; IconFilename: {app}\bin\DBGVIEW.EXE; IconIndex: 0 + Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths + Name: {group}\wxWindows Help; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths + Name: {group}\HTML Docs Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths + +[INI] + +[Registry] + +[UninstallDelete] + +[InstallDelete] + +[Run] + +[UninstallRun] + + +; ============================================== +; The lines below are used by ScriptMaker +; They are not required by Inno Setup +; DO NOT DELETE THEM or you may be unable to reload the script + +;[ScriptSetup] +;VerNum=2.2.6 +;InnoVer=1.3 +;AddVerTo=AppVerName +;SetupFilename=setup.exe +;OutputFolder=C:\wx2stable\wxWindows\deliver +;CopyrightText=Copyright © The wxWindows Team + diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt new file mode 100644 index 0000000000..bdf9d70bdf --- /dev/null +++ b/distrib/msw/innotop.txt @@ -0,0 +1,46 @@ +; Inno Setup Script +; Created with ScriptMaker Version 1.3.22 +; 29 January 2001 at 14:22 + +[Setup] + MinVersion=4.0,4.0 + AppName=wxWindows + AppId=wxWindows + CreateUninstallRegKey=1 + UsePreviousAppDir=1 + UsePreviousGroup=1 + AppVersion=2.2.6 + AppVerName=wxWindows 2.2.6 + AppCopyright=Copyright © The wxWindows Team + BackColor=$FF0000 + BackColor2=$000000 + BackColorDirection=toptobottom + WindowShowCaption=1 + WindowStartMaximized=1 + WindowVisible=1 + WindowResizable=1 + UninstallDisplayName=Uninstall wxWindows + UninstallLogMode=Append + DirExistsWarning=auto + UninstallFilesDir={app} + DisableDirPage=0 + DisableStartupPrompt=0 + CreateAppDir=1 + DisableProgramGroupPage=0 + AlwaysCreateUninstallIcon=1 + UninstallIconName=Uninstall wxWindows + Uninstallable=1 + DefaultDirName=c:\wx2 + DefaultGroupName=wxWindows 2.2.6 + LicenseFile=C:\wx2stable\wxWindows\docs\licence.txt + InfoBeforeFile=C:\wx2stable\wxWindows\docs\readme.txt + InfoAfterFile=C:\wx2stable\wxWindows\docs\msw\install.txt + MessagesFile=compiler:default.isl + DiskSpanning=1 + DiskSize=1457664 + DiskClusterSize=512 + ReserveBytes=0 + UseSetupLdr=1 + SourceDir=C:\wx2stable\wxWindows\deliver\wx + OutputDir=C:\wx2stable\wxWindows\deliver + diff --git a/distrib/msw/makeinno.bat b/distrib/msw/makeinno.bat new file mode 100755 index 0000000000..a6ada9c35f --- /dev/null +++ b/distrib/msw/makeinno.bat @@ -0,0 +1,71 @@ +@echo off +Rem Make an Inno Setup distribution list, where files and dirs are represented by +Rem sections like this: +Rem [Dirs] +Rem Name: {app}\docs +Rem +Rem [Files] +Rem Source: c:\wx2stable\wxWindows\deliver2\docs\readme.txt; DestDir: {app}\docs\; DestName: readme.txt + +set wxwindir=c:\wx2stable\wxWindows + +Rem Generate a list of all files in the distribution. +Rem We have to be in the right directory already. +dir /BS >& %TEMP\files1.tmp + +Rem Now we iterate through the list of files, writing out the middle section of +Rem the file. +Rem We have to remove the first part of the path, +Rem by truncating the start by the size of the current directory. + +set sz=%@EVAL[%@LEN[%_CWD]+1] +set len=%@LINES[%TEMP\files1.tmp] + +erase /Y %TEMP\files2.tmp + +Rem Add directories + +echo. >> %temp\files2.tmp +echo [Dirs] >> %temp\files2.tmp + +do i = 0 to %len by 1 + set line=%@LINE[%TEMP\files1.tmp,%i] + Rem Skip files. + if not isdir %line enddo + set sz2=%@LEN[%line] + set n=%@EVAL[%sz2-%sz] + set line2=%@SUBSTR[%line,%sz,%n] + if "%line2%" == "" enddo + + echo Name: {app}\%line2 >> %TEMP\files2.tmp +enddo + +echo. >>%TEMP\files2.tmp + +Rem Add files + +echo. >> %temp\files2.tmp +echo [Files] >> %temp\files2.tmp + +do i = 0 to %len by 1 + set line=%@LINE[%TEMP\files1.tmp,%i] + Rem Skip directories. + if isdir %line enddo + set sz2=%@LEN[%line] + set n=%@EVAL[%sz2-%sz] + set line2=%@SUBSTR[%line,%sz,%n] + set filename=%@FILENAME[%line2] + set dirname=%@PATH[%line2] + + echo Source: %line; DestDir: {app}\%dirname; DestName: %filename >> %TEMP\files2.tmp +enddo + +Rem Concatenate the 3 sections +cat %wxwindir\distrib\msw\innotop.txt %TEMP\files2.tmp %wxwindir\distrib\msw\innobott.txt > %wxwindir\distrib\msw\wxwin2.iss + +erase /Y %TEMP\files1.tmp +rem erase /Y %TEMP\files2.tmp + +goto end + +:end diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat new file mode 100755 index 0000000000..c1aae4cf30 --- /dev/null +++ b/distrib/msw/zipdistinno.bat @@ -0,0 +1,225 @@ +@echo off +rem Zip up an external, generic + Windows distribution of wxWindows 2 +rem using Inno Setup + ScriptMaker +set src=%wxwin +set dest=%src\deliver +set inno=0 + +Rem Set this to the required version +set version=2.2.6 + +if "%src" == "" goto usage +if "%dest" == "" goto usage +if "%1" == "-help" goto usage +if "%1" == "--help" goto usage +if "%1" == "/?" goto usage +if "%1" == "innoonly" goto dounzip +if "%1" == "inno" set inno=1 +if "%1" == "tidyup" goto tidyup +echo About to archive an external wxWindows distribution: +echo From %src +echo To %dest +if "%inno" == "1" echo with Inno Setup creation. +echo CTRL-C if this is not correct. +pause + +erase %dest\wx*.zip +erase %dest\*.htb +erase %dest\ogl3.zip +erase %dest\tex2rtf2.zip +erase %dest\jpeg.zip +erase %dest\tiff.zip +erase %dest\dialoged.zip +erase %dest\utils.zip +erase %dest\extradoc.zip +erase %dest\*-win32.zip + +if direxist %dest\wx erase /sxyz %dest\wx\ +if not direxist %dest mkdir %dest + +cd %src +echo Zipping... + +Rem Zip up the complete wxMSW-xxx.zip file +Rem NO, do it by unarchiving component files, deleting/copying some files, then +Rem rearchiving. +Rem zip32 -@ %dest\wxMSW-%version%.zip < %src\distrib\msw\generic.rsp +Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\msw.rsp +Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp +Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\jpeg.rsp +Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp + +Rem Below is the old-style separated-out format. This is retained only +Rem for local use, and for creating wxMSW-xxx.zip. +zip32 -@ %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\generic.rsp +zip32 -@ -u %dest\wxWindows-%version%-gen.zip < %src\distrib\msw\makefile.rsp +zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp +zip32 -@ -u %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\makefile.rsp +zip32 -@ %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\gtk.rsp +zip32 -@ -u %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\makefile.rsp +zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp +zip32 -@ %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\motif.rsp +zip32 -@ -u %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\makefile.rsp +Rem (Obsolete) zip32 -@ %dest\wxWindows-%version%-user.zip < %src\distrib\msw\user.rsp + +zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp +zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp +zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp +zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp +zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp +zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp +zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp + +Rem PDF/HTML docs that should go into the Windows setup because +Rem there are no WinHelp equivalents +zip32 -@ %dest\extradoc.zip < %src\distrib\msw\extradoc.rsp + +rem VC++ project files +zip32 -@ %dest\wxWindows-%version%-vc.zip < %src\distrib\msw\vc.rsp + +rem BC++ project files +zip32 -@ %dest\wxWindows-%version%-bc.zip < %src\distrib\msw\bc.rsp + +rem CodeWarrior project files +zip32 -@ %dest\wxWindows-%version%-cw.zip < %src\distrib\msw\cw.rsp + +rem OGL 3 +zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp + +rem MMedia +zip32 -@ %dest\mmedia.zip < %src\distrib\msw\mmedia.rsp + +rem STC (Scintilla widget) +zip32 -@ %dest\stc.zip < %src\distrib\msw\stc.rsp + +rem GLCanvas: obsolete, now in main library +rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp + +rem Tex2RTF +zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp + +rem JPEG source +zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp + +rem TIFF source +zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp + +rem Dialog Editor source and binary +erase %dest\dialoged_source.zip +zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp +zip32 -j %dest\dialoged.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt +erase %dest\dialoged_source.zip + +rem Misc. utils not in the main distribution +zip32 -@ %dest\utils.zip < %src\distrib\msw\utils.rsp +zip32 -@ -u %dest\utils.zip < %src\distrib\msw\utilmake.rsp + +copy %src\docs\changes.txt %dest +copy %src\docs\msw\install.txt %dest\install_msw.txt +copy %src\docs\motif\install.txt %dest\install_motif.txt +copy %src\docs\gtk\install.txt %dest\install_gtk.txt +copy %src\docs\readme.txt %dest +copy %src\docs\motif\readme.txt %dest\readme_motif.txt +copy %src\docs\gtk\readme.txt %dest\readme_gtk.txt +copy %src\docs\msw\readme.txt %dest\readme_msw.txt +copy %src\docs\readme_vms.txt %dest +copy %src\docs\motif\makewxmotif %dest +copy %src\docs\gtk\makewxgtk %dest + +Rem Skip Inno Setup if inno is 0. +if "%inno" == "0" goto end + +:dounzip + +Rem Make dialoged-win32.zip and tex2rtf-win32.zip + +cd %src\bin + +zip32 %dest\dialoged-win32.zip dialoged.* +zip32 %dest\tex2rtf-win32.zip tex2rtf.* + +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 ..\wxWindows-%version%-msw.zip +unzip32 -o ..\wxWindows-%version%-gen.zip +unzip32 -o ..\wxWindows-%version%-vc.zip +unzip32 -o ..\wxWindows-%version%-bc.zip +unzip32 -o ..\wxWindows-%version%-HTMLHelp.zip +unzip32 -o ..\extradoc.zip +Rem Need Word file, for Remstar DB classes +unzip32 -o ..\wxWindows-%version%-Word.zip +unzip32 -o ..\ogl3.zip +unzip32 -o ..\jpeg.zip +unzip32 -o ..\tiff.zip +unzip32 -o ..\tex2rtf2.zip + +rem Now delete a few files that are unnecessary +attrib -R * +erase /Y BuildCVS.txt *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh descrip.mms +erase /Y configure samples\configure samples\*.in demos\configure demos\*.in contrib\configure contrib\*.in +erase /Y setup.h.in setup.h_vms +erase /SY Makefile.in +erase /Y docs\html\wxbook.htm docs\html\roadmap.htm +erase /Y contrib\docs\winhelp\mmedia.* +erase /Y contrib\docs\winhelp\stc.* +erase /Y contrib\docs\htmlhelp\mmedia.* +erase /Y contrib\docs\htmlhelp\stc.* +erase /Y contrib\docs\pdf\*.* +erase /sxzy contrib\docs\latex\ogl +erase /Y src\mingegcs.bat +erase /Y distrib + +rem Now copy some binary files to 'bin' +if not isdir bin mkdir bin +copy %src\bin\dialoged.exe bin +copy %src\bin\tex2rtf.exe bin +copy %src\bin\dbgview.* bin +copy %src\bin\life.exe bin +copy %src\demos\life\breeder.lif bin +copy %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt bin +copy %src\docs\winhelp\tex2rtf.hlp %src\docs\winhelp\tex2rtf.cnt bin + +Rem Make wxMSW-xxx.zip +zip32 -r ..\wxMSW-%version%.zip * + +rem Time to regenerate the Inno Setup script, wxwin2.iss. +rem NB: if you've changed wxwin2.iss using ScriptMaker, call splitinno.exe +rem from within distrib\msw, to split off innotop.txt and innobott.txt. +rem (NOT YET IMPLEMENTED) +echo Calling 'makeinno' to generate wxwin2.iss... +call %WXWIN\distrib\msw\makeinno.bat + +erase /Y %dest\setup.* + +rem Now invoke Inno Setup on the new wxwin2.iss +set innocmd="C:\Program Files\Inno Setup 1.3\compil32.exe" /cc %WXWIN\distrib\msw\wxwin2.iss +echo Invoking %innocmd... +start "Inno Setup" /w %innocmd% +pause Press any key to continue with the wxWindows distribution... +Rem ren %WXWIN\deliver2\setup.EXE %WXWIN\deliver2\wxMSW-%version%-setup.exe + +:tidyup +cd %dest + +rem Put all the setup files into a single zip archive. +zip32 wxMSW-%version%-setup.zip readme.txt setup.* + +echo wxWindows archived. + +goto end + +:usage +echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files, +echo and optionally makes a deliver2\wx directory and a setup.exe +echo if you specify 'inno' (skipping the zipping if you use 'innoonly'). +echo. +echo "Usage: zipdist [inno | innoonly]" + +:end -- 2.45.2