[WIX] Added explicit Windows Volume (%SystemDrive%\)for DAT config & SDK directories...

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

diff --git a/trunk/WinOF/WIX/win7/ia64/wof.wxs b/trunk/WinOF/WIX/win7/ia64/wof.wxs
index 3fbda701fe04916bd776a54335d8d95de6dd5b98..3e3a867dbe0844645f38c67542f443fbed56fa07 100644 (file)
--- a/trunk/WinOF/WIX/win7/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/win7/ia64/wof.wxs
@@ -83,17 +83,21 @@
         </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

diff --git a/trunk/WinOF/WIX/win7/x64/wof.wxs b/trunk/WinOF/WIX/win7/x64/wof.wxs
index fb99f29504c698ee14d224afd6666a75c7bbfa4c..33a885ed66587c5efd51e6437e85982eb44d23f1 100644 (file)
--- a/trunk/WinOF/WIX/win7/x64/wof.wxs
+++ b/trunk/WinOF/WIX/win7/x64/wof.wxs
@@ -85,17 +85,21 @@
         </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

diff --git a/trunk/WinOF/WIX/win7/x86/wof.wxs b/trunk/WinOF/WIX/win7/x86/wof.wxs
index 434a5a3b7df67a122950ab29ea43bf9bac0e79dc..b564388164b122dee3a6a35de665c70c7daae03e 100644 (file)
--- a/trunk/WinOF/WIX/win7/x86/wof.wxs
+++ b/trunk/WinOF/WIX/win7/x86/wof.wxs
@@ -77,17 +77,21 @@
         </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

diff --git a/trunk/WinOF/WIX/wlh/ia64/wof.wxs b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
index 92364eed46c762819c7264fecceb3b10fd3286a3..a5818022c826ea8d53d5ae6da2ea3bc17faf9e78 100644 (file)
--- a/trunk/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/ia64/wof.wxs
@@ -84,17 +84,21 @@
         </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

diff --git a/trunk/WinOF/WIX/wlh/x64/wof.wxs b/trunk/WinOF/WIX/wlh/x64/wof.wxs
index e1ac5e9c158d58199dbf303931422361e827d5b9..33b57dc542530039ce0f615dc5f5da26b5f2760b 100644 (file)
--- a/trunk/WinOF/WIX/wlh/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x64/wof.wxs
@@ -86,17 +86,21 @@
         </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

diff --git a/trunk/WinOF/WIX/wlh/x86/wof.wxs b/trunk/WinOF/WIX/wlh/x86/wof.wxs
index cb712fd267cb230591ce35d723a4377eab02a255..16f3f9b6133eec762821e402be752d40e7e4ead3 100644 (file)
--- a/trunk/WinOF/WIX/wlh/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wlh/x86/wof.wxs
@@ -80,17 +80,21 @@
         </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

diff --git a/trunk/WinOF/WIX/wnet/ia64/wof.wxs b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
index 49bf5d56f0b745fde1221319b406904dc121bf09..cadf741e58d37ca5a86b061bbd8d7ca2a4ed8d6e 100644 (file)
--- a/trunk/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/ia64/wof.wxs
@@ -83,17 +83,21 @@
         </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

diff --git a/trunk/WinOF/WIX/wnet/x64/wof.wxs b/trunk/WinOF/WIX/wnet/x64/wof.wxs
index 4bf8ff0b2ff145f93ee410c521f8bc908f1fde21..84e672d74e9cb0dbcbfb5325a8ba54de8a1718d6 100644 (file)
--- a/trunk/WinOF/WIX/wnet/x64/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x64/wof.wxs
@@ -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

diff --git a/trunk/WinOF/WIX/wnet/x86/wof.wxs b/trunk/WinOF/WIX/wnet/x86/wof.wxs
index c40bd15c892df959ea720ea5ecf2ecb14c8c6afa..1ca9719595aa27fe52c0778f0f7347bd303a78e7 100644 (file)
--- a/trunk/WinOF/WIX/wnet/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wnet/x86/wof.wxs
@@ -77,17 +77,21 @@
         </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

diff --git a/trunk/WinOF/WIX/wxp/x86/wof.wxs b/trunk/WinOF/WIX/wxp/x86/wof.wxs
index 913e59ee55b97d66b84d95cfcfe50afbdab3c8e4..471fc504fce798d4b081d1e9fcc7e2b0522d8948 100644 (file)
--- a/trunk/WinOF/WIX/wxp/x86/wof.wxs
+++ b/trunk/WinOF/WIX/wxp/x86/wof.wxs
@@ -80,17 +80,21 @@
         </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