From 55614892cb91638cbb4717ec252e0c9c8c70e227 Mon Sep 17 00:00:00 2001 From: Paul Reeves Date: Fri, 21 Jun 2024 11:35:05 +0200 Subject: [PATCH] White space; spelling; misc --- .../win32/FirebirdInstallGUIFunctions.inc | 120 +++++++++--------- .../win32/FirebirdInstallSupportFunctions.inc | 2 +- .../win32/installation_readme.txt | 29 +++-- .../win32/installation_scripted.txt | 68 +++++----- 4 files changed, 114 insertions(+), 105 deletions(-) diff --git a/builds/install/arch-specific/win32/FirebirdInstallGUIFunctions.inc b/builds/install/arch-specific/win32/FirebirdInstallGUIFunctions.inc index 2159dcdc92..e0563d2bfa 100644 --- a/builds/install/arch-specific/win32/FirebirdInstallGUIFunctions.inc +++ b/builds/install/arch-specific/win32/FirebirdInstallGUIFunctions.inc @@ -30,15 +30,15 @@ o EnumerateObjectList; - Simple demonstration of object enumeration. - o Show Help - - CreateHelpDlg; - - ShowHelpDlg: Integer; - - CloseHelpDlg; - - o Show some debug info for debugging inno setup script - - CreateDebugDlg - - CloseDebugDlg; - - ShowDebugDlg + o Show Help + - CreateHelpDlg; + - ShowHelpDlg: Integer; + - CloseHelpDlg; + + o Show some debug info for debugging inno setup script + - CreateDebugDlg + - CloseDebugDlg; + - ShowDebugDlg *) @@ -49,9 +49,9 @@ var CompGroupButtonsArray: array of string; CompGroup1, CompGroup2, CompGroup3, CompGroupButtons: TStringList; -// This is a non-exhaustive list of components that need to be repositioned -// and/or resized if the form size is changed. Use EnumerateObjectList to -// get a full list of components. +// This is a non-exhaustive list of components that need to be repositioned +// and/or resized if the form size is changed. Use EnumerateObjectList to +// get a full list of components. procedure SetupWizardFormComponentsArrays; var i: integer; @@ -85,51 +85,51 @@ begin CompGroup1Array[23]:='OuterNotebook'; CompGroup1 := TStringList.create; - + for i := 0 to GetArrayLength( CompGroup1Array )-1 do begin - CompGroup1.add( CompGroup1Array[i] ); + CompGroup1.add( CompGroup1Array[i] ); CompGroup1.objects[i] := (WizardForm.FindComponent(CompGroup1Array[i])); end; - - SetArrayLength(CompGroup2Array,8); - CompGroup2Array[0] := 'Bevel'; - CompGroup2Array[1] := 'BeveledLabel'; - CompGroup2Array[2] := 'LicenseAcceptedRadio'; - CompGroup2Array[3] := 'LicenseNotAcceptedRadio'; - CompGroup2Array[4] := 'DiskSpaceLabel'; - CompGroup2Array[5] := 'ComponentsDiskSpaceLabel'; - CompGroup2Array[6] := 'NoIconsCheck'; - CompGroup2Array[7] := 'RunList'; + + SetArrayLength(CompGroup2Array,8); + CompGroup2Array[0] := 'Bevel'; + CompGroup2Array[1] := 'BeveledLabel'; + CompGroup2Array[2] := 'LicenseAcceptedRadio'; + CompGroup2Array[3] := 'LicenseNotAcceptedRadio'; + CompGroup2Array[4] := 'DiskSpaceLabel'; + CompGroup2Array[5] := 'ComponentsDiskSpaceLabel'; + CompGroup2Array[6] := 'NoIconsCheck'; + CompGroup2Array[7] := 'RunList'; CompGroup2 := TStringList.create; for i := 0 to GetArrayLength( CompGroup2Array )-1 do begin - CompGroup2.add(CompGroup2Array[i]); + CompGroup2.add(CompGroup2Array[i]); CompGroup2.objects[i] := (WizardForm.FindComponent(CompGroup2Array[i])); end; SetArrayLength(CompGroup3Array,1); - CompGroup3Array[0] := 'WizardBitmapImage'; + CompGroup3Array[0] := 'WizardBitmapImage'; CompGroup3 := TStringList.create; for i:=0 to GetArrayLength(CompGroup3Array)-1 do begin - CompGroup3.add(CompGroup3Array[i]); + CompGroup3.add(CompGroup3Array[i]); CompGroup3.objects[i] := (WizardForm.FindComponent(CompGroup3Array[i])); end; - SetArrayLength(CompGroupButtonsArray,3); - CompGroupButtonsArray[0] := 'BackButton'; - CompGroupButtonsArray[1] := 'NextButton'; - CompGroupButtonsArray[2] := 'CancelButton'; - CompGroupButtons := TStringList.create; + SetArrayLength(CompGroupButtonsArray,3); + CompGroupButtonsArray[0] := 'BackButton'; + CompGroupButtonsArray[1] := 'NextButton'; + CompGroupButtonsArray[2] := 'CancelButton'; + CompGroupButtons := TStringList.create; for i:=0 to GetArrayLength(CompGroupButtonsArray)-1 do begin - CompGroupButtons.add(CompGroupButtonsArray[i]); + CompGroupButtons.add(CompGroupButtonsArray[i]); CompGroupButtons.objects[i] := (WizardForm.FindComponent(CompGroupButtonsArray[i])); end; end; - + procedure ResizeWizardFormHeight(AValue: Integer); var - i: integer; + i: integer; begin wizardform.height := wizardform.height+AValue; wizardform.top := wizardform.top - (AValue div 2); @@ -139,33 +139,33 @@ begin TControl(CompGroup1.objects[i]).height := TControl(CompGroup1.objects[i]).height + Avalue; // Group 2 - reset top of components - for i:=0 to GetArrayLength(CompGroup2Array)-1 do - TControl(CompGroup2.objects[i]).top := TControl(CompGroup2.objects[i]).top + AValue; + for i:=0 to GetArrayLength(CompGroup2Array)-1 do + TControl(CompGroup2.objects[i]).top := TControl(CompGroup2.objects[i]).top + AValue; // Group 3 - reset top of components but keep 'centered' vertically. - for i:=0 to GetArrayLength(CompGroup3Array)-1 do - TControl( CompGroup3.objects[i]).top := TControl(CompGroup3.objects[i]).top + (AValue div 2); - - // Group Buttons - reset top of components - for i:=0 to GetArrayLength(CompGroupButtonsArray)-1 do - TControl(CompGroupButtons.objects[i]).top := TControl(CompGroupButtons.objects[i]).top + AValue; - + for i:=0 to GetArrayLength(CompGroup3Array)-1 do + TControl( CompGroup3.objects[i]).top := TControl(CompGroup3.objects[i]).top + (AValue div 2); + + // Group Buttons - reset top of components + for i:=0 to GetArrayLength(CompGroupButtonsArray)-1 do + TControl(CompGroupButtons.objects[i]).top := TControl(CompGroupButtons.objects[i]).top + AValue; + end; // This needs more work. for now it is not used by the installer. procedure ResizeWizardFormWidth(AValue: Integer); var - i: integer; + i: integer; begin wizardform.width := wizardform.width + AValue; - wizardform.left := wizardform.left - (AValue div 2); - + wizardform.left := wizardform.left - (AValue div 2); + // Group 1 - reset width of components - for i:=0 to GetArrayLength(CompGroup1Array)-1 do begin - TControl(CompGroup1.objects[i]).width := TControl(CompGroup1.objects[i]).width + Avalue; -// TControl(CompGroup1.objects[i]).left := TControl(CompGroup1.objects[i]).left + (Avalue div 2); - end; + for i:=0 to GetArrayLength(CompGroup1Array)-1 do begin + TControl(CompGroup1.objects[i]).width := TControl(CompGroup1.objects[i]).width + Avalue; +// TControl(CompGroup1.objects[i]).left := TControl(CompGroup1.objects[i]).left + (Avalue div 2); + end; // Group 2 - reset left of components for i:=0 to GetArrayLength(CompGroup2Array)-1 do begin @@ -286,18 +286,18 @@ function ShowHelpDlg: Integer; begin CreateHelpDlg; result := HelpDlg.ShowModal; - CloseHelpDlg; + CloseHelpDlg; end; // Add a simple debug dialogue -var - DebugDlg: TForm; - +var + DebugDlg: TForm; + procedure CreateDebugDlg(aString: String; ADescription: String); var DebugText: TMemo; -// DebugDescription: TLabel; +// DebugDescription: TLabel; OKButton: TButton; begin DebugDlg := TForm.create(nil); @@ -328,8 +328,8 @@ begin DebugDlg.ActiveControl := OKButton; end; - - + + procedure CloseDebugDlg; begin with DebugDlg do begin @@ -341,8 +341,8 @@ end; function ShowDebugDlg(aString: String; aDescription: String): Integer; begin - CreateDebugDlg(aString,aDescription); + CreateDebugDlg(aString,aDescription); result := DebugDlg.ShowModal; - CloseDebugDlg; + CloseDebugDlg; end; diff --git a/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc b/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc index 7453b6b250..c93960a6e7 100644 --- a/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc +++ b/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc @@ -17,7 +17,7 @@ Helper functions for FB installer These are / ought to be fairly generic - It makes more sense if they are independent functions - ie, they don't + It makes more sense if they are independant functions - ie, they don't call other functions in the script and they don't need to know about the install script itself. diff --git a/builds/install/arch-specific/win32/installation_readme.txt b/builds/install/arch-specific/win32/installation_readme.txt index 7a3d7eb701..f9f7d2ed5b 100644 --- a/builds/install/arch-specific/win32/installation_readme.txt +++ b/builds/install/arch-specific/win32/installation_readme.txt @@ -40,10 +40,10 @@ See the UNINSTALL section below for more info on this. Installation of the Guardian ---------------------------- -We are hoping to phase out the Guardian. It doesn't -work with the Classic server and the binary installer -does not offer it at install time if Classic is -chosen. If SuperServer or SuperClassic are chosen +We are hoping to phase out the Guardian. It doesn't +work with the Classic server and the binary installer +does not offer it at install time if Classic is +chosen. If SuperServer or SuperClassic are chosen it is offered but not selected by default. @@ -74,16 +74,23 @@ o The service installer (instsvc) uses the same installations. This is by design. Services exist in a single name space. -o Be sure to install as an administrator. ie, if - using the binary installer right click and choose - 'Run as administrator'. Otherwise the installer +o Be sure to install as an administrator. ie, if + using the binary installer right click and choose + 'Run as administrator'. Otherwise the installer may be unable to start the Firebird service at the end of installation. -o Libraries deployed by instclient may fail to load if - the MS runtime libraries have not been installed. - This may be a problem if installing on older Windows - platforms. +o Installation may fail on older versions of windows up + to Win 8.1 and Windows Server 2008 if the most recent + security updates have not been installed. This will + also affect users of the zip packs as the problem + lies with runtime library dependencies of + applications such as instclient and instsvc. + + If you do run into this problem you should consult + the microsoft knowledge base article KB2999226 for more + information on how to upgrade your version of windows + to use the latest run time libraries. Uninstallation diff --git a/builds/install/arch-specific/win32/installation_scripted.txt b/builds/install/arch-specific/win32/installation_scripted.txt index d7d68a8787..8febc9ab1e 100644 --- a/builds/install/arch-specific/win32/installation_scripted.txt +++ b/builds/install/arch-specific/win32/installation_scripted.txt @@ -14,14 +14,15 @@ General notes on preparing a scripted install --------------------------------------------- These notes only document the firebird specific options for a scripted -installation. Developers should refer to the full InnoSetup documentation -for a description of the other options available for a scripted install. +installation. Developers should refer to the full InnoSetup documentation +for a description of the other options available for a scripted install. This can be found here: + http://www.jrsoftware.org/ishelp/ -It is highly recommended that a scripted install is tested thoroughly -before deployment. The easiest way to test is to run the script without -the /SILENT parameter. This will present a standard installer with the +It is highly recommended that a scripted install is tested thoroughly +before deployment. The easiest way to test is to run the script without +the /SILENT parameter. This will present a standard installer with the scripted options preselected. NOTE that the /TASKS parameter clears all the default task settings. If @@ -44,7 +45,7 @@ HELP Setup parameters specific to the Firebird Uninstaller /CLEAN -For general parameters available to all InnoSetup based installers see the +For general parameters available to all InnoSetup based installers see the documentation for innosetup. A summary is available via /? or /HELP @@ -53,10 +54,10 @@ Parameters specific to Firebird installs HELP Invoke this file as a help screen at installation time. - Note no / is prefixed !! Because /? and /HELP are now - used by innosetup itself to dispaly innosetup specific help. + Note no / is prefixed !! Because /? and /HELP are now + used by innosetup itself to display innosetup specific help. + - /COMPONENTS="comma separated list of component names" Choose from - ServerComponent, @@ -67,31 +68,31 @@ HELP parameter causes Setup to automatically select a custom type. A full install requires combining components. For example: - /COMPONENTS="ClientComponent" + /COMPONENTS="ClientComponent" would be required for a client only install. - - NOTE - If a full server instal is required there is no need to + + NOTE - If a full server install is required there is no need to specify /COMPONENTS. All three are chosen by default. - + /TASKS="comma separated list of task names" Specifies a list of tasks that should be initially selected or deselected. To deselect a task, prefix its name with a "!" character. - Choose from - UseSuperServerTask + Choose from - UseSuperServerTask UseSuperServerTask\UseGuardianTask (optional) - or - UseSuperClassicTask + or + UseSuperClassicTask UseSuperClassicTask\UseGuardianTask (optional) or UseClassicServerTask - - UseApplicationTask - or + + UseApplicationTask + or UseServiceTask - + AutoStartTask CopyFbClientToSysTask CopyFbClientAsGds32Task @@ -103,7 +104,8 @@ HELP By default the following tasks are run: - UseSuperServerTask,UseServiceTask,AutoStartTask,CopyFbClientToSysTask + UseSuperServerTask,UseServiceTask,AutoStartTask,CopyFbClientToSysTask + /MERGETASKS="comma separated list of task names" @@ -118,8 +120,8 @@ HELP /SYSDBAPASSWORD="mypassword" If supplied this will override the default SYSDBA password "masterkey". - - NOTE: If an existing Security database is found this parameter will be + + NOTE: If an existing Security database is found this parameter will be ignored. @@ -134,8 +136,8 @@ HELP users by breaking a perfectly good working install of Firebird or InterBase. Its your choice. - - + + Parameters specific to Firebird uninstalls ------------------------------------------ @@ -159,26 +161,26 @@ Parameters specific to Firebird uninstalls Examples -------- -These examples are just for firebird related options. In practice you -they will probably be combined with options such as /SILENT, /LOG, +These examples are just for firebird related options. In practice you +they will probably be combined with options such as /SILENT, /LOG, /RESTARTEXITCODE etc. 1/ Full server install of super server architecture - o Change SYSDBA password from default masterkey, + o Change SYSDBA password from default masterkey, o deploy gds32 to /MERGETASKS="CopyFbClientAsGds32Task" /SYSDBAPASSWORD="mypassword" - + 2/ Deploy Classic Server and keep other default tasks - /MERGETASKS="UseClassicServerTask" + /MERGETASKS="UseClassicServerTask" -3/ Really mess things up by accidentally deselecting the defaults and +3/ Really mess things up by accidentally deselecting the defaults and letting InnoSetup guess: - /TASKS="CopyFbClientAsGds32Task" + /TASKS="CopyFbClientAsGds32Task" Be careful when using the /TASKS parameter ! - +