[WINOF] Install previous OpenSM version 3.0.0 as an emergency SM backup; 2-2 only...

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

diff --git a/branches/WOF2-2/WinOF/WIX/common/OpenSM_service.inc b/branches/WOF2-2/WinOF/WIX/common/OpenSM_service.inc
index 9e403ca4d6dbe8ad4f7be89f9545af69a6f3fb27..0a79c601f1e4cb26b4c8ddd325080c9dd89de037 100644 (file)
--- a/branches/WOF2-2/WinOF/WIX/common/OpenSM_service.inc
+++ b/branches/WOF2-2/WinOF/WIX/common/OpenSM_service.inc
@@ -9,8 +9,29 @@
          <File Id="opensm.exe" DiskId="1"\r
                Name="opensm.exe"\r
                Source="..\bin\tools\$(var.ARCH)\release\opensm.exe"\r
-               Vital='yes' KeyPath='yes' Hidden='no' System='no' \r
-               Checksum='no' ReadOnly='no' />\r
+               Vital='yes' KeyPath='yes' Hidden='no' System='no' />\r
+\r
+         <File Id="opensm.pdb" DiskId="1"\r
+               Name="opensm.pdb"\r
+               Source="..\bin\tools\$(var.ARCH)\release\opensm.pdb" />\r
+\r
+         <File Id="osmtest.exe" DiskId="1"\r
+               Name="osmtest.exe"\r
+               Source="..\bin\tools\$(var.ARCH)\release\osmtest.exe" />\r
+\r
+         <File Id="ibtrapgen.exe" DiskId="1"\r
+               Name="ibtrapgen.exe"\r
+               Source="..\bin\tools\$(var.ARCH)\release\ibtrapgen.exe" />\r
+\r
+         <!-- Temp: include previous opensm.exe v3.0.0 -->\r
+         <File Id="opensm_3_0_0.exe" DiskId="1"\r
+               Name="opensm_3_0_0.exe"\r
+               Source="..\bin\tools\$(var.ARCH)\release\opensm_3_0_0.exe" />\r
+\r
+         <File Id="opensm_3_0_0.pdb" DiskId="1"\r
+               Name="opensm_3_0_0.pdb"\r
+               Source="..\bin\tools\$(var.ARCH)\release\opensm_3_0_0.pdb" />\r
+         <!-- End Temp include -->\r
 \r
          <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'\r
                Description='InfiniBand Subnet Configuration and Management'\r

diff --git a/branches/WOF2-2/WinOF/WIX/common/tools.inc b/branches/WOF2-2/WinOF/WIX/common/tools.inc
index 3c13361b7ca1ef8d661006791b52b5d1c28c03f6..f0c515afd9962abb413d0158a4e73b01ebdbcc44 100644 (file)
--- a/branches/WOF2-2/WinOF/WIX/common/tools.inc
+++ b/branches/WOF2-2/WinOF/WIX/common/tools.inc
@@ -38,12 +38,6 @@
        <File Id="ib_write_lat.exe" DiskId="1"\r
              Name="ib_write_lat.exe"\r
              Source="..\bin\tools\$(var.ARCH)\release\ib_write_lat.exe" />\r
-       <File Id="ibtrapgen.exe" DiskId="1"\r
-             Name="ibtrapgen.exe"\r
-             Source="..\bin\tools\$(var.ARCH)\release\ibtrapgen.exe" />\r
-       <File Id="osmtest.exe" DiskId="1"\r
-             Name="osmtest.exe"\r
-             Source="..\bin\tools\$(var.ARCH)\release\osmtest.exe" />\r
        <File Id="PrintIP.exe" DiskId="1"\r
              Name="PrintIP.exe"\r
              Source="..\bin\tools\$(var.ARCH)\release\PrintIP.exe" />\r