[Mobies-commit] [commit] r4326 - UDM/trunk/WiX

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Sep 30 12:49:54 2014
New Revision: 4326

Log:
WiX installer: use wixlibs instead of merge modules

Modified:
   UDM/trunk/WiX/build_msi.py

Modified: UDM/trunk/WiX/build_msi.py
==============================================================================
--- UDM/trunk/WiX/build_msi.py	Tue Sep 30 12:30:05 2014	(r4325)
+++ UDM/trunk/WiX/build_msi.py	Tue Sep 30 12:49:54 2014	(r4326)
@@ -77,6 +77,9 @@
         wixlibs = [os.path.join(d, d + '.wixlib') for d in dirs]
         if arch == 'x64':
             wixlibs += [os.path.join(d, d + '_x64.wixlib') for d in dirs]
+            print repr(wixlibs)
+            wixlibs = [lib for lib in wixlibs if os.path.basename(lib) != 'UdmDll_x64.wixlib']
+            print repr(wixlibs)
         system(['light', '-nologo', '-sw1055', '-sice:ICE82', '-ext', 'WixNetFxExtension', '-ext', 'WixUIExtension', '-ext', 'WixUtilExtension', '-o', msi_names[arch] ] +
             [get_wixobj(file) for file in sources ] + wixlibs)
     else: