Fix detection of installation of future and past versions

Author: reevespaul

builds/install/arch-specific/win32/FirebirdInstall.iss

@@ -40,6 +40,17 @@
 ;     server. They must be stopped manually.
 ;
 ;
+;   Debugging this script
+;
+;   You need to run BuildExecutableInstall.bat to create the correct environment.
+;   If you have built firebird from run_all.bat you need to switch to the install
+;   script directory:
+;     pushd ..\install\arch-specific\win32
+;
+;   After that you should be able to compile and debug the script from the command
+;   line thus:
+;     "%INNO6_SETUP_PATH%"\compil32.exe FirebirdInstall.iss
+;
 ;
 #define MyAppPublisher "Firebird Project"
 #define MyAppURL "http://www.firebirdsql.org/"
@@ -250,6 +261,7 @@
 #define debug_str=""
 #endif
 
+#define InstallTimeStamp GetDateTimeString('yyyymmdd-hhnnss','','')
 
 [Setup]
 AppName={#MyAppName}
@@ -539,7 +551,7 @@ Source: {#FilesDir}\help\*.*; DestDir: {app}\help; Components: DevAdminComponent
 Source: {#FilesDir}\include\*.*; DestDir: {app}\include; Components: DevAdminComponent; Flags: ignoreversion recursesubdirs createallsubdirs;
 Source: {#FilesDir}\intl\fbintl.dll; DestDir: {app}\intl; Components: ServerComponent; Flags: sharedfile ignoreversion;
 Source: {#FilesDir}\intl\fbintl.conf; DestDir: {app}\intl; Components: ServerComponent; Flags: onlyifdoesntexist
-Source: {#FilesDir}\lib\*.*; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion;
+Source: {#FilesDir}\lib\*.lib; DestDir: {app}\lib; Components: DevAdminComponent; Flags: ignoreversion;
 #if PlatformTarget == "x64"
 Source: {#WOW64Dir}\lib\*.lib; DestDir: {app}\WOW64\lib; Components: DevAdminComponent; Flags: ignoreversion
 #endif
@@ -572,9 +584,13 @@ Source: {#FilesDir}\examples\*.*; DestDir: {app}\examples; Components: DevAdminC
 #ifdef ship_pdb
 Source: {#FilesDir}\fbclient.pdb; DestDir: {app}; Components: ClientComponent;
 Source: {#FilesDir}\firebird.pdb; DestDir: {app}; Components: ServerComponent;
+Source: {#FilesDir}\fbtracemgr.pdb; DestDir: {app}; Components: DevAdminComponent;
+Source: {#FilesDir}\intl\fbintl.pdb; DestDir: {app}\intl; Components: DevAdminComponent;
 Source: {#FilesDir}\gbak.pdb; DestDir: {app}; Components: DevAdminComponent;
 Source: {#FilesDir}\gfix.pdb; DestDir: {app}; Components: DevAdminComponent;
+Source: {#FilesDir}\ib_util.pdb; DestDir: {app}; Components: ServerComponent;
 Source: {#FilesDir}\isql.pdb; DestDir: {app}; Components: ClientComponent;
+Source: {#FilesDir}\nbackup.pdb; DestDir: {app}; Components: DevAdminComponent;
 Source: {#FilesDir}\plugins\*.pdb; DestDir: {app}\plugins; Components: ServerComponent;
 #if PlatformTarget == "x64"
 Source: {#WOW64Dir}\fbclient.pdb; DestDir: {app}\WOW64; Components: ClientComponent;
@@ -665,6 +681,7 @@ begin
 end;
 
 
+
 function InitializeSetup(): Boolean;
 var
   i: Integer;
@@ -679,8 +696,8 @@ begin
   if ((pos('HELP',Uppercase(CommandLine)) > 0) or
     (pos('--',Uppercase(CommandLine)) > 0) )
 //	or
-//    (pos('/?',Uppercase(CommandLine)) > 0) or		// InnoSetup displays its own help if these switches are passed.
-//    (pos('/H',Uppercase(CommandLine)) > 0) ) 		// Note also that our help scren only appears after the Choose Language dialogue :-(
+//    (pos('/?',Uppercase(CommandLine)) > 0) or     // InnoSetup displays its own help if these switches are passed.
+//    (pos('/H',Uppercase(CommandLine)) > 0) )      // Note also that our help screen only appears after the Choose Language dialogue :-(
   then begin
     ShowHelpDlg;
     result := False;
@@ -1231,7 +1248,7 @@ begin
   Result := True;
   case CurPageID of
     AdminUserPage.ID : begin
-    { check user has entered new sysdba password correctly. }
+      { check user has entered new sysdba password correctly. }
       i := CompareStr(AdminUserPage.Values[0],AdminUserPage.Values[1]);
       If  not (i = 0) then begin
         Result := False;
@@ -1246,4 +1263,3 @@ end;
 begin
 end.
 
-; kate: replace-tabs on; indent-width 2; tab-width 2; replace-tabs-save on; syntax Pascal;