[WIX] Added explicit Windows Volume (%SystemDrive%\)for DAT config & SDK directories...
authorstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Fri, 23 Oct 2009 02:26:00 +0000 (02:26 +0000)
committerstansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Fri, 23 Oct 2009 02:26:00 +0000 (02:26 +0000)
git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2497 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

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

index 3fbda70..3e3a867 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r
index fb99f29..33a885e 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r
index 434a5a3..b564388 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r
index 92364ee..a581802 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r
index e1ac5e9..33b57dc 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r
index cb712fd..16f3f9b 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r
index 49bf5d5..cadf741 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r
index 4bf8ff0..84e672d 100644 (file)
@@ -83,6 +83,8 @@
         </Directory>\r
       </Directory>\r
 \r
+      <Directory Id="WindowsVolume">\r
+\r
       <!-- copy DAT header files to\r
          %SystemDrive%\DAT\v1-1\DAT\r
          %SystemDrive%\DAT\v2-0\DAT\r
@@ -96,6 +98,8 @@
         <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
+      </Directory>\r
+\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r
index c40bd15..1ca9719 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r
index 913e59e..471fc50 100644 (file)
         </Directory>\r
       </Directory>\r
 \r
-      <!-- copy DAT header files to\r
-         %SystemDrive%\DAT\v1-1\DAT\r
-         %SystemDrive%\DAT\v2-0\DAT\r
-      -->\r
+      <Directory Id="WindowsVolume">\r
 \r
-      <Directory Id="dDATD" Name="DAT">\r
-        <?include ..\..\common\DAT_config.inc ?>\r
-      </Directory>\r
+        <!-- copy DAT header files to\r
+           %SystemDrive%\DAT\v1-1\DAT\r
+           %SystemDrive%\DAT\v2-0\DAT\r
+        -->\r
+\r
+        <Directory Id="dDATD" Name="DAT">\r
+          <?include ..\..\common\DAT_config.inc ?>\r
+        </Directory>\r
+\r
+        <Directory Id="IBSDK" Name="IBSDK">\r
+          <?include ..\..\common\ib_sdk.inc ?>\r
+        </Directory>\r
 \r
-      <Directory Id="IBSDK" Name="IBSDK">\r
-        <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
     </Directory> <!-- End TARGETDIR -->\r