Changeset 425 for trunk

Timestamp:

Mar 12, 2019, 4:49:32 PM (6 years ago)

Author:

ataylor

Message:

Updated old-style installer for compatibility with existing installations on ArcaOS etc.

Location:

trunk/installer

Files:

• MainFormUnit.pas (modified) (9 diffs)
• newviewinstall.scu (modified) ( previous)

trunk/installer/MainFormUnit.pas

@@ -23 +23 @@
   Description = 'NewView Install';
 
-  Version =        'V1.10.0'; // $SS_REQUIRE_NEW_VERSION$
-  BldLevelVersion = '1.10.0'; // Embedded for IBM BLDLEVEL tool
+  Version =        'V1.10.1'; // $SS_REQUIRE_NEW_VERSION$
+  BldLevelVersion = '1.10.1'; // Embedded for IBM BLDLEVEL tool
 
   // BLDLevel - compatible - mostly
@@ -414 +414 @@
   FSystemDLLDir := FSystemDir + 'dll\';
 
-  // ecs things
+  // aos/ecs things
   FEnv_OSDir := GetEnvironmentFolder( 'OSDIR' );
   FEnv_Programs := GetEnvironmentFolder( 'PROGRAMS' );
@@ -570 +570 @@
     begin
       DoErrorDlg( 'Install Error',
-                  'Unable to acces ' + StrCRLF
+                  'Unable to access ' + StrCRLF
                   + ' ' + DestinationPath + StrCRLF
                   + SysErrorMessage( rc ) );
@@ -976 +976 @@
 end;
 
+function MoveFileError( const Source: string;
+                        const Dest: string;
+                        const IsModule: boolean;
+                        var SourceInUse: boolean ): boolean;
+var
+  rc: APIRET;
+  szSource: cstring;
+  FileHandle: HFILE;
+  ActionTaken: ULONG;
+begin
+  // First copy the file
+  Result := CopyFileError( Source,
+                           Dest  );
+  if not Result then exit;
+
+  // Now delete the original
+  szSource := Source;
+  // see if it's in use.
+  rc := DosOpen( szSource,
+                 FileHandle,
+                 ActionTaken,
+                 0,         // new size: not used
+                 0,         // attributes: not used
+                 OPEN_ACTION_FAIL_IF_NEW + OPEN_ACTION_OPEN_IF_EXISTS,
+                 OPEN_FLAGS_FAIL_ON_ERROR + OPEN_SHARE_DENYREADWRITE
+                 + OPEN_ACCESS_READWRITE,
+                 nil );     // e.a.s: not used
+  DosClose( FileHandle );
+  if rc = ERROR_SHARING_VIOLATION then
+  begin
+    // file in use
+    if not IsModule then
+    begin
+      Result := false;
+      DoErrorDlg( 'Installation Error',
+                  'This file is in use: ' + StrCRLF
+                  + ' ' + Source + StrCRLF
+                  + 'and cannot be moved.' );
+      exit;
+    end;
+
+    // unlock the module
+    SourceInUse := true;
+    rc := DosReplaceModule( Addr( szSource ),
+                            nil,
+                            nil );
+    if rc <> 0 then
+    begin
+      // error
+      Result := false;
+      DoErrorDlg( 'Install Error',
+                  'Could not unlock ' + StrCRLF
+                  + ' ' + Source + StrCRLF
+                  + SysErrorMessage( rc ) );
+
+      exit;
+    end;
+  end;
+  Result := DeleteFile( Source );
+end;
+
 // Do a full install, replacing parts of the operating system
 // as needed.
@@ -990 +1051 @@
   ObjectID: string;
   rc: longint;
+  HelpMgrDllPath: string;
+  HelpMgrOriginal: string;
   HelpMgrBackupPath: string;
   StubBackupPath: string;
@@ -1071 +1134 @@
 
   // install viewer app to either x:\os2
-  // or on eCS, %OSDIR%\bin
+  // or on ArcaOS or eCS, %OSDIR%\bin
   if FEnv_OSDir <> '' then
   begin
-    // ecs - with a dir specified
+    // aos/ecs - with a dir specified
     AppDir := FEnv_OSDir + 'bin\';
   end
@@ -1083 +1146 @@
   end;
 
-  LanguageDir := AppDir; // for now.
+  if FEnv_OSDir <> '' then
+  begin
+    LanguageDir := FEnv_OSDir + 'lang\';
+  end
+  else
+  begin
+    LanguageDir := AppDir; // for now.
+  end;
 
   // Where shall we put the programs eh?
   FAppInstallPath := AppDir + 'NewView.exe';
   FStubInstallPath := FSystemDir + 'view.exe';
-  FDllInstallPath := FSystemDLLDir + 'newview.dll';
+
+  if FEnv_OSDir <> '' then
+  begin
+    FDllInstallPath := FEnv_OSDir + 'dll\';
+  end
+  else
+  begin
+    FDllInstallPath := FSystemDLLDir;
+  end;
 
   // check for existing files that might conflict
@@ -1188 +1266 @@
   if GetInstallType = itComplete then
   begin
+    HelpMgrDllPath    := FDllInstallPath + 'HelpMgr.dll';
+    HelpMgrOriginal   := FSystemDLLDir + 'HelpMgr.dll';
     HelpMgrBackupPath := FSystemDLLDir + 'HelpMgr.bak';
+
+    // Back up the original HELPMGR.DLL. We have to do this separately
+    // (rather than in Installfile) because it might not be in the same
+    // place as our replacement.
+    if FileExists( HelpMgrOriginal ) and
+       not FileExists( HelpMgrBackupPath ) then
+    begin
+      if not MoveFileError( HelpMgrOriginal,
+                            HelpMgrBackupPath,
+                            true, FDLLInUse ) then
+        exit;
+    end;
+
+    // Now install the new HelpMgr
     if not InstallFile( 'HelpMgr.dll',
-                        FSystemDLLDir + 'HelpMgr.dll',
-                        HelpMgrBackupPath,
+                        HelpMgrDllPath,
+                        '',
                         true,
                         FDLLInUse ) then
@@ -1226 +1320 @@
   // newview.dll
   if not InstallFile( 'NewView.dll',
-                      FDllInstallPath,
+                      FDllInstallPath + 'newview.dll',
                       '', // no backup
                       false, // not in use