[WinOF] RC5 changes

Add/Remove WinOF path to system-wide search path definition; InstallScript routine.

git-svn-id: svn://openib.tc.cornell.edu/gen1@687 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.Rul b/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.Rul
index ef58cb7bc66e734da52f74eede722eb7a87f6f78..dd463677802308f4f47a251b02d6c00ab9002be3 100644 (file)
--- a/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.Rul
+++ b/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.Rul
@@ -173,9 +173,9 @@ Dlg_SdStartCopy:
     if (nResult = 1) then\r
         F5 = ", DAT & uDAPL";\r
     endif;\r
-    FeatureGetData (MEDIA,"OpenSM_Service",FEATURE_FIELD_SELECTED,nResult,svResult);\r
+    FeatureGetData (MEDIA,"OpenSM_Service_enabled",FEATURE_FIELD_SELECTED,nResult,svResult);\r
     if (nResult = 1) then\r
-        F6 = ", OpenSM_service enabled.";\r
+        F6 = ", OpenSM_service Enabled.";\r
     endif;\r
     // strcat()...where art thou?\r
     Sprintf(szSetup,"%s%s%s%s%s%s%s",F0,F1,F2,F3,F4,F5,F6);\r

diff --git a/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.inx b/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.inx
index 44bc5b16c3416ca7ddf263e2421815539c731794..ed25c2624523e55ba7311b5ae396d47483c7a619 100644 (file)
Binary files a/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.inx and b/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.inx differ

diff --git a/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.obs b/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.obs
index 126ee2de4a509e8b7619fdfa7a88f59ecf5ebcbf..89044b9938d14b1facb7e9c7e4a2e40e434223f0 100644 (file)
Binary files a/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.obs and b/branches/WinOF/InstallShield/WinOF_x64/WinOF_x64/Script Files/Setup.obs differ