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

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Sep 30 12:57:54 2014
New Revision: 4327

Log:
WiX installer: use wixlibs instead of merge modules

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

Modified: UDM/trunk/WiX/Udm.wxs
==============================================================================
--- UDM/trunk/WiX/Udm.wxs	Tue Sep 30 12:49:54 2014	(r4326)
+++ UDM/trunk/WiX/Udm.wxs	Tue Sep 30 12:57:54 2014	(r4327)
@@ -133,7 +133,7 @@
       <ComponentGroupRef Id='xerces_cx64'/>
       <ComponentGroupRef Id='Udm_binx64' />
       <ComponentGroupRef Id='Udm_SDKx64' />
-      <ComponentGroupRef Id='UdmDllx64' />
+      <!-- UdmDllx64 intentionally omitted: no VC9 build for UdmDll -->
       <ComponentGroupRef Id='UdmDll_VS10x64' />
       <ComponentGroupRef Id='UdmDll_VC11x64' />
       <ComponentGroupRef Id='UdmSDK_VC11x64' />

Modified: UDM/trunk/WiX/build_msi.py
==============================================================================
--- UDM/trunk/WiX/build_msi.py	Tue Sep 30 12:49:54 2014	(r4326)
+++ UDM/trunk/WiX/build_msi.py	Tue Sep 30 12:57:54 2014	(r4327)
@@ -77,9 +77,7 @@
         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: