[WinOF] added datd.lib for DAT debug linking, included dapltestd.exe for field debug.

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

diff --git a/branches/WinOF/WIX/ia64/wof.wxs b/branches/WinOF/WIX/ia64/wof.wxs
index 1d812c2a81bccced4907f40ebed04dfa97c5120f..96976b703a2851f5b57381a84b0ebb3eb41c5c5e 100644 (file)
--- a/branches/WinOF/WIX/ia64/wof.wxs
+++ b/branches/WinOF/WIX/ia64/wof.wxs
@@ -364,6 +364,9 @@
               <File Id="dapltest.exe" Compressed="yes" DiskId="1"\r
                      LongName="dapltest.exe" Name="dapltest.exe"\r
                      Source="..\bin\tools\ia64\release\dapltest.exe" />\r
+              <File Id="dapltestd.exe" Compressed="yes" DiskId="1"\r
+                     LongName="dapltestd.exe" Name="dapltesd.exe"\r
+                     Source="..\bin\tools\ia64\debug\dapltestd.exe" />\r
 \r
               <File Id="dapl.pdb" Compressed="yes" DiskId="1"\r
                     LongName="dapl.pdb" Name="dapl.pdb"\r
@@ -371,6 +374,12 @@
               <File Id="dapld.pdb" Compressed="yes" DiskId="1"\r
                     LongName="dapld.pdb" Name="dapld.pdb"\r
                     Source="..\bin\DAPL\ia64\dapld.pdb" />\r
+              <File Id="dat.lib" Compressed="yes" DiskId="1"\r
+                    LongName="dat.lib" Name="dat.lib"\r
+                    Source="..\bin\DAPL\ia64\dat.lib" />\r
+              <File Id="datd.lib" Compressed="yes" DiskId="1"\r
+                    LongName="datd.lib" Name="datd.lib"\r
+                    Source="..\bin\DAPL\ia64\datd.lib" />\r
               <File Id="dat.pdb" Compressed="yes" DiskId="1"\r
                     LongName="dat.pdb" Name="dat.pdb"\r
                     Source="..\bin\DAPL\ia64\dat.pdb" />\r
@@ -457,6 +466,12 @@
               <File Id="dat2d.pdb" Compressed="yes" DiskId="1"\r
                     LongName="dat2d.pdb" Name="dat2d.pdb"\r
                     Source="..\bin\DAPL2\ia64\dat2d.pdb" />\r
+              <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
+                    LongName="dat2.lib" Name="dat2.lib"\r
+                    Source="..\bin\DAPL2\ia64\dat2.lib" />\r
+              <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
+                    LongName="dat2d.lib" Name="dat2d.lib"\r
+                    Source="..\bin\DAPL2\ia64\dat2d.lib" />\r
           </Component>\r
 \r
           <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
@@ -563,11 +578,10 @@
               <Component Id="cDatBldV1Libs"\r
                           Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    \r
 \r
-                  <File Id="dat.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat.lib" Name="dat.lib"\r
                         Source="..\bin\DAPL\ia64\dat.lib" />\r
-\r
-                  <File Id="datd.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_datd.lib" Compressed="yes" DiskId="1"\r
                         LongName="datd.lib" Name="datd.lib"\r
                         Source="..\bin\DAPL\ia64\datd.lib" />\r
               </Component>\r
@@ -634,11 +648,10 @@
               <Component Id="cDatBldV2Libs"\r
                           Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    \r
 \r
-                  <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat2.lib" Name="dat2.lib"\r
                         Source="..\bin\DAPL2\ia64\dat2.lib" />\r
-\r
-                  <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat2d.lib" Name="dat2d.lib"\r
                         Source="..\bin\DAPL2\ia64\dat2d.lib" />\r
               </Component>    \r

diff --git a/branches/WinOF/WIX/x64/wof.wxs b/branches/WinOF/WIX/x64/wof.wxs
index 19422bcdc4dba1ad56f91aa97474c134d18b9be8..7df6b6eca682c011190e7d52e2b7af9abb031f11 100644 (file)
--- a/branches/WinOF/WIX/x64/wof.wxs
+++ b/branches/WinOF/WIX/x64/wof.wxs
@@ -364,6 +364,9 @@
             <File Id="dapltest.exe" Compressed="yes" DiskId="1"\r
                    LongName="dapltest.exe" Name="dapltest.exe"\r
                    Source="..\bin\tools\amd64\release\dapltest.exe" />\r
+            <File Id="dapltestd.exe" Compressed="yes" DiskId="1"\r
+                   LongName="dapltestd.exe" Name="dapltesd.exe"\r
+                   Source="..\bin\tools\amd64\debug\dapltestd.exe" />\r
 \r
             <File Id="dapl.pdb" Compressed="yes" DiskId="1"\r
                   LongName="dapl.pdb" Name="dapl.pdb"\r
@@ -371,6 +374,12 @@
             <File Id="dapld.pdb" Compressed="yes" DiskId="1"\r
                   LongName="dapld.pdb" Name="dapld.pdb"\r
                   Source="..\bin\DAPL\amd64\dapld.pdb" />\r
+            <File Id="dat.lib" Compressed="yes" DiskId="1"\r
+                  LongName="dat.lib" Name="dat.lib"\r
+                  Source="..\bin\DAPL\amd64\dat.lib" />\r
+            <File Id="datd.lib" Compressed="yes" DiskId="1"\r
+                  LongName="datd.lib" Name="datd.lib"\r
+                  Source="..\bin\DAPL\amd64\datd.lib" />\r
             <File Id="dat.pdb" Compressed="yes" DiskId="1"\r
                   LongName="dat.pdb" Name="dat.pdb"\r
                   Source="..\bin\DAPL\amd64\dat.pdb" />\r
@@ -457,6 +466,12 @@
               <File Id="dat2d.pdb" Compressed="yes" DiskId="1"\r
                     LongName="dat2d.pdb" Name="dat2d.pdb"\r
                     Source="..\bin\DAPL2\amd64\dat2d.pdb" />\r
+              <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
+                    LongName="dat2.lib" Name="dat2.lib"\r
+                    Source="..\bin\DAPL2\amd64\dat2.lib" />\r
+              <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
+                    LongName="dat2d.lib" Name="dat2d.lib"\r
+                    Source="..\bin\DAPL2\amd64\dat2d.lib" />\r
           </Component>\r
 \r
           <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
@@ -565,11 +580,10 @@
               <Component Id="cDatBldV1Libs"\r
                           Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    \r
 \r
-                  <File Id="dat.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat.lib" Name="dat.lib"\r
                         Source="..\bin\DAPL\amd64\dat.lib" />\r
-\r
-                  <File Id="datd.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_datd.lib" Compressed="yes" DiskId="1"\r
                         LongName="datd.lib" Name="datd.lib"\r
                         Source="..\bin\DAPL\amd64\datd.lib" />\r
               </Component>\r
@@ -637,11 +651,10 @@
               <Component Id="cDatBldV2Libs"\r
                           Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    \r
 \r
-                  <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat2.lib" Name="dat2.lib"\r
                         Source="..\bin\DAPL2\amd64\dat2.lib" />\r
-\r
-                  <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat2d.lib" Name="dat2d.lib"\r
                         Source="..\bin\DAPL2\amd64\dat2d.lib" />\r
               </Component>    \r

diff --git a/branches/WinOF/WIX/x86/wof.wxs b/branches/WinOF/WIX/x86/wof.wxs
index ed64f9fde77f18f2b1d244d701f43cd8524664ee..0b0e6e982ec1f06bc1c2287c1a4deb1ad7b11543 100644 (file)
--- a/branches/WinOF/WIX/x86/wof.wxs
+++ b/branches/WinOF/WIX/x86/wof.wxs
@@ -312,7 +312,16 @@
                     <File Id="dapltest.exe" Compressed="yes" DiskId="1"\r
                           LongName="dapltest.exe" Name="dapltest.exe"\r
                           Source="..\bin\tools\x86\release\dapltest.exe" />\r
-\r
+                    <File Id="dapltestd.exe" Compressed="yes" DiskId="1"\r
+                          LongName="dapltestd.exe" Name="dapltesd.exe"\r
+                          Source="..\bin\tools\x86\debug\dapltestd.exe" />\r
+\r
+                    <File Id="dat.lib" Compressed="yes" DiskId="1"\r
+                          LongName="dat.lib" Name="dat.lib"\r
+                          Source="..\bin\DAPL\x86\dat.lib" />\r
+                    <File Id="datd.lib" Compressed="yes" DiskId="1"\r
+                          LongName="datd.lib" Name="datd.lib"\r
+                          Source="..\bin\DAPL\x86\datd.lib" />\r
                     <File Id="dat.pdb" Compressed="yes" DiskId="1"\r
                           LongName="dat.pdb" Name="dat.pdb"\r
                           Source="..\bin\DAPL\x86\dat.pdb" />\r
@@ -398,6 +407,12 @@
                     <File Id="dat2d.pdb" Compressed="yes" DiskId="1"\r
                           LongName="dat2d.pdb" Name="dat2d.pdb"\r
                           Source="..\bin\DAPL2\x86\dat2d.pdb" />\r
+                    <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
+                          LongName="dat2.lib" Name="dat2.lib"\r
+                          Source="..\bin\DAPL2\x86\dat2.lib" />\r
+                    <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
+                          LongName="dat2d.lib" Name="dat2d.lib"\r
+                          Source="..\bin\DAPL2\x86\dat2d.lib" />\r
                 </Component>\r
 \r
                 <Directory Id="qlgcvnicDir" Name="qlgcvnic">\r
@@ -503,11 +518,10 @@
 \r
               <Component Id="cDatBldV1Libs"\r
                           Guid="1BB9291E-79F5-4EC5-9400-4175BA1E5A91">    \r
-                  <File Id="dat.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat.lib" Name="dat.lib"\r
                         Source="..\bin\DAPL\x86\dat.lib" />\r
-\r
-                  <File Id="datd.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_datd.lib" Compressed="yes" DiskId="1"\r
                         LongName="datd.lib" Name="datd.lib"\r
                         Source="..\bin\DAPL\x86\datd.lib" />\r
               </Component>\r
@@ -573,11 +587,10 @@
               <Component Id="cDatBldV2Libs"\r
                           Guid="4DCE2855-1F42-4A7D-957A-44A47715C051" >    \r
 \r
-                  <File Id="dat2.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat2.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat2.lib" Name="dat2.lib"\r
                         Source="..\bin\DAPL2\x86\dat2.lib" />\r
-\r
-                  <File Id="dat2d.lib" Compressed="yes" DiskId="1"\r
+                  <File Id="_dat2d.lib" Compressed="yes" DiskId="1"\r
                         LongName="dat2d.lib" Name="dat2d.lib"\r
                         Source="..\bin\DAPL2\x86\dat2d.lib" />\r
               </Component>    \r