Changeset 8996

Timestamp:

08/05/11 17:59:32 (23 months ago)

Author:

sampson

Message:

Updated Windows installer

Location:

branches/Orange-Branch/install-windows

Files:

• OrangeFS-Client.ism (modified) (previous)
• OrangeFS-Client/Script Files/Setup.Rul (modified) (8 diffs)

branches/Orange-Branch/install-windows/OrangeFS-Client/Script Files/Setup.Rul

@@ -23 +23 @@
 /* export prototype MyFunction(HWND); */
 
-prototype InstallServices();
+prototype InstallServices(); 
+prototype InstallDriver();
+
+// global variables
+
+// 64-bit flag
+BOOL bIs64Bit;
+// Program Files and System directories for appropriate architecture
+STRING szProgramFilesDir, szSystemDir;
 
 //---------------------------------------------------------------------------
@@ -33 +41 @@
 function OnBegin()
 begin
-        // TO DO: you may change default non-UI setting, for example
-        //
-        // You may also perform your custom initialization steps, check requirements, etc.
+    // Set directory locations based on architecture (32/64-bit)
+    bIs64Bit = SYSINFO.bIsWow64;
+    if (bIs64Bit) then
+        szProgramFilesDir = PROGRAMFILES64;
+        szSystemDir = WINSYSDIR64;
+    else
+        szProgramFilesDir = PROGRAMFILES;
+        szSystemDir = WINSYSDIR;
+    endif;
 end;
 //---------------------------------------------------------------------------
@@ -136 +150 @@
     return 0;
 end;                    
-    
+
+function InstallDriver()
+    STRING svExePath;
+begin                                                 
+    svExePath = szProgramFilesDir ^ "\\Dokan\\DokanLibrary\\dokanctl.exe";
+    
+    LaunchAppAndWait(svExePath, "/i d", LAAW_OPTION_WAIT);
+end;    
+
 function InstallServices()
     NUMBER rc, line, error;
@@ -145 +167 @@
                                "DokanMounter",
                                "OrangeFS/Dokan driver interface service",
-                               PROGRAMFILES + "\\Dokan\\DokanLibrary\\mounter.exe",
+                               szProgramFilesDir ^ "\\Dokan\\DokanLibrary\\mounter.exe",
                                TRUE,
                                "");
@@ -152 +174 @@
             Sprintf(errText, " (%d)", error);
             MessageBox("DokanMounter service installation failed:\n" +
-                        FormatMessage(error) + errText, SEVERE);
+                        FormatMessage(error) + errText + " " +
+                        szProgramFilesDir + "\\Dokan\\DokanLibrary\\mounter.exe", SEVERE);
         endif;
     endif;
@@ -159 +182 @@
                                "OrangeFS Client",
                                "Allows transparent access to Orange file systems.",
-                               INSTALLDIR + "\\orangefs-client -service",
+                               INSTALLDIR ^ "\\orangefs-client -service",
                                FALSE,
                                "");
@@ -166 +189 @@
             Sprintf(errText, " (%d)", error);
             MessageBox("OrangeFS Client service installation failed:\n" +
-                        FormatMessage(error) + errText, SEVERE);
+                        FormatMessage(error) + errText + " " +
+                        INSTALLDIR + "\\orangefs-client -service", SEVERE);
         endif;
     endif;
@@ -188 +212 @@
     bOpt2   = FALSE;
     
-    InstallServices();    
+    InstallServices();
+    
+    InstallDriver();    
 
     if ( BATCH_INSTALL ) then