[Mobies-commit] [commit] r3980 - in UDM/trunk/WiX: . Udm_bin

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Dec  2 10:00:10 2011
New Revision: 3980

Log:
Dont require UDM_3RDPARTY_PATH

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

Modified: UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Thu Dec  1 17:11:22 2011	(r3979)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Fri Dec  2 10:00:10 2011	(r3980)
@@ -38,16 +38,16 @@
       <?endif?>
       <?if $(sys.BUILDARCH)=x86 ?>
       <Component>
-        <File Source="$(var.UDM_3RDPARTY_PATH)\xalan-c_1_11_0\bin\Xalan-C_1_11.dll" />
+        <File Source="..\bin\Xalan-C_1_11.dll" />
       </Component>
       <Component>
-        <File Source="$(var.UDM_3RDPARTY_PATH)\xalan-c_1_11_0\bin\XalanMessages_1_11.dll" />
+        <File Source="..\bin\XalanMessages_1_11.dll" />
       </Component>
       <Component>
-        <File Source="$(var.UDM_3RDPARTY_PATH)\xalan-c_1_11_0\bin\Xalan-C_1_11D.dll" />
+        <File Source="..\bin\Xalan-C_1_11D.dll" />
       </Component>
       <Component>
-        <File Source="$(var.UDM_3RDPARTY_PATH)\xalan-c_1_11_0\bin\XalanMessages_1_11D.dll" />
+        <File Source="..\bin\XalanMessages_1_11D.dll" />
       </Component>
       <Component>
         <File Source="..\bin\xerces-c_2_8.dll" />

Modified: UDM/trunk/WiX/build_msi.py
==============================================================================
--- UDM/trunk/WiX/build_msi.py	Thu Dec  1 17:11:22 2011	(r3979)
+++ UDM/trunk/WiX/build_msi.py	Fri Dec  2 10:00:10 2011	(r3980)
@@ -63,8 +63,7 @@
     if len(sources) == 0:
         raise Exception("0 sources found in " + sourcedir)
 
-    defines = [('UDM_3RDPARTY_PATH',  os.environ['UDM_3RDPARTY_PATH']),
-               ('GREAT_PATH',  os.environ['GREAT_PATH'])]
+    defines = [('GREAT_PATH',  os.environ['GREAT_PATH'])]
 
     for source in sources:
         #arch = [ '-arch', ('x86' if source.find('x64') == -1 else 'x64') ]