[Mobies-commit] [commit] r4323 - in UDM/trunk/WiX: . UdmDll UdmDll_VC11 UdmDll_VS10 UdmSDK_VC11 Udm_SDK Udm_bin xerces_c
ksmyth at redhat3.isis.vanderbilt.edu
ksmyth at redhat3.isis.vanderbilt.edu
Tue Sep 30 11:57:24 CDT 2014
Author: ksmyth
Date: Tue Sep 30 11:57:24 2014
New Revision: 4323
Log:
WiX installer: use wixlibs instead of merge modules
Modified:
UDM/trunk/WiX/Udm.wxs
UDM/trunk/WiX/UdmDll/UdmDll.wxs
UDM/trunk/WiX/UdmDll_VC11/UdmDll_VC11.wxs
UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs
UDM/trunk/WiX/UdmSDK_VC11/UdmSDK_VC11.wxs
UDM/trunk/WiX/UdmWiX.vcxproj
UDM/trunk/WiX/UdmWiX.vcxproj.filters
UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs
UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi
UDM/trunk/WiX/Udm_bin/UML2XML.wxi
UDM/trunk/WiX/Udm_bin/UMLOCLExpressionChecker.wxi
UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
UDM/trunk/WiX/Udm_inc.wxi
UDM/trunk/WiX/build_msi.py
UDM/trunk/WiX/xerces_c/xerces_c.wxs
Modified: UDM/trunk/WiX/Udm.wxs
==============================================================================
--- UDM/trunk/WiX/Udm.wxs Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/Udm.wxs Tue Sep 30 11:57:24 2014 (r4323)
@@ -62,12 +62,43 @@
<!-- DIRECTORY STRUCTURE -->
<!-- =========================================================== -->
<Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='$(var.ProgramFilesNativeFolder)'>
+ <Directory Id='SystemFolder' Name='SystemFolder'/>
+ <Directory Id='ProgramFilesFolder'>
<Directory Id='ISIS' Name='ISIS'>
<Directory Id='INSTALLDIR' Name='Udm'>
+ <Directory Id='etc' Name='etc'>
+ <Directory Id='etc_Java' Name='Java'/>
+ </Directory>
+ <Directory Id='include' Name='include'/>
+ <Directory Id='doc' Name='doc'/>
+ <Directory Id='libx86' Name='lib'/>
+ <Directory Id='binx86' Name='bin'>
+ <Directory Id='Python26x86' Name='Python26'/>
+ <Directory Id='Python27x86' Name='Python27'/>
+ </Directory>
+ <Directory Id='UIntWizVS' Name='UdmIntWizard'/>
+ <Directory Id='Samples' Name='Samples'>
+ <Directory Id='Samples_Python' Name='Python'>
+ <Directory Id='test_UdmPython'/>
+ </Directory>
+ <Directory Id='GeneTF' Name='GeneTF'/>
+ <Directory Id='GeneTRE' Name='GeneTRE'/>
+ <Directory Id='SBML2Ex' Name='SBML2Ex'/>
+ </Directory>
</Directory>
</Directory>
</Directory>
+ <?if $(sys.BUILDARCH)=x64 ?>
+ <Directory Id='System64Folder' Name='System64Folder'/>
+ <Directory Id='ProgramFiles64Folder'>
+ <Directory Id='ISISx64' Name='ISIS'>
+ <Directory Id='Udmx64' Name='Udm'>
+ <Directory Id='libx64' Name='lib'/>
+ <Directory Id='binx64' Name='bin'/>
+ </Directory>
+ </Directory>
+ </Directory>
+ <?endif?>
</Directory>
<!-- =========================================================== -->
@@ -78,20 +109,7 @@
<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"/>
- <Merge Id="UdmDll_VC11" Language="1033" SourceFile="UdmDll_VC11\UdmDll_VC11.msm" DiskId="1" />
- <Merge Id="UdmSDK_VC11" Language="1033" SourceFile="UdmSDK_VC11\UdmSDK_VC11.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_SDK_x64" Language="1033" SourceFile="Udm_SDK\Udm_SDK_x64.msm" DiskId="1"/>
- <Merge Id="Udm_bin_x64" Language="1033" SourceFile="Udm_bin\Udm_bin_x64.msm" DiskId="1"/>
- <Merge Id="UdmDll_VC11_x64" Language="1033" SourceFile="UdmDll_VC11\UdmDll_VC11_x64.msm" DiskId="1" />
- <Merge Id="UdmSDK_VC11_x64" Language="1033" SourceFile="UdmSDK_VC11\UdmSDK_VC11_x64.msm" DiskId="1"/>
<Merge Id="CRT100_x86" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm" DiskId="1" />
<Merge Id="MFC100_x86" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_MFC_x86.msm" DiskId="1" />
<Merge Id="ATL100_x86" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_ATL_x86.msm" DiskId="1" />
@@ -104,23 +122,24 @@
<!-- =========================================================== -->
<Feature Id='Complete' Title='Udm' Description='The complete package' Display='expand' Level='1'>
- <MergeRef Id='Udm_SDK' />
- <MergeRef Id='Udm_bin' />
- <MergeRef Id='xerces_c' />
- <MergeRef Id='UdmDll' />
- <MergeRef Id='UdmDll_VS10' />
- <MergeRef Id="UdmDll_VC11"/>
- <MergeRef Id="UdmSDK_VC11"/>
+ <ComponentGroupRef Id='xerces_cx86'/>
+ <ComponentGroupRef Id='Udm_binx86' />
+ <ComponentGroupRef Id='Udm_SDKx86' />
+ <ComponentGroupRef Id='UdmDllx86' />
+ <ComponentGroupRef Id='UdmDll_VS10x86' />
+ <ComponentGroupRef Id='UdmDll_VC11x86' />
+ <ComponentGroupRef Id='UdmSDK_VC11x86' />
<?if $(sys.BUILDARCH)=x64 ?>
- <MergeRef Id='xerces_c_x64'/>
- <MergeRef Id='UdmDll_VS10_x64'/>
- <MergeRef Id='Udm_bin_x64' />
- <MergeRef Id='Udm_SDK_x64' />
+ <ComponentGroupRef Id='xerces_cx64'/>
+ <ComponentGroupRef Id='Udm_binx64' />
+ <ComponentGroupRef Id='Udm_SDKx64' />
+ <ComponentGroupRef Id='UdmDllx64' />
+ <ComponentGroupRef Id='UdmDll_VS10x64' />
+ <ComponentGroupRef Id='UdmDll_VC11x64' />
+ <ComponentGroupRef Id='UdmSDK_VC11x64' />
<MergeRef Id='CRT100_x86' />
<MergeRef Id='MFC100_x86' />
<MergeRef Id='ATL100_x86' />
- <MergeRef Id="UdmDll_VC11_x64"/>
- <MergeRef Id="UdmSDK_VC11_x64"/>
<?endif?>
<MergeRef Id='CRT100' />
Modified: UDM/trunk/WiX/UdmDll/UdmDll.wxs
==============================================================================
--- UDM/trunk/WiX/UdmDll/UdmDll.wxs Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/UdmDll/UdmDll.wxs Tue Sep 30 11:57:24 2014 (r4323)
@@ -4,21 +4,16 @@
<?include ..\Udm_inc.wxi?>
- <Module Id='UdmDll' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+ <Fragment>
+ <DirectoryRef Id='$(var.SystemFolderNative)'/>
- <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)'>
+ <ComponentGroup Id='UdmDll$(sys.BUILDARCH)'>
<?if $(sys.BUILDARCH)=x86?>
- <Component>
- <File Source='$(var.Build)VC9\Release\UdmDll_3_2.dll' />
- </Component>
+ <Component Directory='$(var.SystemFolderNative)'>
+ <File Source='$(var.Build)VC9\Release\UdmDll_3_2.dll' />
+ </Component>
<?endif?>
- </Directory>
- </Directory>
+ </ComponentGroup>
- </Module>
+ </Fragment>
</Wix>
Modified: UDM/trunk/WiX/UdmDll_VC11/UdmDll_VC11.wxs
==============================================================================
--- UDM/trunk/WiX/UdmDll_VC11/UdmDll_VC11.wxs Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/UdmDll_VC11/UdmDll_VC11.wxs Tue Sep 30 11:57:24 2014 (r4323)
@@ -4,19 +4,13 @@
<?include ..\Udm_inc.wxi?>
- <Module Id='UdmDll_VC11' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
-
- <Package Id='$(var.UdmDll_VC11_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 Id='UdmDllVC11' Guid='$(var.UdmDllVC11_Guid)'>
+ <Fragment>
+ <DirectoryRef Id='$(var.SystemFolderNative)'/>
+ <ComponentGroup Id='UdmDll_VC11$(sys.BUILDARCH)'>
+ <Component Id='UdmDllVC11$(sys.BUILDARCH)' Guid='$(var.UdmDllVC11_Guid)' Directory='$(var.SystemFolderNative)'>
<File Source='$(var.Build)v110\Release\$(var.UdmDllVC11)' />
</Component>
- </Directory>
- </Directory>
+ </ComponentGroup>
- </Module>
+ </Fragment>
</Wix>
Modified: UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs
==============================================================================
--- UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs Tue Sep 30 11:57:24 2014 (r4323)
@@ -4,24 +4,18 @@
<?include ..\Udm_inc.wxi?>
- <Module Id='UdmDll_VS10' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+ <Fragment>
+ <DirectoryRef Id='$(var.SystemFolderNative)'/>
- <Package Id='$(var.UdmDll_VS10_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>
+ <ComponentGroup Id='UdmDll_VS10$(sys.BUILDARCH)'>
+ <Component Directory='$(var.SystemFolderNative)'>
<File Source='$(var.Build)v100\Release\$(var.UdmDllVC10)' />
</Component>
<?if $(sys.BUILDARCH)=x64 ?>
- <Component>
+ <Component Directory='$(var.SystemFolderNative)'>
<File Source='..\bin\zlibwapi.dll' />
</Component>
<?endif?>
- </Directory>
- </Directory>
-
- </Module>
+ </ComponentGroup>
+ </Fragment>
</Wix>
Modified: UDM/trunk/WiX/UdmSDK_VC11/UdmSDK_VC11.wxs
==============================================================================
--- UDM/trunk/WiX/UdmSDK_VC11/UdmSDK_VC11.wxs Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/UdmSDK_VC11/UdmSDK_VC11.wxs Tue Sep 30 11:57:24 2014 (r4323)
@@ -3,54 +3,36 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
<?include ..\Udm_inc.wxi ?>
- <Module Id='UdmSDK_VC11' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+ <Fragment>
+ <DirectoryRef Id='bin$(sys.BUILDARCH)'/>
+ <DirectoryRef Id='lib$(sys.BUILDARCH)'/>
- <Package Id='$(var.UdmSDK_VC11_Package_Id)'
- Manufacturer='Vanderbilt University, ISIS'
- InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
- InstallPrivileges='elevated' InstallScope='perMachine'/>
-
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='ProgramFilesFolder'>
- <Directory Id='ISIS' Name='ISIS'>
- <Directory Id='INSTALLDIR' Name='Udm'>
- <Directory Id='bin' Name='bin'/>
- <Directory Id='lib' Name='lib'/>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
-
- <DirectoryRef Id="lib">
+ <ComponentGroup Id='UdmSDK_VC11$(sys.BUILDARCH)'>
<?if $(sys.BUILDARCH)=x86 ?>
- <Component Id='UdmDll_v110_Win32.lib' Guid='1F03A6E0-CEA0-46B1-AE20-5BA5C6085BDE'>
+ <Component Id='UdmDll_v110_Win32.lib' Guid='1F03A6E0-CEA0-46B1-AE20-5BA5C6085BDE' Directory='lib$(sys.BUILDARCH)'>
<File Source="..\Build\Win32\v110\Release\UdmDll_v110_Win32.lib" />
</Component>
- <Component Id='UdmDll_v110_Win32D.lib' Guid='7972E73A-959C-4D06-8B55-96472AD3F2CD'>
+ <Component Id='UdmDll_v110_Win32D.lib' Guid='7972E73A-959C-4D06-8B55-96472AD3F2CD' Directory='lib$(sys.BUILDARCH)'>
<File Source="..\Build\Win32\v110\Debug\UdmDll_v110_Win32D.lib" />
</Component>
<?else?>
- <Component Id='UdmDll_v110_x64.lib' Guid='80BAA333-6817-4C22-9F69-5752B0AE6BDB'>
+ <Component Id='UdmDll_v110_x64.lib' Guid='80BAA333-6817-4C22-9F69-5752B0AE6BDB' Directory='libx86' Win64='no'>
<File Source="..\Build\x64\v110\Release\UdmDll_v110_x64.lib" />
</Component>
- <Component Id='UdmDll_v110_x64D.lib' Guid='4414035E-BC87-428D-A8F4-92F0A9B87E58'>
+ <Component Id='UdmDll_v110_x64D.lib' Guid='4414035E-BC87-428D-A8F4-92F0A9B87E58' Directory='libx86' Win64='no'>
<File Source="..\Build\x64\v110\Debug\UdmDll_v110_x64D.lib" />
</Component>
<?endif?>
- </DirectoryRef>
-
- <DirectoryRef Id="bin">
+
<?if $(sys.BUILDARCH)=x86 ?>
- <Component Id='UdmDll_3_2_v110_Win32D.dll' Guid='8ED4F0F9-C611-4B0F-AAC3-61B8603EAAE0'>
+ <Component Id='UdmDll_3_2_v110_Win32D.dll' Guid='8ED4F0F9-C611-4B0F-AAC3-61B8603EAAE0' Directory='bin$(sys.BUILDARCH)'>
<File Source="..\Build\Win32\v110\Debug\UdmDll_3_2_v110_Win32D.dll" />
</Component>
<?else?>
- <Component Id='UdmDll_3_2_v110_x64D.dll' Guid='16E21AAE-CDDA-4AB9-A7E3-CC1124441534'>
+ <Component Id='UdmDll_3_2_v110_x64D.dll' Guid='16E21AAE-CDDA-4AB9-A7E3-CC1124441534' Directory='bin$(sys.BUILDARCH)'>
<File Source="..\Build\x64\v110\Debug\UdmDll_3_2_v110_x64D.dll" />
</Component>
<?endif?>
- </DirectoryRef>
-
-
- </Module>
+ </ComponentGroup>
+ </Fragment>
</Wix>
Modified: UDM/trunk/WiX/UdmWiX.vcxproj
==============================================================================
--- UDM/trunk/WiX/UdmWiX.vcxproj Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/UdmWiX.vcxproj Tue Sep 30 11:57:24 2014 (r4323)
@@ -1,76 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{D63CBBDB-4F2C-4840-A915-291DD4C2A0F4}</ProjectGuid>
- <RootNamespace>UdmWiX</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup />
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <None Include="Udm.wxs" />
- <None Include="UdmDll_VS10\UdmDll_VS10.wxs">
- <SubType>Designer</SubType>
- </None>
- <None Include="Udm_bin\Udm_bin.wxs" />
- <None Include="Udm_inc.wxi">
- <SubType>Designer</SubType>
- </None>
- <None Include="Udm_SDK\Udm_SDK.wxs" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{D63CBBDB-4F2C-4840-A915-291DD4C2A0F4}</ProjectGuid>
+ <RootNamespace>UdmWiX</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <None Include="Udm.wxs" />
+ <None Include="UdmDll\UdmDll.wxs" />
+ <None Include="UdmDll_VC11\UdmDll_VC11.wxs" />
+ <None Include="UdmDll_VS10\UdmDll_VS10.wxs">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="UdmSDK_VC11\UdmSDK_VC11.wxs" />
+ <None Include="Udm_bin\MetaGME2Uml.wxi" />
+ <None Include="Udm_bin\Udm_bin.wxs" />
+ <None Include="Udm_bin\UML2XML.wxi" />
+ <None Include="Udm_bin\UMLOCLExpressionChecker.wxi" />
+ <None Include="Udm_inc.wxi">
+ <SubType>Designer</SubType>
+ </None>
+ <None Include="Udm_SDK\Udm_SDK.wxs" />
+ <None Include="xerces_c\xerces_c.wxs" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/WiX/UdmWiX.vcxproj.filters
==============================================================================
--- UDM/trunk/WiX/UdmWiX.vcxproj.filters Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/UdmWiX.vcxproj.filters Tue Sep 30 11:57:24 2014 (r4323)
@@ -1,24 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <None Include="Udm_inc.wxi" />
- <None Include="UdmDll_VS10\UdmDll_VS10.wxs" />
- <None Include="Udm.wxs" />
- <None Include="Udm_SDK\Udm_SDK.wxs" />
- <None Include="Udm_bin\Udm_bin.wxs" />
- </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ <Filter Include="Udm_bin">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Udm_inc.wxi" />
+ <None Include="UdmDll_VS10\UdmDll_VS10.wxs" />
+ <None Include="Udm.wxs" />
+ <None Include="Udm_SDK\Udm_SDK.wxs" />
+ <None Include="Udm_bin\Udm_bin.wxs" />
+ <None Include="xerces_c\xerces_c.wxs" />
+ <None Include="UdmSDK_VC11\UdmSDK_VC11.wxs" />
+ <None Include="UdmDll_VC11\UdmDll_VC11.wxs" />
+ <None Include="UdmDll\UdmDll.wxs" />
+ <None Include="Udm_bin\MetaGME2Uml.wxi">
+ <Filter>Udm_bin</Filter>
+ </None>
+ <None Include="Udm_bin\UML2XML.wxi">
+ <Filter>Udm_bin</Filter>
+ </None>
+ <None Include="Udm_bin\UMLOCLExpressionChecker.wxi">
+ <Filter>Udm_bin</Filter>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs Tue Sep 30 11:57:24 2014 (r4323)
@@ -3,152 +3,128 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
<?include ..\Udm_inc.wxi ?>
- <Module Id='Udm_SDK' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+ <Fragment>
- <Package Id='$(var.Udm_SDK_Package_Id)'
- Manufacturer='Vanderbilt University, ISIS'
- InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
- InstallPrivileges='elevated' InstallScope='perMachine'/>
-
- <!-- =========================================================== -->
- <!-- DIRECTORY STRUCTURE -->
- <!-- =========================================================== -->
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='ProgramFilesFolder'>
- <Directory Id='ISIS' Name='ISIS'>
- <Directory Id='INSTALLDIR' Name='Udm'>
- <Directory Id='bin' Name='bin'/>
- <Directory Id='etc' Name='etc'>
- <Directory Id='etc_Java' Name='Java'/>
- </Directory>
- <Directory Id='lib' Name='lib'/>
- <Directory Id='doc' Name='doc'/>
- <Directory Id='include' Name='include'/>
- <Directory Id='UIntWizVS' Name='UdmIntWizard'/>
- <Directory Id='Samples' Name='Samples'>
- <Directory Id='Samples_Python' Name='Python'>
- <Directory Id='test_UdmPython'/>
- </Directory>
- <Directory Id='GeneTF' Name='GeneTF'/>
- <Directory Id='GeneTRE' Name='GeneTRE'/>
- <Directory Id='SBML2Ex' Name='SBML2Ex'/>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
+ <DirectoryRef Id="lib$(sys.BUILDARCH)"/>
+ <DirectoryRef Id="INSTALLDIR"/>
<?if $(sys.BUILDARCH)=x86 ?>
- <ComponentGroupRef Id="include" />
- <ComponentGroupRef Id="UIntWizVS" />
- <ComponentGroupRef Id="test_UdmPython"/>
- <ComponentGroupRef Id="GeneTF"/>
- <ComponentGroupRef Id="GeneTRE"/>
- <ComponentGroupRef Id="SBML2Ex"/>
+ <DirectoryRef Id="include"/>
+ <DirectoryRef Id='etc'/>
+ <DirectoryRef Id='doc'/>
+ <DirectoryRef Id='UIntWizVS'/>
+ <DirectoryRef Id='Samples'/>
+ <DirectoryRef Id='Samples_Python'/>
+ <DirectoryRef Id='test_UdmPython'/>
+ <DirectoryRef Id='GeneTF'/>
+ <DirectoryRef Id='GeneTRE'/>
+ <DirectoryRef Id='SBML2Ex'/>
+ <?endif?>
+
+ <ComponentGroup Id='Udm_SDK$(sys.BUILDARCH)'>
+
+ <?if $(sys.BUILDARCH)=x86 ?>
+ <ComponentGroupRef Id="include" />
+ <ComponentGroupRef Id="UIntWizVS" />
+ <ComponentGroupRef Id="test_UdmPython"/>
+ <ComponentGroupRef Id="GeneTF"/>
+ <ComponentGroupRef Id="GeneTRE"/>
+ <ComponentGroupRef Id="SBML2Ex"/>
- <DirectoryRef Id="INSTALLDIR">
- <Component>
+ <Component Directory="INSTALLDIR">
<File Source="..\releaseinfo.txt" />
</Component>
- <Component>
+ <Component Directory="INSTALLDIR">
<File Source="..\license.txt" />
</Component>
- </DirectoryRef>
- <DirectoryRef Id="doc">
- <Component>
+ <Component Directory="doc">
<File Source="..\doc\UDMAPI.pdf" />
</Component>
- <Component>
+ <Component Directory="doc">
<File Source="..\doc\UdmInterpreterWizard.pdf" />
</Component>
<!-- TODO: javadoc judm\build\build_win\judm\apidoc -->
- </DirectoryRef>
- <DirectoryRef Id="etc">
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\CreateUdmXml.vbs" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\compileUdmAPI.bat" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\CreateMGA.vbs" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\CreateXmp.vbs" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\Uml.xsd" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\UdmProject.xme" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\UdmProject_udm.xml" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\UdmProject.xsd" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\Uml.xml" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\Xme2UdmXml.bat" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\UmlInUml.xme" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\etc\UmlMeta.xme" />
</Component>
- <Component>
+ <Component Directory="etc">
<File Source="..\Build\Win32\VC10\Release\StrResGen.exe" />
</Component>
- </DirectoryRef>
- <DirectoryRef Id="etc_Java">
- <Component>
+ <Component Directory="etc_Java">
<File Source="..\etc\JAVA\judmAPI.bat" />
</Component>
- <Component>
+ <Component Directory="etc_Java">
<File Source="..\etc\JAVA\.classpath" />
</Component>
- <Component>
+ <Component Directory="etc_Java">
<File Source="..\etc\JAVA\.project" />
</Component>
- <Component>
+ <Component Directory="etc_Java">
<File Source="..\etc\JAVA\build.xml" />
</Component>
- <Component>
+ <Component Directory="etc_Java">
<File Source="..\etc\JAVA\eclipseAPI.bat" />
</Component>
- </DirectoryRef>
- <?endif?>
+ <?endif?>
- <DirectoryRef Id="lib">
<?if $(sys.BUILDARCH)=x86 ?>
- <Component>
+ <Component Directory="lib$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC9\Release\UdmDll.lib" />
</Component>
- <Component>
+ <Component Directory="lib$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC9\Debug\UdmDllD.lib" />
</Component>
- <Component>
+ <Component Directory="lib$(sys.BUILDARCH)">
<File Source="..\Build\Win32\v100\Release\UdmDll_VS10.lib" />
</Component>
- <Component>
+ <Component Directory="lib$(sys.BUILDARCH)">
<File Source="..\Build\Win32\v100\Debug\UdmDll_VS10D.lib" />
</Component>
<?else?>
- <Component>
+ <Component Directory="libx86" Win64='no'>
<File Source="..\Build\x64\v100\Release\UdmDll_v100_x64.lib" />
</Component>
- <Component>
+ <Component Directory="libx86" Win64='no'>
<File Source="..\Build\x64\v100\Debug\UdmDll_v100_x64D.lib" />
</Component>
<?endif?>
- </DirectoryRef>
- </Module>
+ </ComponentGroup>
+ </Fragment>
</Wix>
Modified: UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi Tue Sep 30 11:57:24 2014 (r4323)
@@ -2,12 +2,12 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include ..\Udm_inc.wxi ?>
<Fragment>
- <DirectoryRef Id="bin" />
+ <DirectoryRef Id="bin$(sys.BUILDARCH)" />
</Fragment>
<Fragment>
-<ComponentGroup Id="MetaGME2Uml">
- <Component Id="MetaGME2Uml.dll" Directory="bin">
- <File Source="$(var.Great_bin)\MetaGME2Uml.dll">
+<ComponentGroup Id="MetaGME2Uml$(sys.BUILDARCH)">
+ <Component Id="MetaGME2Uml.dll$(sys.BUILDARCH)" Directory="bin$(sys.BUILDARCH)">
+ <File Source="$(var.Great_bin)\MetaGME2Uml.dll" Id="MetaGME2Uml.dll$(sys.BUILDARCH)">
<TypeLib Id="18213F2B-8BA4-451D-831C-C3FAB10AA4B7" Description="MGA Interpreter TypeLibrary (MetaGME2Uml)" Language="0" MajorVersion="1" MinorVersion="0">
<Class Id="{2FB04482-C9BC-4574-B933-51A007FFB07C}" Context="InprocServer32" Description="MGA.Interpreter.MetaGME2Uml">
<ProgId Id="MGA.Interpreter.MetaGME2Uml" Description="MGA.Interpreter.MetaGME2Uml" />
Modified: UDM/trunk/WiX/Udm_bin/UML2XML.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_bin/UML2XML.wxi Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/Udm_bin/UML2XML.wxi Tue Sep 30 11:57:24 2014 (r4323)
@@ -2,12 +2,12 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include ..\Udm_inc.wxi ?>
<Fragment>
- <DirectoryRef Id="bin" />
+ <DirectoryRef Id="bin$(sys.BUILDARCH)" />
</Fragment>
<Fragment>
-<ComponentGroup Id="UML2XML">
- <Component Id="UML2XML.dll" Directory="bin">
- <File Source="$(var.Build)VC10\Release\UML2XML.dll">
+<ComponentGroup Id="UML2XML$(sys.BUILDARCH)">
+ <Component Id="UML2XML.dll$(sys.BUILDARCH)" Directory="bin$(sys.BUILDARCH)">
+ <File Source="$(var.Build)VC10\Release\UML2XML.dll" Id="UML2XML.dll$(sys.BUILDARCH)">
<TypeLib Id="F3F6FC1C-D175-47D1-AC14-7EF210CC818F" Description="MGA Interpreter TypeLibrary (UML2XML)" Language="0" MajorVersion="1" MinorVersion="0">
<Class Id="{B05E71F0-2A71-4646-92E9-317507B32844}" Context="InprocServer32" Description="MGA.Interpreter.UML2XML">
<ProgId Id="MGA.Interpreter.UML2XML" Description="MGA.Interpreter.UML2XML" />
Modified: UDM/trunk/WiX/Udm_bin/UMLOCLExpressionChecker.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_bin/UMLOCLExpressionChecker.wxi Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/Udm_bin/UMLOCLExpressionChecker.wxi Tue Sep 30 11:57:24 2014 (r4323)
@@ -4,8 +4,8 @@
<DirectoryRef Id="bin" />
</Fragment>
<Fragment>
-<ComponentGroup Id="UMLOCLExpressionChecker">
- <Component Id="UMLOCLExpressionChecker.dll" Directory="bin">
+<ComponentGroup Id="UMLOCLExpressionChecker$(sys.BUILDARCH)">
+ <Component Id="UMLOCLExpressionChecker.dll$(sys.BUILDARCH)" Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\GmeOclExprChecker.dll">
<TypeLib Id="002B5FA9-C403-487D-8699-43CD7F7403BE" Description="MGA AddOn TypeLibrary (UMLOCLExpressionChecker)" Language="0" MajorVersion="1" MinorVersion="0">
<Class Id="{8FA738DE-767C-4765-8C0C-06365835D90A}" Context="InprocServer32" Description="MGA.AddOn.UMLOCLExpressionChecker">
Modified: UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_bin/Udm_bin.wxs Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs Tue Sep 30 11:57:24 2014 (r4323)
@@ -4,133 +4,110 @@
<?include ..\Udm_inc.wxi ?>
- <Module Id='Udm_bin' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
-
- <Package Id='$(var.Udm_bin_Package_Id)' Keywords='GME, MIC, modeling, domain specific languages' Description='Generic Modeling Environment Installer'
- Manufacturer='Vanderbilt University, ISIS'
- InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
- InstallPrivileges='elevated' InstallScope='perMachine'/>
-
- <!-- =========================================================== -->
- <!-- DIRECTORY STRUCTURE -->
- <!-- =========================================================== -->
- <Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='$(var.SystemFolderNative)' Name='$(var.SystemFolderNative)'/>
- <Directory Id='$(var.ProgramFilesNativeFolder)'>
- <Directory Id='ISIS' Name='ISIS'>
- <Directory Id='INSTALLDIR' Name='Udm'>
- <Directory Id='bin' Name='bin'>
- <Directory Id='Python26' Name='Python26'/>
- <Directory Id='Python27' Name='Python27'/>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
- </Directory>
-
- <?if $(sys.BUILDARCH)=x64?>
- <DirectoryRef Id="$(var.SystemFolderNative)">
- <Component>
- <File Source="..\Build\x64\VC10\Release\UdmSwig.dll"/>
- </Component>
- </DirectoryRef>
- <?endif?>
+ <Fragment>
+ <DirectoryRef Id="$(var.SystemFolderNative)"/>
+ <DirectoryRef Id="bin$(sys.BUILDARCH)"/>
+
+ <?if $(sys.BUILDARCH)=x86?>
+ <DirectoryRef Id="Python26$(sys.BUILDARCH)"/>
+ <DirectoryRef Id="Python27$(sys.BUILDARCH)"/>
+ <?endif?>
- <DirectoryRef Id="bin">
+ <ComponentGroup Id='Udm_bin$(sys.BUILDARCH)'>
+ <?if $(sys.BUILDARCH)=x64?>
+ <Component Directory="$(var.SystemFolderNative)" Id="UdmSwig$(sys.BUILDARCH)">
+ <File Source="..\Build\x64\VC10\Release\UdmSwig.dll" Id="UdmSwig$(sys.BUILDARCH)"/>
+ </Component>
+ <?endif?>
<?if $(sys.BUILDARCH)=x64?>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\x64\v100\Debug\UdmDll_3_2_v100_x64D.dll" />
<Environment Id="PATH" Action="set" System="yes" Name="PATH" Value="[bin]" Part="last" />
</Component>
<?endif?>
<?if $(sys.BUILDARCH)=x86 ?>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\bin\Xalan-C_1_11.dll" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\bin\XalanMessages_1_11.dll" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\bin\Xalan-C_1_11D.dll" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\bin\XalanMessages_1_11D.dll" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC9\Debug\UdmDll_3_2D.dll" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\v100\Debug\UdmDll_3_2_VS10D.dll" />
</Component>
- <Component>
- <File Source="..\Build\Win32\VC10\Release\Udm.exe" />
- <Environment Id="UDM_PATH" Action="set" System="yes" Name="UDM_PATH" Value="[INSTALLDIR]" />
- <Environment Id="PATH" Action="set" System="yes" Name="PATH" Value="[bin]" Part="last" />
+ <Component Directory="bin$(sys.BUILDARCH)">
+ <File Source="..\Build\Win32\VC10\Release\Udm.exe" Id="Udm.exe$(sys.BUILDARCH)"/>
+ <Environment Id="UDM_PATH$(sys.BUILDARCH)" Action="set" System="yes" Name="UDM_PATH" Value="[INSTALLDIR]" />
+ <Environment Id="PATH$(sys.BUILDARCH)" Action="set" System="yes" Name="PATH" Value="[bin]" Part="last" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\UdmCopy.exe" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\UdmBackendDump.exe" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\UdmOclPat.exe" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\UdmViz.exe" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\XmiToUdm.exe" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\UdmToXmi.exe" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\UdmSwig.dll" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\judm\build\build_win\judm\judm.jar" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\bin\udm.py" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\UdmCli.dll" Assembly=".net"/>
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\Build\Win32\VC10\Release\UdmCliBridge.dll" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\src\UdmCliGen\dist\UdmCliGen.exe" />
</Component>
- <Component>
+ <Component Directory="bin$(sys.BUILDARCH)">
<File Source="..\src\UdmCliGen\dist\python27.dll" />
</Component>
<?endif?>
- </DirectoryRef>
- <ComponentGroupRef Id="MetaGME2Uml"/>
- <ComponentGroupRef Id="UML2XML"/>
- <?if $(sys.BUILDARCH)=x86 ?>
- <ComponentGroupRef Id="UMLOCLExpressionChecker"/>
- <DirectoryRef Id="Python26">
- <Component>
+ <ComponentGroupRef Id="MetaGME2Uml$(sys.BUILDARCH)"/>
+ <ComponentGroupRef Id="UML2XML$(sys.BUILDARCH)"/>
+ <?if $(sys.BUILDARCH)=x86 ?>
+ <ComponentGroupRef Id="UMLOCLExpressionChecker$(sys.BUILDARCH)"/>
+ <Component Directory="Python26$(sys.BUILDARCH)">
<File Source="..\bin\Python26\udm.pyd" />
</Component>
- <Component>
+ <Component Directory="Python26$(sys.BUILDARCH)">
<File Source="..\bin\Python26\__init__.py" />
</Component>
- </DirectoryRef>
- <DirectoryRef Id="Python27">
- <Component>
+ <Component Directory="Python27$(sys.BUILDARCH)">
<File Source="..\bin\Python27\udm.pyd" Id="udm.pyd27"/>
</Component>
- <Component>
+ <Component Directory="Python27$(sys.BUILDARCH)">
<File Source="..\bin\Python27\__init__.py" Id="initpy27"/>
</Component>
- </DirectoryRef>
- <?endif?>
-
- </Module>
+ <?endif?>
+ </ComponentGroup>
+ </Fragment>
</Wix>
Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/Udm_inc.wxi Tue Sep 30 11:57:24 2014 (r4323)
@@ -4,11 +4,6 @@
<Include>
<?if $(sys.BUILDARCH)=x64 ?>
<?define UpgradeCode='11CB0ED6-A45B-49FA-ABB2-A718EB5C970D'?>
- <?define UdmDll_VS10_Package_Id='15DA5365-B86F-493D-991A-CF4955817B66'?>
- <?define UdmDll_VC11_Package_Id='F9447C28-D992-4957-9A0A-42ED1B691DBC'?>
- <?define Udm_bin_Package_Id='526C2473-3F3B-4129-B8C9-FEDCD7DDFDE8'?>
- <?define Udm_SDK_Package_Id='455A6B49-FEA3-431C-B7C2-64394FC2765C'?>
- <?define UdmSDK_VC11_Package_Id='6B969299-23F2-486F-91B2-65C3A2BEDBE8'?>
<?define xerces_c_Package_Id='87EE74AF-F5DB-4371-A1E6-36E4B77457AA'?>
<?define ProgramFilesNativeFolder='ProgramFiles64Folder'?>
<?define SystemFolderNative='System64Folder'?>
@@ -25,11 +20,6 @@
<?define Great_bin=$(var.GREAT_PATH)\bin\x64?>
<?else ?>
<?define UpgradeCode='D656A56A-F239-4B35-865C-840B1EA235E0'?>
- <?define UdmDll_VS10_Package_Id='8A4C258E-953D-402B-9B16-5706B1A8CF56'?>
- <?define UdmDll_VC11_Package_Id='DD6182B2-BFA7-49C0-8E2D-B874C53F41A6'?>
- <?define Udm_bin_Package_Id='D5A9110E-DABE-4052-BB5F-AF030A7238F7'?>
- <?define Udm_SDK_Package_Id='6DCAE543-B606-45C2-9E8F-33E9029FD426'?>
- <?define UdmSDK_VC11_Package_Id='F46E96B5-3C2B-48A8-8638-8E971124203E'?>
<?define xerces_c_Package_Id='0CF60AD2-F0AD-456A-8B93-05FA971AC640'?>
<?define ProgramFilesNativeFolder='ProgramFilesFolder'?>
<?define SystemFolderNative='SystemFolder'?>
Modified: UDM/trunk/WiX/build_msi.py
==============================================================================
--- UDM/trunk/WiX/build_msi.py Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/build_msi.py Tue Sep 30 11:57:24 2014 (r4323)
@@ -73,13 +73,19 @@
if msi:
print 'Building msi ' + arch
msi_names = {'x86': 'Udm.msi', 'x64': 'Udm_x64.msi'}
- system(['light', '-nologo', '-sw1055', '-sice:ICE82', '-ext', 'WixNetFxExtension', '-ext', 'WixUIExtension', '-ext', 'WixUtilExtension', '-o', msi_names[arch] ] + [ get_wixobj(file) for file in sources ])
+ dirs = [os.path.basename(d) for d in glob.glob(sourcedir + '*') if os.path.isdir(d) and os.path.basename(d) not in ('Release', 'Debug', '.svn')]
+ 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]
+ 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:
- mm_name = [ os.path.splitext(source)[0] for source in sources if source.find('.wxs') != -1 ][0]
+ wixlib_name = [ os.path.splitext(source)[0] for source in sources if source.find('.wxs') != -1 ][0]
if arch == 'x64':
- mm_name = mm_name + '_x64'
- mm_name = mm_name + '.msm'
- system(['light', '-nologo', '-ext', 'WixUtilExtension', '-o', mm_name] + [ get_wixobj(file) for file in sources ])
+ wixlib_name = wixlib_name + '_x64'
+ sources = [s for s in sources if os.path.basename(s) not in ('include.wxi', 'UIntWizVS.wxi', 'test_UdmPython.wxi', 'GeneTF.wxi', 'GeneTRE.wxi', 'SBML2Ex.wxi')]
+ wixlib_name = wixlib_name + '.wixlib'
+ system(['lit', '-nologo', '-bf', '-ext', 'WixUtilExtension', '-o', wixlib_name] + [ get_wixobj(file) for file in sources ])
if __name__=='__main__':
from optparse import OptionParser
Modified: UDM/trunk/WiX/xerces_c/xerces_c.wxs
==============================================================================
--- UDM/trunk/WiX/xerces_c/xerces_c.wxs Fri Sep 26 10:25:20 2014 (r4322)
+++ UDM/trunk/WiX/xerces_c/xerces_c.wxs Tue Sep 30 11:57:24 2014 (r4323)
@@ -3,20 +3,13 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
<?include ..\Udm_inc.wxi?>
+ <Fragment>
+ <DirectoryRef Id='$(var.SystemFolderNative)'/>
- <Module Id='UdmDll_VS10' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
-
- <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='..\bin\$(var.XercesC)' />
- </Component>
- </Directory>
- </Directory>
-
- </Module>
+ <ComponentGroup Id='xerces_c$(sys.BUILDARCH)'>
+ <Component Directory='$(var.SystemFolderNative)'>
+ <File Source='..\bin\$(var.XercesC)' />
+ </Component>
+ </ComponentGroup>
+ </Fragment>
</Wix>
More information about the Mobies-commit
mailing list