8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:43:02 +01:00

White space; spelling; misc

This commit is contained in:
Paul Reeves 2024-06-21 11:35:05 +02:00
parent 8de93af965
commit 55614892cb
4 changed files with 114 additions and 105 deletions

View File

@ -30,15 +30,15 @@
o EnumerateObjectList;
- Simple demonstration of object enumeration.
o Show Help
- CreateHelpDlg;
- ShowHelpDlg: Integer;
- CloseHelpDlg;
o Show Help
- CreateHelpDlg;
- ShowHelpDlg: Integer;
- CloseHelpDlg;
o Show some debug info for debugging inno setup script
- CreateDebugDlg
- CloseDebugDlg;
- ShowDebugDlg
o Show some debug info for debugging inno setup script
- CreateDebugDlg
- CloseDebugDlg;
- ShowDebugDlg
*)
@ -91,15 +91,15 @@ begin
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
@ -108,18 +108,18 @@ begin
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.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.objects[i] := (WizardForm.FindComponent(CompGroupButtonsArray[i]));
@ -129,7 +129,7 @@ end;
procedure ResizeWizardFormHeight(AValue: Integer);
var
i: integer;
i: integer;
begin
wizardform.height := wizardform.height+AValue;
wizardform.top := wizardform.top - (AValue div 2);
@ -139,16 +139,16 @@ 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);
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(CompGroupButtonsArray)-1 do
TControl(CompGroupButtons.objects[i]).top := TControl(CompGroupButtons.objects[i]).top + AValue;
end;
@ -156,16 +156,16 @@ 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;
DebugDlg: TForm;
procedure CreateDebugDlg(aString: String; ADescription: String);
var
DebugText: TMemo;
// DebugDescription: TLabel;
// DebugDescription: TLabel;
OKButton: TButton;
begin
DebugDlg := TForm.create(nil);
@ -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;

View File

@ -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.

View File

@ -80,10 +80,17 @@ o Be sure to install as an administrator. ie, if
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

View File

@ -17,6 +17,7 @@ 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.
This can be found here:
http://www.jrsoftware.org/ishelp/
It is highly recommended that a scripted install is tested thoroughly
@ -54,7 +55,7 @@ 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.
used by innosetup itself to display innosetup specific help.
/COMPONENTS="comma separated list of component names"
@ -67,11 +68,11 @@ 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.
@ -105,6 +106,7 @@ HELP
UseSuperServerTask,UseServiceTask,AutoStartTask,CopyFbClientToSysTask
/MERGETASKS="comma separated list of task names"
Like the /TASKS parameter, except the specified tasks will be merged