[Mobies-commit] [commit] r4369 - in UDM/trunk/WiX: . UdmSDK_VC9 Udm_SDK Udm_bin

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Nov 12 18:01:12 2015
New Revision: 4369

Log:
Refactor into UdmSDK_VC9.wxs

Added:
   UDM/trunk/WiX/UdmSDK_VC9/
   UDM/trunk/WiX/UdmSDK_VC9/UdmSDK_VC9.wxs
Modified:
   UDM/trunk/WiX/Udm.wxs
   UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs
   UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
   UDM/trunk/WiX/build_msi.py

Modified: UDM/trunk/WiX/Udm.wxs
==============================================================================
--- UDM/trunk/WiX/Udm.wxs	Thu Nov 12 18:01:06 2015	(r4368)
+++ UDM/trunk/WiX/Udm.wxs	Thu Nov 12 18:01:12 2015	(r4369)
@@ -130,6 +130,7 @@
       <ComponentGroupRef Id='UdmDll_VC11x86' />
       <ComponentGroupRef Id='UdmDll_VC12x86' />
       <ComponentGroupRef Id='UdmDll_VC14x86' />
+      <ComponentGroupRef Id='UdmSDK_VC9x86' />
       <ComponentGroupRef Id='UdmSDK_VC11x86' />
       <ComponentGroupRef Id='UdmSDK_VC12x86' />
       <ComponentGroupRef Id='UdmSDK_VC14x86' />

Added: UDM/trunk/WiX/UdmSDK_VC9/UdmSDK_VC9.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/UdmSDK_VC9/UdmSDK_VC9.wxs	Thu Nov 12 18:01:12 2015	(r4369)
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='windows-1252'?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
+
+  <?include ..\Udm_inc.wxi ?>
+  <Fragment>
+    <DirectoryRef Id='bin$(sys.BUILDARCH)'/>
+    <DirectoryRef Id='lib$(sys.BUILDARCH)'/>
+
+    <ComponentGroup Id='UdmSDK_VC9$(sys.BUILDARCH)'>
+      <?if $(sys.BUILDARCH)=x86 ?>
+      <Component Directory="bin$(sys.BUILDARCH)">
+        <File Source="..\Build\Win32\VC9\Debug\UdmDll_3_2D.dll" />
+      </Component>
+      <Component Directory="lib$(sys.BUILDARCH)">
+        <File Source="..\Build\Win32\VC9\Release\UdmDll.lib" />
+      </Component>
+      <Component Directory="lib$(sys.BUILDARCH)">
+        <File Source="..\Build\Win32\VC9\Debug\UdmDllD.lib" />
+      </Component>
+      <?endif?>
+    </ComponentGroup>
+  </Fragment>
+</Wix>

Modified: UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs	Thu Nov 12 18:01:06 2015	(r4368)
+++ UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs	Thu Nov 12 18:01:12 2015	(r4369)
@@ -105,12 +105,6 @@
 
       <?if $(sys.BUILDARCH)=x86 ?>
       <Component Directory="lib$(sys.BUILDARCH)">
-        <File Source="..\Build\Win32\VC9\Release\UdmDll.lib" />
-      </Component>
-      <Component Directory="lib$(sys.BUILDARCH)">
-        <File Source="..\Build\Win32\VC9\Debug\UdmDllD.lib" />
-      </Component>
-      <Component Directory="lib$(sys.BUILDARCH)">
         <File Source="..\Build\Win32\v100\Release\UdmDll_VS10.lib" />
       </Component>
       <Component Directory="lib$(sys.BUILDARCH)">

Modified: UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Thu Nov 12 18:01:06 2015	(r4368)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Thu Nov 12 18:01:12 2015	(r4369)
@@ -39,9 +39,6 @@
         <File Source="..\bin\XalanMessages_1_11D.dll" />
       </Component>
       <Component Directory="bin$(sys.BUILDARCH)">
-        <File Source="..\Build\Win32\VC9\Debug\UdmDll_3_2D.dll" />
-      </Component>
-      <Component Directory="bin$(sys.BUILDARCH)">
         <File Source="..\Build\Win32\v100\Debug\UdmDll_3_2_VS10D.dll" />
       </Component>
       <Component Directory="bin$(sys.BUILDARCH)">

Modified: UDM/trunk/WiX/build_msi.py
==============================================================================
--- UDM/trunk/WiX/build_msi.py	Thu Nov 12 18:01:06 2015	(r4368)
+++ UDM/trunk/WiX/build_msi.py	Thu Nov 12 18:01:12 2015	(r4369)
@@ -76,7 +76,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]
-            wixlibs = [lib for lib in wixlibs if os.path.basename(lib) != 'UdmDll_x64.wixlib']
+            wixlibs = [lib for lib in wixlibs if os.path.basename(lib) not in ('UdmDll_x64.wixlib', 'UdmSDK_VC9_x64.wixlib')]
         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: