[WIX] remove ND for IA64, use new Common-dapl socket CM as dapl2-ofa-scm
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 22 Apr 2009 00:40:50 +0000 (00:40 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Wed, 22 Apr 2009 00:40:50 +0000 (00:40 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2115 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

WinOF/WIX/common/checked.inc
WinOF/WIX/common/dapl_rt.inc
WinOF/WIX/common/ipoib.inc

index 50309bf..acc31c4 100644 (file)
                    Guid="A4AC788B-6517-47b2-A898-0493ADC794D5">\r
           <CreateFolder />\r
           <File Id="file83" Name="DAPL2-_1.DLL"\r
-            LongName="dapl2-scmd.dll"\r
+            LongName="dapl2-ofa-scmd.dll"\r
             DiskId="1" Compressed="yes"\r
-            Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scmd.dll" />\r
+            Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd.dll" />\r
           <File Id="file84" Name="dapl2d.dll"\r
             DiskId="1" Compressed="yes"\r
             Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.dll" />\r
index e8e63d9..9137d04 100644 (file)
           <File Id="_dapl2d.dll" Compressed="yes" DiskId="1"\r
                  LongName="dapl2d.dll" Name="DAPL2D.DLL"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dapl2d.dll" />\r
-          <File Id="_dapl2_scm.dll" Compressed="yes" DiskId="1"\r
-                 LongName="dapl2-scm.dll" Name="D2-scm.DLL"\r
-                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scm.dll" />\r
-          <CopyFile Id="dupDAPL2_scm" FileId="_dapl2_scm.dll"\r
+          <File Id="_dapl2_ofa_scm.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2-ofa-scm.dll" Name="D2-scm.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scm.dll" />\r
+          <CopyFile Id="dupDAPL2_ofa-scm" FileId="_dapl2_ofa_scm.dll"\r
                     DestinationName="d2-scm.dll"\r
-                    DestinationLongName="dapl2-scm.dll"\r
+                    DestinationLongName="dapl2-ofa-scm.dll"\r
                     DestinationProperty="WindowsFolder" />\r
-          <File Id="_dapl2_scmd.dll" Compressed="yes" DiskId="1"\r
-                 LongName="dapl2-scmd.dll" Name="D2-scmd.DLL"\r
-                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-scmd.dll" />\r
+          <File Id="_dapl2_ofa_scmd.dll" Compressed="yes" DiskId="1"\r
+                 LongName="dapl2-ofa-scmd.dll" Name="D2-scmd.DLL"\r
+                 Source="..\bin\DAPL2\$(var.ARCH)\dapl2-ofa-scmd.dll" />\r
           <File Id="_dat2.dll" Compressed="yes" DiskId="1"\r
                  LongName="dat2.dll" Name="DAT2.DLL"\r
                  Source="..\bin\DAPL2\$(var.ARCH)\dat2.dll" />\r
index e1f0296..5d4020e 100644 (file)
                Source="..\bin\net\$(var.ARCH)\ibwsd.dll" />\r
       <?endif?>\r
 \r
-      <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
-             LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
-             Source="..\bin\net\$(var.ARCH)\ibndprov.dll" />\r
-      <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
-             LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
-             Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />\r
+      <?if $(var.ARCHP) != "ia64" ?>\r
+          <File Id="ibndprov.dll" Compressed="yes" DiskId="1"\r
+                LongName="ibndprov.dll" Name="IBNDPROV.DLL"\r
+                Source="..\bin\net\$(var.ARCH)\ibndprov.dll" />\r
+          <File Id="ndinstall.exe" Compressed="yes" DiskId="1"\r
+                LongName="ndinstall.exe" Name="NDINSTAL.EXE"\r
+                Source="..\bin\net\$(var.ARCH)\ndinstall.exe" />\r
+      <?endif?>\r
 \r
       <?if $(var.ARCHP) = "x64" Or $(var.ARCHP) = "ia64" ?>\r
           <File Id="ibwsd32.dll" Compressed="yes" DiskId="1"\r