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

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Nov 18 11:02:07 2011
New Revision: 3952

Log:
Include UdmDll x64D.dll. Dont install 32bit dlls under x64

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 Nov 18 11:01:57 2011	(r3951)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Fri Nov 18 11:02:07 2011	(r3952)
@@ -28,6 +28,12 @@
     </Directory>
 
     <DirectoryRef Id="bin">
+      <?if $(sys.BUILDARCH)=x64?>
+      <Component>
+        <File Source="..\Build\x64\VC10\Debug\UdmDll_3_2_v100_x64D.dll" />
+      </Component>
+      <?endif?>
+      <?if $(sys.BUILDARCH)=x86 ?>
       <Component>
         <File Source="$(var.UDM_3RDPARTY_PATH)\xalan-c_1_11_0\bin\Xalan-C_1_11.dll" />
       </Component>
@@ -46,11 +52,10 @@
       <Component>
         <File Source="..\Build\Win32\VC10\Debug\UdmDll_3_2_VS10D.dll" />
       </Component>
-
-      <?if $(sys.BUILDARCH)=x86 ?>
       <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" />
       </Component>
       <Component>
         <File Source="..\Build\Win32\VC10\Release\UdmCopy.exe" />