[Mobies-commit] [commit] r4124 - UDM/trunk/WiX/Udm_bin

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Oct  5 09:30:21 2012
New Revision: 4124

Log:
Fix outdir, install dlls once to avoid dll hell

Modified:
   UDM/trunk/WiX/Udm_bin/Udm_bin.wxs

Modified: UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Fri Oct  5 09:14:51 2012	(r4123)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Fri Oct  5 09:30:21 2012	(r4124)
@@ -39,10 +39,7 @@
     <DirectoryRef Id="bin">
       <?if $(sys.BUILDARCH)=x64?>
       <Component>
-        <File Source="..\Build\x64\VC10\Debug\UdmDll_3_2_v100_x64D.dll" />
-      </Component>
-      <Component>
-        <File Source="..\Build\x64\VC10\Release\UdmDll_3_2_v100_x64.dll" />
+        <File Source="..\Build\x64\v100\Debug\UdmDll_3_2_v100_x64D.dll" />
         <Environment Id="PATH" Action="set" System="yes" Name="PATH" Value="[bin]" Part="last" />
       </Component>
       <?endif?>
@@ -60,21 +57,12 @@
         <File Source="..\bin\XalanMessages_1_11D.dll" />
       </Component>
       <Component>
-        <File Source="..\bin\xerces-c_2_8.dll" />
-      </Component>
-      <Component>
         <File Source="..\Build\Win32\VC9\Debug\UdmDll_3_2D.dll" />
       </Component>
       <Component>
         <File Source="..\Build\Win32\VC10\Debug\UdmDll_3_2_VS10D.dll" />
       </Component>
       <Component>
-        <File Source="..\Build\Win32\VC9\Release\UdmDll_3_2.dll" />
-      </Component>
-      <Component>
-        <File Source="..\Build\Win32\VC10\Release\UdmDll_3_2_VS10.dll" />
-      </Component>
-      <Component>
         <File Source="..\Build\Win32\VC10\Release\Udm.exe" />
         <Environment Id="UDM_PATH" Action="set" System="yes" Name="UDM_PATH" Value="[INSTALLDIR]" />
         <Environment Id="PATH" Action="set" System="yes" Name="PATH" Value="[bin]" Part="last" />