From: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Tue, 15 Dec 2009 20:53:37 +0000 (+0000)
Subject: [WINOF] Install previous OpenSM version 3.0.0 as an emergency SM backup; 2-2 only... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ce6fb83184f29d3404a2542df9374060ee529b7f;p=~shefty%2Frdma-win.git

[WINOF] Install previous OpenSM version 3.0.0 as an emergency SM backup; 2-2 only. Reference/install OpenSM related files from a single file instead of OpenSM_service.inc & tools.inc.

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 9e403ca4..0a79c601 100644
--- 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"
                Name="opensm.exe"
                Source="..\bin\tools\$(var.ARCH)\release\opensm.exe"
-               Vital='yes' KeyPath='yes' Hidden='no' System='no' 
-               Checksum='no' ReadOnly='no' />
+               Vital='yes' KeyPath='yes' Hidden='no' System='no' />
+
+         <File Id="opensm.pdb" DiskId="1"
+               Name="opensm.pdb"
+               Source="..\bin\tools\$(var.ARCH)\release\opensm.pdb" />
+
+         <File Id="osmtest.exe" DiskId="1"
+               Name="osmtest.exe"
+               Source="..\bin\tools\$(var.ARCH)\release\osmtest.exe" />
+
+         <File Id="ibtrapgen.exe" DiskId="1"
+               Name="ibtrapgen.exe"
+               Source="..\bin\tools\$(var.ARCH)\release\ibtrapgen.exe" />
+
+         <!-- Temp: include previous opensm.exe v3.0.0 -->
+         <File Id="opensm_3_0_0.exe" DiskId="1"
+               Name="opensm_3_0_0.exe"
+               Source="..\bin\tools\$(var.ARCH)\release\opensm_3_0_0.exe" />
+
+         <File Id="opensm_3_0_0.pdb" DiskId="1"
+               Name="opensm_3_0_0.pdb"
+               Source="..\bin\tools\$(var.ARCH)\release\opensm_3_0_0.pdb" />
+         <!-- End Temp include -->
 
          <ServiceInstall Id='osmSvcInstall' Vital='yes' Name='OpenSM'
                Description='InfiniBand Subnet Configuration and Management'
diff --git a/branches/WOF2-2/WinOF/WIX/common/tools.inc b/branches/WOF2-2/WinOF/WIX/common/tools.inc
index 3c13361b..f0c515af 100644
--- 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"
              Name="ib_write_lat.exe"
              Source="..\bin\tools\$(var.ARCH)\release\ib_write_lat.exe" />
-       <File Id="ibtrapgen.exe" DiskId="1"
-             Name="ibtrapgen.exe"
-             Source="..\bin\tools\$(var.ARCH)\release\ibtrapgen.exe" />
-       <File Id="osmtest.exe" DiskId="1"
-             Name="osmtest.exe"
-             Source="..\bin\tools\$(var.ARCH)\release\osmtest.exe" />
        <File Id="PrintIP.exe" DiskId="1"
              Name="PrintIP.exe"
              Source="..\bin\tools\$(var.ARCH)\release\PrintIP.exe" />