[WinOF] Not all installers (svr2003/XP) default TARGETDIR == WindowsVolume, explicitl...

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

diff --git a/branches/WOF2-1/WinOF/WIX/win7/ia64/wof.wxs b/branches/WOF2-1/WinOF/WIX/win7/ia64/wof.wxs
index ce2e8dbc30f1590d98355a5161fe821d0c4c2655..61848e9dec1ab0df4881a541b38aa2bd234e7769 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/win7/ia64/wof.wxs
+++ b/branches/WOF2-1/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/branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs b/branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs
index 3a3ba0701f856c7647e04171c442cbe4f4c3d346..783c12c36616a88c16d45387cfd9b9ecc98322cc 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs
+++ b/branches/WOF2-1/WinOF/WIX/win7/x64/wof.wxs
@@ -93,17 +93,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/branches/WOF2-1/WinOF/WIX/win7/x86/wof.wxs b/branches/WOF2-1/WinOF/WIX/win7/x86/wof.wxs
index beb7ac2d4329c19a7a4ec5c5e82e201366b192dd..c00d1cf1d06def6efc07869eee12dac6f7049c14 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/win7/x86/wof.wxs
+++ b/branches/WOF2-1/WinOF/WIX/win7/x86/wof.wxs
@@ -76,17 +76,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/branches/WOF2-1/WinOF/WIX/wlh/ia64/wof.wxs b/branches/WOF2-1/WinOF/WIX/wlh/ia64/wof.wxs
index 560c05d74de5525cc5b4b2d26f3e936797a609fa..b1d8479793c927f44ef89980d97a6448ec421cfd 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/wlh/ia64/wof.wxs
+++ b/branches/WOF2-1/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/branches/WOF2-1/WinOF/WIX/wlh/x64/wof.wxs b/branches/WOF2-1/WinOF/WIX/wlh/x64/wof.wxs
index 4f939f801afd95285a3cb29efdc8407f3c275217..3c63c88b996a2af4fbe24486978ebe46fcec683a 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/wlh/x64/wof.wxs
+++ b/branches/WOF2-1/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/branches/WOF2-1/WinOF/WIX/wlh/x86/wof.wxs b/branches/WOF2-1/WinOF/WIX/wlh/x86/wof.wxs
index fbce033fba795637447984b32304ae084aa24ac9..de55055e1088b8a6bb19b1e90c09263de0f77fbf 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/wlh/x86/wof.wxs
+++ b/branches/WOF2-1/WinOF/WIX/wlh/x86/wof.wxs
@@ -79,17 +79,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/branches/WOF2-1/WinOF/WIX/wnet/ia64/wof.wxs b/branches/WOF2-1/WinOF/WIX/wnet/ia64/wof.wxs
index 9d55886f9ce66010f92077410ede52a58ae1a26a..4b31101ea576926f368487b3f8a32bc3b80ed4aa 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/wnet/ia64/wof.wxs
+++ b/branches/WOF2-1/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/branches/WOF2-1/WinOF/WIX/wnet/x64/wof.wxs b/branches/WOF2-1/WinOF/WIX/wnet/x64/wof.wxs
index 5b408848c08fe1ae1f44502e95b1dca7ac3a9f30..84a93d4b24f5a517bad28c67accf5f8612cc7657 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/wnet/x64/wof.wxs
+++ b/branches/WOF2-1/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,7 @@
         <?include ..\..\common\ib_sdk.inc ?>\r
       </Directory>\r
 \r
+      </Directory>\r
     </Directory> <!-- End TARGETDIR -->\r
 \r
     <?include ..\..\common\arp.inc ?>\r

diff --git a/branches/WOF2-1/WinOF/WIX/wnet/x86/wof.wxs b/branches/WOF2-1/WinOF/WIX/wnet/x86/wof.wxs
index 4b48a67ae49918ae6939f9f097df2ea3a815381d..57a7098d61d4252260c1a3038e3c09b417b861d2 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/wnet/x86/wof.wxs
+++ b/branches/WOF2-1/WinOF/WIX/wnet/x86/wof.wxs
@@ -76,17 +76,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/branches/WOF2-1/WinOF/WIX/wxp/x86/wof.wxs b/branches/WOF2-1/WinOF/WIX/wxp/x86/wof.wxs
index f6f9b8733106d22f9d1d9fcce3bc85c7b04d4a22..7b60e63f36d89fb313f57d581968a16ebe4f0e9e 100644 (file)
--- a/branches/WOF2-1/WinOF/WIX/wxp/x86/wof.wxs
+++ b/branches/WOF2-1/WinOF/WIX/wxp/x86/wof.wxs
@@ -79,17 +79,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