[WinOF] Identify platform processor architecture [32/64 bit] for which the installer...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 16 Sep 2009 21:54:33 +0000 (21:54 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 16 Sep 2009 21:54:33 +0000 (21:54 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2441 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

WinOF/WIX/common/UserInterface.inc [new file with mode: 0644]
WinOF/WIX/win7/ia64/wof.wxs
WinOF/WIX/win7/x64/wof.wxs
WinOF/WIX/win7/x86/wof.wxs
WinOF/WIX/wlh/ia64/wof.wxs
WinOF/WIX/wlh/x64/wof.wxs
WinOF/WIX/wlh/x86/wof.wxs
WinOF/WIX/wnet/ia64/wof.wxs
WinOF/WIX/wnet/x64/wof.wxs
WinOF/WIX/wnet/x86/wof.wxs
WinOF/WIX/wxp/x86/wof.wxs

diff --git a/WinOF/WIX/common/UserInterface.inc b/WinOF/WIX/common/UserInterface.inc
new file mode 100644 (file)
index 0000000..4301d84
--- /dev/null
@@ -0,0 +1,12 @@
+\r
+<Include>\r
+\r
+    <UIRef Id="WixUI_FeatureTree" />\r
+\r
+      <UIRef Id="WixUI_ErrorProgressText" />\r
+\r
+      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
+\r
+    <UI />\r
+\r
+</Include>\r
index ce2e8db..3fbda70 100644 (file)
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index 15a5c5d..fb99f29 100644 (file)
@@ -23,7 +23,7 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="x64" Languages="1033"\r
+     Platforms="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index beb7ac2..705d73d 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="$(var.ARCHP)" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      Privileged\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index 560c05d..92364ee 100644 (file)
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index 4f939f8..e1ac5e9 100644 (file)
@@ -23,7 +23,7 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="x64" Languages="1033"\r
+     Platforms="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index fbce033..343c204 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="$(var.ARCHP)" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      Privileged\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index 9d55886..49bf5d5 100644 (file)
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index 5b40884..4bf8ff0 100644 (file)
@@ -23,7 +23,7 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Platforms="x64" Languages="1033"\r
+     Platforms="$(var.ARCHP)" Languages="1033"\r
      Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index 4b48a67..876d843 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="$(var.ARCHP)" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      Privileged\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r
index f6f9b87..fc5ee43 100644 (file)
@@ -23,7 +23,8 @@
      Description="WinOF Installer"\r
      Comments="Windows OpenFabrics Alliance InfiniBand stack"\r
      Manufacturer="OpenFabrics Alliance" InstallerVersion="200"\r
-     Languages="1033" Compressed="yes" SummaryCodepage="1252" />\r
+     Platforms="$(var.ARCHP)" Languages="1033"\r
+     Compressed="yes" SummaryCodepage="1252" />\r
 \r
     <Condition Message="Administrator required to install [ProductName].">\r
      Privileged\r
 \r
     <?include ..\..\common\InstallExecuteSeq.inc ?>\r
 \r
-    <UIRef Id="WixUI_FeatureTree" />\r
-      <UIRef Id="WixUI_ErrorProgressText" />\r
-      <Icon Id="openfabrics" SourceFile="..\..\openfabrics.ico" />\r
-    <UI />\r
+    <?include ..\..\common\UserInterface.inc ?>\r
+\r
   </Product>\r
 </Wix>\r