[Mobies-commit] [commit] r3975 - in UDM/trunk/WiX: . UdmDll UdmDll_VS10 xerces_c

ksmyth at redhat1.isis.vanderbilt.edu ksmyth at redhat1.isis.vanderbilt.edu
Tue Nov 29 14:37:52 CST 2011 

Author: ksmyth
Date: Tue Nov 29 14:37:52 2011
New Revision: 3975

Log:
Split xerces into its own merge module. Add UdmDll (VC9)

Added:
   UDM/trunk/WiX/UdmDll/
   UDM/trunk/WiX/UdmDll/UdmDll.wxs
      - copied, changed from r3974, UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs
   UDM/trunk/WiX/xerces_c/
   UDM/trunk/WiX/xerces_c/xerces_c.wxs
      - copied, changed from r3974, UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs
Modified:
   UDM/trunk/WiX/Udm.wxs
   UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs
   UDM/trunk/WiX/Udm_inc.wxi

Modified: UDM/trunk/WiX/Udm.wxs
==============================================================================
--- UDM/trunk/WiX/Udm.wxs	Tue Nov 29 14:37:37 2011	(r3974)
+++ UDM/trunk/WiX/Udm.wxs	Tue Nov 29 14:37:52 2011	(r3975)
@@ -53,10 +53,13 @@
       <Merge Id="MFC100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_MFC_$(sys.BUILDARCH).msm" DiskId="1" />
       <Merge Id="ATL100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_ATL_$(sys.BUILDARCH).msm" DiskId="1" />
 
+      <Merge Id="xerces_c" Language="1033" SourceFile="xerces_c\xerces_c.msm" DiskId="1" />
+      <Merge Id="UdmDll" Language="1033" SourceFile="UdmDll\UdmDll.msm" DiskId="1" />
       <Merge Id="UdmDll_VS10" Language="1033" SourceFile="UdmDll_VS10\UdmDll_VS10.msm" DiskId="1" />
       <Merge Id="Udm_SDK" Language="1033" SourceFile="Udm_SDK\Udm_SDK.msm" DiskId="1"/>
       <Merge Id="Udm_bin" Language="1033" SourceFile="Udm_bin\Udm_bin.msm" DiskId="1"/>
       <?if $(sys.BUILDARCH)=x64 ?>
+      <Merge Id="xerces_c_x64" Language="1033" SourceFile="xerces_c\xerces_c_x64.msm" DiskId="1" />
       <Merge Id="UdmDll_VS10_x64" Language="1033" SourceFile="UdmDll_VS10\UdmDll_VS10_x64.msm" DiskId="1" />
       <Merge Id="Udm_bin_x64" Language="1033" SourceFile="Udm_bin\Udm_bin_x64.msm" DiskId="1"/>
       <Merge Id="CRT100_x86" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm" DiskId="1" />
@@ -73,8 +76,11 @@
 
       <MergeRef Id='Udm_SDK' />
       <MergeRef Id='Udm_bin' />
+      <MergeRef Id='xerces_c' />
+      <MergeRef Id='UdmDll' />
       <MergeRef Id='UdmDll_VS10' />
       <?if $(sys.BUILDARCH)=x64 ?>
+      <MergeRef Id='xerces_c_x64'/>
       <MergeRef Id='UdmDll_VS10_x64'/>
       <MergeRef Id='Udm_bin_x64' />
       <MergeRef Id='CRT100_x86' />

Copied and modified: UDM/trunk/WiX/UdmDll/UdmDll.wxs (from r3974, UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs)
==============================================================================
--- UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs	Tue Nov 29 14:37:37 2011	(r3974, copy source)
+++ UDM/trunk/WiX/UdmDll/UdmDll.wxs	Tue Nov 29 14:37:52 2011	(r3975)
@@ -4,25 +4,19 @@
 
   <?include ..\Udm_inc.wxi?>
 
-  <Module Id='UdmDll_VS10' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+  <Module Id='UdmDll' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
 
-    <Package Id='$(var.UdmDll_VS10_Package_Id)' Manufacturer='Vanderbilt University, ISIS'
+    <Package Id='35DC72B5-A81C-4190-ACE7-9D10CE1DA1A1' Manufacturer='Vanderbilt University, ISIS'
         InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
         InstallPrivileges='elevated' InstallScope='perMachine'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='$(var.SystemFolderNative)' Name='$(var.SystemFolderNative)'>
+      <?if $(sys.BUILDARCH)=x86?>
         <Component>
-          <File Source='$(var.Build)VC10\Release\$(var.UdmDllVC10)' />
+          <File Source='$(var.Build)VC9\Release\UdmDll_3_2.dll' />
         </Component>
-        <Component>
-          <File Source='..\bin\$(var.XercesC)' />
-        </Component>
-        <?if $(sys.BUILDARCH)=x64 ?>
-        <Component>
-          <File Source='..\bin\zlibwapi.dll' />
-        </Component>
-        <?endif?>
+      <?endif?>
       </Directory>
     </Directory>
 

Modified: UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs
==============================================================================
--- UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs	Tue Nov 29 14:37:37 2011	(r3974)
+++ UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs	Tue Nov 29 14:37:52 2011	(r3975)
@@ -15,9 +15,6 @@
         <Component>
           <File Source='$(var.Build)VC10\Release\$(var.UdmDllVC10)' />
         </Component>
-        <Component>
-          <File Source='..\bin\$(var.XercesC)' />
-        </Component>
         <?if $(sys.BUILDARCH)=x64 ?>
         <Component>
           <File Source='..\bin\zlibwapi.dll' />

Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi	Tue Nov 29 14:37:37 2011	(r3974)
+++ UDM/trunk/WiX/Udm_inc.wxi	Tue Nov 29 14:37:52 2011	(r3975)
@@ -7,6 +7,7 @@
   <?define UdmDll_VS10_Package_Id='15DA5365-B86F-493D-991A-CF4955817B66'?>
   <?define Udm_bin_Package_Id='526C2473-3F3B-4129-B8C9-FEDCD7DDFDE8'?>
   <?define Udm_SDK_Package_Id='455A6B49-FEA3-431C-B7C2-64394FC2765C'?>
+  <?define xerces_c_Package_Id='87EE74AF-F5DB-4371-A1E6-36E4B77457AA'?>
   <?define ProgramFilesNativeFolder='ProgramFiles64Folder'?>
   <?define SystemFolderNative='System64Folder'?>
   <?define Win64='yes'?>
@@ -22,6 +23,7 @@
   <?define UdmDll_VS10_Package_Id='8A4C258E-953D-402B-9B16-5706B1A8CF56'?>
   <?define Udm_bin_Package_Id='D5A9110E-DABE-4052-BB5F-AF030A7238F7'?>
   <?define Udm_SDK_Package_Id='6DCAE543-B606-45C2-9E8F-33E9029FD426'?>
+  <?define xerces_c_Package_Id='0CF60AD2-F0AD-456A-8B93-05FA971AC640'?>
   <?define ProgramFilesNativeFolder='ProgramFilesFolder'?>
   <?define SystemFolderNative='SystemFolder'?>
   <?define Win64='no'?>

Copied and modified: UDM/trunk/WiX/xerces_c/xerces_c.wxs (from r3974, UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs)
==============================================================================
--- UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs	Tue Nov 29 14:37:37 2011	(r3974, copy source)
+++ UDM/trunk/WiX/xerces_c/xerces_c.wxs	Tue Nov 29 14:37:52 2011	(r3975)
@@ -6,23 +6,15 @@
 
   <Module Id='UdmDll_VS10' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
 
-    <Package Id='$(var.UdmDll_VS10_Package_Id)' Manufacturer='Vanderbilt University, ISIS'
+    <Package Id='$(var.xerces_c_Package_Id)' Manufacturer='Vanderbilt University, ISIS'
         InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
         InstallPrivileges='elevated' InstallScope='perMachine'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='$(var.SystemFolderNative)' Name='$(var.SystemFolderNative)'>
         <Component>
-          <File Source='$(var.Build)VC10\Release\$(var.UdmDllVC10)' />
-        </Component>
-        <Component>
           <File Source='..\bin\$(var.XercesC)' />
         </Component>
-        <?if $(sys.BUILDARCH)=x64 ?>
-        <Component>
-          <File Source='..\bin\zlibwapi.dll' />
-        </Component>
-        <?endif?>
       </Directory>
     </Directory>

More information about the Mobies-commit mailing list