[Mobies-commit] [commit] r3941 - in UDM/trunk/WiX: . UdmDll_VS10 Udm_SDK Udm_bin

ksmyth at redhat1.isis.vanderbilt.edu ksmyth at redhat1.isis.vanderbilt.edu
Thu Nov 17 17:46:04 CST 2011


Author: ksmyth
Date: Thu Nov 17 17:46:03 2011
New Revision: 3941

Log:
Udm.msi installer

Added:
   UDM/trunk/WiX/
   UDM/trunk/WiX/Udm.wxs
   UDM/trunk/WiX/UdmDll_VS10/
   UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs
   UDM/trunk/WiX/UdmWiX.vcxproj
   UDM/trunk/WiX/UdmWiX.vcxproj.filters
   UDM/trunk/WiX/Udm_SDK/
   UDM/trunk/WiX/Udm_SDK/GeneTF.wxi
   UDM/trunk/WiX/Udm_SDK/GeneTRE.wxi
   UDM/trunk/WiX/Udm_SDK/SBML2Ex.wxi
   UDM/trunk/WiX/Udm_SDK/UIntWizVS.wxi
   UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs
   UDM/trunk/WiX/Udm_SDK/include.wxi
   UDM/trunk/WiX/Udm_SDK/test_UdmPython.wxi
   UDM/trunk/WiX/Udm_bin/
   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

Added: UDM/trunk/WiX/Udm.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm.wxs	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,102 @@
+<?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 ?>
+
+
+
+  <Product Name='$(var.ProductName)' Id='*' UpgradeCode='$(var.UpgradeCode)'
+        Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)' Manufacturer='Vanderbilt University, ISIS'>
+
+    <Package Id='*' Description='Universal Data Model'
+        Manufacturer='Vanderbilt University, ISIS'
+        InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252'
+        InstallPrivileges='elevated' InstallScope='perMachine'/>
+
+
+    <Upgrade Id="$(var.UpgradeCode)">
+      <UpgradeVersion Minimum="$(var.VERSIONSTR)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
+      <UpgradeVersion OnlyDetect="no" Minimum="1.0.0" IncludeMinimum="yes" Maximum="$(var.VERSIONSTR)" IncludeMaximum="no" Property="PREVIOUSFOUND"/>
+    </Upgrade>
+    <CustomActionRef Id="WixExitEarlyWithSuccess"/>
+
+    <InstallExecuteSequence>
+      <RemoveExistingProducts After="InstallValidate" />
+    </InstallExecuteSequence>
+
+    <Media Id='1' Cabinet='Udm.cab' EmbedCab='yes' />
+
+    <Condition Message="This application is only supported on Windows XP or higher.">
+      <![CDATA[Installed OR (VersionNT >= 501)]]>
+    </Condition>
+
+    <!-- TODO WixVariable Id="WixUILicenseRtf" Value="..\Doc\Legal\License.rtf" / -->
+
+    <!-- =========================================================== -->
+    <!-- DIRECTORY STRUCTURE -->
+    <!-- =========================================================== -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='$(var.ProgramFilesNativeFolder)'>
+        <Directory Id='ISIS' Name='ISIS'>
+          <Directory Id='INSTALLDIR' Name='Udm'>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <!-- =========================================================== -->
+    <!-- MERGE MODULES -->
+    <!-- =========================================================== -->
+    <DirectoryRef Id='TARGETDIR'>
+      <Merge Id="CRT100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_CRT_$(sys.BUILDARCH).msm" DiskId="1" />
+      <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="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="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" />
+      <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" />
+      <?endif?>
+    </DirectoryRef>
+
+
+    <!-- =========================================================== -->
+    <!-- FEATURES -->
+    <!-- =========================================================== -->
+    <Feature Id='Complete' Title='Udm' Description='The complete package' Display='expand' Level='1'>
+
+      <MergeRef Id='Udm_SDK' />
+      <MergeRef Id='Udm_bin' />
+      <MergeRef Id='UdmDll_VS10' />
+      <?if $(sys.BUILDARCH)=x64 ?>
+      <MergeRef Id='UdmDll_VS10_x64'/>
+      <MergeRef Id='Udm_bin_x64' />
+      <MergeRef Id='CRT100_x86' />
+      <MergeRef Id='MFC100_x86' />
+      <MergeRef Id='ATL100_x86' />
+      <?endif?>
+
+      <MergeRef Id='CRT100' />
+      <MergeRef Id='MFC100' />
+      <MergeRef Id='ATL100' />
+    </Feature>
+
+    <!-- =========================================================== -->
+    <!-- USER INTERFACE -->
+    <!-- =========================================================== -->
+    <UI>
+      <UIRef Id="WixUI_Minimal" />
+      <UIRef Id="WixUI_ErrorProgressText" />
+      <InstallUISequence>
+        <Show Dialog="UserExit" OnExit="cancel">0</Show>
+      </InstallUISequence>
+    </UI>
+
+  </Product>
+</Wix>

Added: UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/UdmDll_VS10/UdmDll_VS10.wxs	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,30 @@
+<?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?>
+
+  <Module Id='UdmDll_VS10' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+
+    <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>
+          <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>
+
+  </Module>
+</Wix>

Added: UDM/trunk/WiX/UdmWiX.vcxproj
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/UdmWiX.vcxproj	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,76 @@
+<?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>
+</Project>
\ No newline at end of file

Added: UDM/trunk/WiX/UdmWiX.vcxproj.filters
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/UdmWiX.vcxproj.filters	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,24 @@
+<?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>
+</Project>
\ No newline at end of file

Added: UDM/trunk/WiX/Udm_SDK/GeneTF.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_SDK/GeneTF.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?define GeneTF=..\..\judm\build\build_win\GeneTF?>
+<!-- generated with ../../../../Documents/META/deploy/gen_dir_wxi.py ..\..\judm\build\build_win\GeneTF -->
+    <Fragment>
+        <DirectoryRef Id="GeneTF">
+            <Directory Id="dir3AC402693CAC497FCEE1725D943A7A12" Name="meta" />
+            <Directory Id="dir6C0BD1A48B67DA0B0888B30DCA1190EA" Name="samples" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="GeneTF">
+            <Component Id="cmp8888022C93284E1F4DCF5F3E8BD10A5F" Directory="GeneTF" Guid="*">
+                <File Id="filD327A977FFFB416C23D583A0FE8EB742" KeyPath="yes" Source="$(var.GeneTF)\GeneTF-test.jar" />
+            </Component>
+            <Component Id="cmpD400AF451B6A20B3C71CC09FC7AA8702" Directory="GeneTF" Guid="*">
+                <File Id="filDC9CC28B5EB280A3E5206278DE44D96A" KeyPath="yes" Source="$(var.GeneTF)\GeneTF.jar" />
+            </Component>
+            <Component Id="cmp6AEA83CBDD7A93CDB796C4E16F0D804B" Directory="GeneTF" Guid="*">
+                <File Id="filA1C476847A16ED2140A01E141BF9B869" KeyPath="yes" Source="$(var.GeneTF)\runtests.cmd" />
+            </Component>
+            <Component Id="cmpA28128D8741D87D3C8C61416368D992E" Directory="dir3AC402693CAC497FCEE1725D943A7A12" Guid="*">
+                <File Id="fil307185411B7C2A8EBC54F15755C911A5" KeyPath="yes" Source="$(var.GeneTF)\meta\GeneTF.JPG" />
+            </Component>
+            <Component Id="cmpE033329408B2E9F06CA45C9FF5D92837" Directory="dir3AC402693CAC497FCEE1725D943A7A12" Guid="*">
+                <File Id="fil3969335A0436995E777AA7BDE40341AA" KeyPath="yes" Source="$(var.GeneTF)\meta\GeneTF.xsd" />
+            </Component>
+            <Component Id="cmpAD86DA1C5D13B0E66F9034516DF87525" Directory="dir3AC402693CAC497FCEE1725D943A7A12" Guid="*">
+                <File Id="filC7D6A2DE4AC29C6BF9319302B254F2A7" KeyPath="yes" Source="$(var.GeneTF)\meta\GeneTF_udm.xml" />
+            </Component>
+            <Component Id="cmpE007D8816CCC98226B5A1D4DD78F9537" Directory="dir3AC402693CAC497FCEE1725D943A7A12" Guid="*">
+                <File Id="filDC92F3CEFF7C1332AB811A247F59D8A8" KeyPath="yes" Source="$(var.GeneTF)\meta\GeneTF_uml.xme" />
+            </Component>
+            <Component Id="cmp6F77E6655141F76D0A9BAF28C4AA14CA" Directory="dir6C0BD1A48B67DA0B0888B30DCA1190EA" Guid="*">
+                <File Id="fil772FAF177F1A0368EEADF95EED3454DF" KeyPath="yes" Source="$(var.GeneTF)\samples\test.xml" />
+            </Component>
+            <Component Id="cmp24369D544C28919C85B096D15743A0DE" Directory="dir6C0BD1A48B67DA0B0888B30DCA1190EA" Guid="*">
+                <File Id="fil530A89E97F1A45DE9F6A07EF6BE19818" KeyPath="yes" Source="$(var.GeneTF)\samples\test2.xml" />
+            </Component>
+            <Component Id="cmpCE170A583B88E50BD49E4958A89158E7" Directory="dir6C0BD1A48B67DA0B0888B30DCA1190EA" Guid="*">
+                <File Id="filB48725A8C62BDF7EB74CBB40DA31709E" KeyPath="yes" Source="$(var.GeneTF)\samples\tests.xml" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir6C0BD1A48B67DA0B0888B30DCA1190EA" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir3AC402693CAC497FCEE1725D943A7A12" />
+    </Fragment>
+</Wix>
\ No newline at end of file

Added: UDM/trunk/WiX/Udm_SDK/GeneTRE.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_SDK/GeneTRE.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?define GeneTRE=..\..\judm\build\build_win\GeneTRE?>
+<!-- generated with ../../../../Documents/META/deploy/gen_dir_wxi.py ..\..\judm\build\build_win\GeneTRE -->
+    <Fragment>
+        <DirectoryRef Id="GeneTRE">
+            <Directory Id="dir2294E565B7CEE286AA62EB9429EFDC79" Name="meta" />
+            <Directory Id="dir30A3379CD42F37F40B60A0F847848ED5" Name="samples" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="GeneTRE">
+            <Component Id="cmpC8C731E9AB0DAF5A6A6901F60E847727" Directory="GeneTRE" Guid="*">
+                <File Id="fil5848D755F4E99A8494507E9EE5580598" KeyPath="yes" Source="$(var.GeneTRE)\GeneTRE-test.jar" />
+            </Component>
+            <Component Id="cmpAA0ACE3489CB78B4F4F21B861F79AD40" Directory="GeneTRE" Guid="*">
+                <File Id="fil37BE102AA3D95EAE811869DC3A0E66CF" KeyPath="yes" Source="$(var.GeneTRE)\GeneTRE.jar" />
+            </Component>
+            <Component Id="cmpCB9448D9737D6F80D00251171A3497D9" Directory="GeneTRE" Guid="*">
+                <File Id="fil2861F0B7FDB089FF458183A94EE794EB" KeyPath="yes" Source="$(var.GeneTRE)\runtests.cmd" />
+            </Component>
+            <Component Id="cmp212299A7B1DB12957C67E15739D8D0D1" Directory="dir2294E565B7CEE286AA62EB9429EFDC79" Guid="*">
+                <File Id="filCE512D3AFDC509FB50B41C9D617466D7" KeyPath="yes" Source="$(var.GeneTRE)\meta\GeneTRE.JPG" />
+            </Component>
+            <Component Id="cmpF9A7C88A1BBE2F9C464B30CBAF558484" Directory="dir2294E565B7CEE286AA62EB9429EFDC79" Guid="*">
+                <File Id="fil23301C3BDD7A0404DA55B8122DE4BFD2" KeyPath="yes" Source="$(var.GeneTRE)\meta\GeneTRE.xsd" />
+            </Component>
+            <Component Id="cmpDE1782170EFA05ABA81C8A29C8F10449" Directory="dir2294E565B7CEE286AA62EB9429EFDC79" Guid="*">
+                <File Id="fil0455E3715F831F6D5DA373C37FCA3F2F" KeyPath="yes" Source="$(var.GeneTRE)\meta\GeneTRE_udm.xml" />
+            </Component>
+            <Component Id="cmp1E4F4A1BD09D2CA4753BE8F0DAEE9316" Directory="dir2294E565B7CEE286AA62EB9429EFDC79" Guid="*">
+                <File Id="filCCA58B138FECD94799BE05D1C33B7EC8" KeyPath="yes" Source="$(var.GeneTRE)\meta\GeneTRE_uml.xme" />
+            </Component>
+            <Component Id="cmp3ECD3AAA7E8CECE56D62460FF5E0ACA4" Directory="dir30A3379CD42F37F40B60A0F847848ED5" Guid="*">
+                <File Id="fil266DACC14FA7FD38242376B9F60879A8" KeyPath="yes" Source="$(var.GeneTRE)\samples\test.xml" />
+            </Component>
+            <Component Id="cmp3C81AE3CD6FA85D8062159BEDB515895" Directory="dir30A3379CD42F37F40B60A0F847848ED5" Guid="*">
+                <File Id="filAFE7798246EEE0CE2D350C59B12397DB" KeyPath="yes" Source="$(var.GeneTRE)\samples\test2.xml" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir2294E565B7CEE286AA62EB9429EFDC79" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir30A3379CD42F37F40B60A0F847848ED5" />
+    </Fragment>
+</Wix>
\ No newline at end of file

Added: UDM/trunk/WiX/Udm_SDK/SBML2Ex.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_SDK/SBML2Ex.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?define SBML2Ex=..\..\judm\build\build_win\SBML2Ex?>
+<!-- generated with ../../../../Documents/META/deploy/gen_dir_wxi.py ..\..\judm\build\build_win\SBML2Ex -->
+    <Fragment>
+        <DirectoryRef Id="SBML2Ex">
+            <Directory Id="dir219518735E441AECFD42DEA7AF8D9B96" Name="meta" />
+            <Directory Id="dir3683F7580EA3EC6030A48FFE787BD379" Name="samples" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="SBML2Ex">
+            <Component Id="cmpFE241266BE9EFFFF68CD6B8F9B159A8F" Directory="SBML2Ex" Guid="*">
+                <File Id="filA6B6D2BB871DA488E1870D88F74AF45C" KeyPath="yes" Source="$(var.SBML2Ex)\runtests.cmd" />
+            </Component>
+            <Component Id="cmp2E76CD120036D1B86F3B2D14FF7992A2" Directory="SBML2Ex" Guid="*">
+                <File Id="filEEE65F00A6E4EA10257E86433FF20619" KeyPath="yes" Source="$(var.SBML2Ex)\SBML2Ex-test.jar" />
+            </Component>
+            <Component Id="cmpBC9695EC523DAC92DDF623F798205C9A" Directory="SBML2Ex" Guid="*">
+                <File Id="filE1D89C0CC4158B0E94740425D98C2711" KeyPath="yes" Source="$(var.SBML2Ex)\SBML2Ex.jar" />
+            </Component>
+            <Component Id="cmpB3913EE45C64799F61D4900FB11289C1" Directory="dir219518735E441AECFD42DEA7AF8D9B96" Guid="*">
+                <File Id="fil4931161CE4D165255D84EBB07704337C" KeyPath="yes" Source="$(var.SBML2Ex)\meta\SBML2Ex.xsd" />
+            </Component>
+            <Component Id="cmp47DD33BECF41602F1CF8E98D8B824AB0" Directory="dir219518735E441AECFD42DEA7AF8D9B96" Guid="*">
+                <File Id="filDC458803704A58C8FEAAF1C8B5F14743" KeyPath="yes" Source="$(var.SBML2Ex)\meta\SBML2Ex_udm.xml" />
+            </Component>
+            <Component Id="cmpB78E3548E21FEB5BC6F4C67CDB6879F5" Directory="dir219518735E441AECFD42DEA7AF8D9B96" Guid="*">
+                <File Id="filD9EB83A74260B1EEFB376442B4F9008B" KeyPath="yes" Source="$(var.SBML2Ex)\meta\SBML2Ex_uml.xme" />
+            </Component>
+            <Component Id="cmpB6394679C97D4C44C1C8861FD8A7B84D" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filD2277841B8D5ED8CEE903BE26B81E1ED" KeyPath="yes" Source="$(var.SBML2Ex)\samples\compOutRef.xml" />
+            </Component>
+            <Component Id="cmpCD0CDB7BD8F2DEAA58093616A9C3B2B8" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil3BCA534D07ECB98EC24A900CDB6A7A79" KeyPath="yes" Source="$(var.SBML2Ex)\samples\compUnitRef.xml" />
+            </Component>
+            <Component Id="cmp42C9D7019188250D109013B1D29B838A" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil4DB371D483574E045C685C659D15F9AD" KeyPath="yes" Source="$(var.SBML2Ex)\samples\delayLabelRef.xml" />
+            </Component>
+            <Component Id="cmpD6C0565C39C6520390AAEAB0B99BD36E" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil4074A0C4F420BAA056DDE22E93F585E5" KeyPath="yes" Source="$(var.SBML2Ex)\samples\demo_30_paintfb_out.xml" />
+            </Component>
+            <Component Id="cmpE2AB07CD7A21B6A5EF11D364A851822A" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil552014B1EE8DF6D809B09C21CE05D2D4" KeyPath="yes" Source="$(var.SBML2Ex)\samples\eventUnitRef.xml" />
+            </Component>
+            <Component Id="cmpD9A5BF86433F36EFBC87DF892F8BFCD7" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil61D77FAF64DC8FEF0EE46761C7CC618D" KeyPath="yes" Source="$(var.SBML2Ex)\samples\eventVariableRef.xml" />
+            </Component>
+            <Component Id="cmp0F0AF3892ADEC11C5AF636952783DE00" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil2CA1274830AD3F39A62C419D4EBE01C0" KeyPath="yes" Source="$(var.SBML2Ex)\samples\frogegg.xml" />
+            </Component>
+            <Component Id="cmp5ADD45E44EF65F9EC5891602F5BD5C56" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil1F38D8809EBA65A6D4BF35F4D16928BD" KeyPath="yes" Source="$(var.SBML2Ex)\samples\functionLabelRef.xml" />
+            </Component>
+            <Component Id="cmpDE87EC3BF9D2FA8C27D438F6470386EC" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filDC88E12D1CE3EE9BA61EF9F455C0FA4E" KeyPath="yes" Source="$(var.SBML2Ex)\samples\invGlobalId.xml" />
+            </Component>
+            <Component Id="cmpCE6B56BEC4B3CFD1AD3DFA262D9F3BBD" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil43B4B6CF559F61DF6C7FAC2748A1DC23" KeyPath="yes" Source="$(var.SBML2Ex)\samples\invParameterUnitRef.xml" />
+            </Component>
+            <Component Id="cmp11B86D35EFEEBD4C219995804218753D" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filF56473ABBB4A1BA8A915982D4CE703E2" KeyPath="yes" Source="$(var.SBML2Ex)\samples\invReactParam.xml" />
+            </Component>
+            <Component Id="cmp500E725E63523CD53D3DC01B658CFF72" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filAE58F9DAF8EC71E30540AD9C2D6EECA6" KeyPath="yes" Source="$(var.SBML2Ex)\samples\invReactRef.xml" />
+            </Component>
+            <Component Id="cmpF83DB5FE9C4E9698FC874D8E859AB800" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filE5770A1516194DAC4B144D581AD76125" KeyPath="yes" Source="$(var.SBML2Ex)\samples\invSpCompartment.xml" />
+            </Component>
+            <Component Id="cmpF15C5D9A64F09EF875D314AE3E97EEBF" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil99BB86C465E4A9AA621123179838F186" KeyPath="yes" Source="$(var.SBML2Ex)\samples\invSpeciesIC.xml" />
+            </Component>
+            <Component Id="cmpA1A9230B3241344B88945156346AE6BD" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil1B3859093ED77A466222D6B9CE027AA8" KeyPath="yes" Source="$(var.SBML2Ex)\samples\invSpeciesUnitRef.xml" />
+            </Component>
+            <Component Id="cmp98BF87755DFD1A270A50B9C125D9CF7F" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil35336226452778A4FFC9C969BFAE4513" KeyPath="yes" Source="$(var.SBML2Ex)\samples\invUnitDef.xml" />
+            </Component>
+            <Component Id="cmp0AED3D3A356A45A35747F4488DDFA296" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil8E0FDF6CAE98F7C97460035638CF0B11" KeyPath="yes" Source="$(var.SBML2Ex)\samples\JR904.xml" />
+            </Component>
+            <Component Id="cmp1625D06BEE42ACE604769314F6CEA46B" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filF37ED9B9EDFEAD61BBEB586AED5AC887" KeyPath="yes" Source="$(var.SBML2Ex)\samples\klawLabelRef.xml" />
+            </Component>
+            <Component Id="cmp048EFE5F8009E90AD7FA90BD866AEC30" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filA597F9D5AA622A3B490D63F76962E11D" KeyPath="yes" Source="$(var.SBML2Ex)\samples\klawUnitRef.xml" />
+            </Component>
+            <Component Id="cmp1769E5EE0B4EB52A11C4A1101ADD40C1" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filAB5C0E63DC095CE33F1A68EFCD890122" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-2D-compartments.xml" />
+            </Component>
+            <Component Id="cmp4E07D4CF7EE3B16870EEA552D13B7558" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil28E7D38F375958D4FA9F64FB289078D0" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-algebraic.xml" />
+            </Component>
+            <Component Id="cmp496A5114D0EC04FE19DFFBC76B241BF6" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil10D56FA446E1C3A97F3CCF50EC53EAA9" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-assignment.xml" />
+            </Component>
+            <Component Id="cmpE3F49B11872EE5EF0C0CD34428BE3EE0" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil94962C4ADDFA382AC9E36F274457B1B5" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-boundary.xml" />
+            </Component>
+            <Component Id="cmp4F070B1F181E81BF04A2E56FC04C0B1B" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil50C2C88281FF4D1ABC61787375D04A02" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-branch.xml" />
+            </Component>
+            <Component Id="cmpF8FE8088AA927950AFE3960DB145B272" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filD2B84319E0B5526CA181A676A3C621E0" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-delay.xml" />
+            </Component>
+            <Component Id="cmp0F12F471FED1D86724CAD22819E39823" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filBB84A2B1B07987343CBBA335CA9AE4CF" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-events.xml" />
+            </Component>
+            <Component Id="cmp0D352763FBAB11E2C8F9443DDB96C3DE" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filC74E896B15D460287A4AA2FF7DE71EF0" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-functions.xml" />
+            </Component>
+            <Component Id="cmpE26178D44FD84D7F63F37154D78B47E0" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil1A7C5FA006C2BDBFD64B976FF8D306E3" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-mc-ode.xml" />
+            </Component>
+            <Component Id="cmp91F76653032884550E19E314443CA65D" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil3B734CB42C99DCF0AC2CA3E00303E6A5" KeyPath="yes" Source="$(var.SBML2Ex)\samples\l2v1-units.xml" />
+            </Component>
+            <Component Id="cmpECE35BF34091426B35332DEB8E99802C" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filAE376B71651D8BB0CF59C70ACDBE3E07" KeyPath="yes" Source="$(var.SBML2Ex)\samples\Lac_v1.2.2.xml" />
+            </Component>
+            <Component Id="cmp61BF2AA9CAA4E52BFAD0AD4DC7623E9D" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filB03D724584660DBC7EDF69EBBB77754B" KeyPath="yes" Source="$(var.SBML2Ex)\samples\levelCheck.xml" />
+            </Component>
+            <Component Id="cmp2E03857F7D9D319E6DBEA72942209830" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filC4A98733F66568982035701B35B79EA7" KeyPath="yes" Source="$(var.SBML2Ex)\samples\NCAout-refv0.85.xml" />
+            </Component>
+            <Component Id="cmpC809DC4F543818D85BAD4624080B9E81" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil55A358F690979A3F344E881D07038140" KeyPath="yes" Source="$(var.SBML2Ex)\samples\ruleLabelRef.xml" />
+            </Component>
+            <Component Id="cmp899A537B786D68F6D6419E413F51A8CE" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil9CB17E480F8F461A98FD8C175BA37D02" KeyPath="yes" Source="$(var.SBML2Ex)\samples\ruleVariableRef.xml" />
+            </Component>
+            <Component Id="cmpC7D8965D61FBB53E19A7E51F3B8A2E82" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil4745C2BA1EE48DAE78C0C3EF018D8B21" KeyPath="yes" Source="$(var.SBML2Ex)\samples\test.xml" />
+            </Component>
+            <Component Id="cmpA49C9540FD249BBD6B5F52D0E19179B6" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil8A5131AD1CACBA7C4C29CF9276CDF234" KeyPath="yes" Source="$(var.SBML2Ex)\samples\test_SBML2Ex.xml" />
+            </Component>
+            <Component Id="cmpB4CCAD44356F68560E286EFA6D820BC2" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil6E99260FCB290434A90841C89ABA8CB2" KeyPath="yes" Source="$(var.SBML2Ex)\samples\triggerLabelRef.xml" />
+            </Component>
+            <Component Id="cmp1F3CE4413B37175DDA59811C00F8CC80" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil46EE3D61D01F786A21C040F87458A48F" KeyPath="yes" Source="$(var.SBML2Ex)\samples\uniqueRuleRef.xml" />
+            </Component>
+            <Component Id="cmpE3DB64ADF04FFEEA830C5687526171D7" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil117CCB4F0313C9DF74E3AE38D7123BFB" KeyPath="yes" Source="$(var.SBML2Ex)\samples\unitDefs.xml" />
+            </Component>
+            <Component Id="cmp05143E410A727FF585F022C69A3AC209" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="filAA2F60530BC171DB8CCD0F89A74E9BBC" KeyPath="yes" Source="$(var.SBML2Ex)\samples\validation_test_sbml.xml" />
+            </Component>
+            <Component Id="cmpFC4CC04F84BFED11207759C2FD3509A3" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil328D45333EE5D48A022E82F8490DA4F0" KeyPath="yes" Source="$(var.SBML2Ex)\samples\versionCheck.xml" />
+            </Component>
+            <Component Id="cmp43DA3BFCB1FA686103651D3935EC2959" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil9118E81418DA3307B25DF415751707D4" KeyPath="yes" Source="$(var.SBML2Ex)\samples\versionCheck_test.xml" />
+            </Component>
+            <Component Id="cmp3AA6A34FD73D4B216918450B0616AF81" Directory="dir3683F7580EA3EC6030A48FFE787BD379" Guid="*">
+                <File Id="fil3ECA80761200554C38BDED80AEA873A5" KeyPath="yes" Source="$(var.SBML2Ex)\samples\yeastnew2_core.xml" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir219518735E441AECFD42DEA7AF8D9B96" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir3683F7580EA3EC6030A48FFE787BD379" />
+    </Fragment>
+</Wix>
\ No newline at end of file

Added: UDM/trunk/WiX/Udm_SDK/UIntWizVS.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_SDK/UIntWizVS.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?define UIntWizVS=..\..\src\UIntWizVS?>
+<!-- generated with ../../../../Documents/META/deploy/gen_dir_wxi.py ../../src/UIntWizVS/ -->
+    <Fragment>
+        <DirectoryRef Id="UIntWizVS">
+            <Directory Id="dirC16E207D89DA407AFD38D9AA861BD40D" Name="1033" />
+            <Directory Id="dirDF52C26D4939CAECD0273E4CB7B13F74" Name="HTML" />
+            <Directory Id="dirECFEB7F62F71C6A35C7533381C41A5EE" Name="Images" />
+            <Directory Id="dir786918B26A4EE4279332F7B6DADAF9FF" Name="Scripts" />
+            <Directory Id="dir4F8B976F53E743CB390FF3E42C6DC476" Name="Templates" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="UIntWizVS">
+            <Component Id="cmpCC26FFDEF423CE0563AF7F6922EF5038" Directory="UIntWizVS" Guid="*">
+                <File Id="fil8EA1863D8DAA590E8B73C93A3A2FC77D" KeyPath="yes" Source="$(var.UIntWizVS)\default.vcproj" />
+            </Component>
+            <Component Id="cmpD221EA092661DEFB0997244281E27599" Directory="UIntWizVS" Guid="*">
+                <File Id="fil435BFE537115BF49C3354ED84F142666" KeyPath="yes" Source="$(var.UIntWizVS)\setup100.js" />
+            </Component>
+            <Component Id="cmp4EEB579E016BE563EBD24F1231349829" Directory="UIntWizVS" Guid="*">
+                <File Id="fil7182D75C7AEA424E7F3167C7913D425F" KeyPath="yes" Source="$(var.UIntWizVS)\setup90.js" />
+            </Component>
+            <Component Id="cmp495C25F5BEC7FCD7C1209B045CE3D0EA" Directory="UIntWizVS" Guid="*">
+                <File Id="fil5222D2C5E2468A0DC4F633A02608D0D7" KeyPath="yes" Source="$(var.UIntWizVS)\UDMInterpreter.ico" />
+            </Component>
+            <Component Id="cmp5C751AD3F9E29DE9B1D501DDFDCC87C5" Directory="UIntWizVS" Guid="*">
+                <File Id="fil5D28C834F5330D8A6014269A36FE19D5" KeyPath="yes" Source="$(var.UIntWizVS)\UDMInterpreter.vsz" />
+            </Component>
+            <Component Id="cmpAB4A6528986B0C2C8946493A9C5C80CA" Directory="UIntWizVS" Guid="*">
+                <File Id="filC90D8089DA8C554855511E4C7705BE31" KeyPath="yes" Source="$(var.UIntWizVS)\UDMInterpreterWizard.sln" />
+            </Component>
+            <Component Id="cmp3E081B4A1F05B91E52C7C0AD5ADFC406" Directory="UIntWizVS" Guid="*">
+                <File Id="filC5337BAB3546629A1A0C7A6D2C108183" KeyPath="yes" Source="$(var.UIntWizVS)\UDMInterpreterWizard.vcproj" />
+            </Component>
+            <Component Id="cmpDB0E494969C913A557109477A49CF7BA" Directory="UIntWizVS" Guid="*">
+                <File Id="fil668DCCE947EB30035A15ADD624D52394" KeyPath="yes" Source="$(var.UIntWizVS)\UDMInterpreterWizard.vsdir" />
+            </Component>
+            <Component Id="cmp80823CDA0D46C0BF7AA3453C1592F06C" Directory="dirC16E207D89DA407AFD38D9AA861BD40D" Guid="*">
+                <File Id="fil59547751C9D27B1EF7512CFC5A0CE383" KeyPath="yes" Source="$(var.UIntWizVS)\1033\UDMInterpreterWizard.css" />
+            </Component>
+            <Component Id="cmpADEB8A477F2EA3024128390C658B427D" Directory="dirAF1E0DC74DB11A287B7CB3B3FFF086AE" Guid="*">
+                <File Id="fil6538F1990C80C62D27A88DC72BB4689D" KeyPath="yes" Source="$(var.UIntWizVS)\1033\Images\DottedHori.gif" />
+            </Component>
+            <Component Id="cmpDC43755C27640525C523B3009660FEB4" Directory="dirAF1E0DC74DB11A287B7CB3B3FFF086AE" Guid="*">
+                <File Id="filF10B1541C89F5E340D7E5CA7E74507E7" KeyPath="yes" Source="$(var.UIntWizVS)\1033\Images\DottedVert.gif" />
+            </Component>
+            <Component Id="cmpF50D0FF05D0844ED297413668BEEEFDC" Directory="dirAF1E0DC74DB11A287B7CB3B3FFF086AE" Guid="*">
+                <File Id="fil88A89A7B3B76574FE7C8B5ACEC6A309D" KeyPath="yes" Source="$(var.UIntWizVS)\1033\Images\spacer.gif" />
+            </Component>
+            <Component Id="cmpDE5CB89E11A4291758161604436CDB24" Directory="dir140C57D27A5C8E39F62FF222E227F69D" Guid="*">
+                <File Id="filBFBBA5627D560A395B339070A7B74909" KeyPath="yes" Source="$(var.UIntWizVS)\HTML\1033\Advanced.htm" />
+            </Component>
+            <Component Id="cmpD613AF359FC9B492F694929905E2AEFE" Directory="dir140C57D27A5C8E39F62FF222E227F69D" Guid="*">
+                <File Id="filFA14826E23D4BF3A03C4C260026DF402" KeyPath="yes" Source="$(var.UIntWizVS)\HTML\1033\Basic.htm" />
+            </Component>
+            <Component Id="cmpFB2E353AB9649CA82413D95E6C961B4D" Directory="dir140C57D27A5C8E39F62FF222E227F69D" Guid="*">
+                <File Id="fil5B3C93535223EBBF16614271C0F55290" KeyPath="yes" Source="$(var.UIntWizVS)\HTML\1033\default.htm" />
+            </Component>
+            <Component Id="cmp2CB8D196F2BF2A5AD936C66D93E7DFC5" Directory="dir140C57D27A5C8E39F62FF222E227F69D" Guid="*">
+                <File Id="fil8948465C7C67FF5A9BEE5AB853A9EC24" KeyPath="yes" Source="$(var.UIntWizVS)\HTML\1033\Settings.htm" />
+            </Component>
+            <Component Id="cmp2D05B8C14FABD44E78CB0352A6B2F41B" Directory="dirECFEB7F62F71C6A35C7533381C41A5EE" Guid="*">
+                <File Id="fil5532450024611BD13D77EC4A34E3508E" KeyPath="yes" Source="$(var.UIntWizVS)\Images\UDMInterpreterWizard.gif" />
+            </Component>
+            <Component Id="cmpFD19BF5E7290827185CF196223961417" Directory="dirECFEB7F62F71C6A35C7533381C41A5EE" Guid="*">
+                <File Id="fil1C714833CD86B08A9C530AA8DC96F42B" KeyPath="yes" Source="$(var.UIntWizVS)\Images\UDMInterpreterWizard_Background.gif" />
+            </Component>
+            <Component Id="cmp64526E025FF8873E82099BBEE74ECC3C" Directory="dirC08F7B1CD5F44A3E760F5A9193CAA5DA" Guid="*">
+                <File Id="fil1828905511A6DE21AFA7A3B9C9B740B5" KeyPath="yes" Source="$(var.UIntWizVS)\Scripts\1033\default.js" />
+            </Component>
+            <Component Id="cmp19E9193DC27A79F72CAE8F20DD8D575D" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil6D4EDC84552A694AD82BDE1DB1FBE0C6" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\Common.inf" />
+            </Component>
+            <Component Id="cmpB4C2B59F6355F3620586A9548CF7C109" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="filE3C94961C37CCB49066B14FFECD56D22" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\CompIcon.ico" />
+            </Component>
+            <Component Id="cmpCE2748054C07A50B3EF04CE995D5E2B6" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="filCC62E5B0E74255E78724F11648AA725A" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\Component.def" />
+            </Component>
+            <Component Id="cmpFF11A79C23B305630E1B02B7A5518A2A" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil6BFF4FF8B8AFDB68E23B90922EA8EC24" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\Component.rc" />
+            </Component>
+            <Component Id="cmp11D8E277F21727D7911424DA1BFB778A" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil730D1D38B200C58ED36647A752BBE383" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\ComponentConfig.h" />
+            </Component>
+            <Component Id="cmp82F74E4C796B7B59E0F9763C7AD36075" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="filBBEC49215CA22ACDB7893AD8FA69E6E7" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\RawComponent.cpp" />
+            </Component>
+            <Component Id="cmp20AB924A2BE48BF66F286C11BB2980EB" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil1EF79DC842A4B2C62B36B17C1CF8F94D" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\RawComponent.h" />
+            </Component>
+            <Component Id="cmp3F9AF27494D53DB49E44798DDC0C5E57" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil945525EFD7CC5C179DB0C032102C8FA6" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\Resource.h" />
+            </Component>
+            <Component Id="cmp2C3557A21B378359DAECB181D8ED599B" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil4A1F497072A1C34E8E9020990B06CC18" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\StdAfx.cpp" />
+            </Component>
+            <Component Id="cmpD56B99372CC09E16BF755788401BCEA3" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="filBC9607D9F27834E93962D58DB52A6EF8" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\StdAfx.h" />
+            </Component>
+            <Component Id="cmp6377A0C4F5F12CD13FDDF352BB199197" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="filC95DDCAB12971149316DE7F6ED2F7F4E" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\string_utils.h" />
+            </Component>
+            <Component Id="cmpCEF128799B3CD93E11160BAF26000ED5" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil65DFB07FFFD5B5CB57CD7F7C0C25116B" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\Templates.inf" />
+            </Component>
+            <Component Id="cmpE0DC199E64A42F15615527C6453667F7" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil9B44167AF59AE539C35F56082D31CFC5" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\UdmApp.cpp" />
+            </Component>
+            <Component Id="cmp1A918526266D1FCFD310C0ED14A8C344" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="filDF9CAEE5B49439B486648F0ED1BA040F" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\UdmApp.h" />
+            </Component>
+            <Component Id="cmpF3E0EAF44DEEA319CD66A7B04EF9DBCB" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="filEC94D978841758E7CBF40F4E0958BB5F" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\UdmConfig.h" />
+            </Component>
+            <Component Id="cmp6DAA8A53C9D0C0BD08704233A4A24B35" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil536355D102E917DFE13E59C3189924A9" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\UdmConsole.cpp" />
+            </Component>
+            <Component Id="cmp06E031C94FB77230B78ED4970E445E78" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil49685B9344180FE518C42BB05FD6F61B" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\UdmConsole.h" />
+            </Component>
+            <Component Id="cmp31CE5E39EAA400515E19401E1F6AFEEF" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil49868DD5B0CDAFD0189258E05DE2FB01" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\UdmFormatter.cpp" />
+            </Component>
+            <Component Id="cmpE35CE5FE784328DE26DE75C094A46E14" Directory="dir4A3995E74FE8AC729741DD6890FEC1B3" Guid="*">
+                <File Id="fil80E16AD87BE338C0575AC554F93025C3" KeyPath="yes" Source="$(var.UIntWizVS)\Templates\1033\UdmFormatter.h" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir4A3995E74FE8AC729741DD6890FEC1B3" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dirECFEB7F62F71C6A35C7533381C41A5EE" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dirC08F7B1CD5F44A3E760F5A9193CAA5DA" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dirC16E207D89DA407AFD38D9AA861BD40D" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dirAF1E0DC74DB11A287B7CB3B3FFF086AE" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir140C57D27A5C8E39F62FF222E227F69D" />
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dirDF52C26D4939CAECD0273E4CB7B13F74">
+            <Directory Id="dir140C57D27A5C8E39F62FF222E227F69D" Name="1033" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir4F8B976F53E743CB390FF3E42C6DC476">
+            <Directory Id="dir4A3995E74FE8AC729741DD6890FEC1B3" Name="1033" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dirC16E207D89DA407AFD38D9AA861BD40D">
+            <Directory Id="dirAF1E0DC74DB11A287B7CB3B3FFF086AE" Name="Images" />
+        </DirectoryRef>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="dir786918B26A4EE4279332F7B6DADAF9FF">
+            <Directory Id="dirC08F7B1CD5F44A3E760F5A9193CAA5DA" Name="1033" />
+        </DirectoryRef>
+    </Fragment>
+</Wix>
\ No newline at end of file

Added: UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_SDK/Udm_SDK.wxs	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,151 @@
+<?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 ?>
+  <Module Id='Udm_SDK' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+
+    <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='$(var.ProgramFilesNativeFolder)'>
+        <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>
+
+    <?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>
+        <File Source="..\releaseinfo.txt" />
+      </Component>
+      <Component>
+        <File Source="..\license.txt" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="doc">
+      <Component>
+        <File Source="..\doc\UDMAPI.pdf" />
+      </Component>
+      <Component>
+        <File Source="..\doc\UdmInterpreterWizard.pdf" />
+      </Component>
+      <!-- TODO: javadoc judm\build\build_win\judm\apidoc -->
+    </DirectoryRef>
+
+    <DirectoryRef Id="etc">
+      <Component>
+        <File Source="..\etc\CreateUdmXml.vbs" />
+      </Component>
+      <Component>
+        <File Source="..\etc\compileUdmAPI.bat" />
+      </Component>
+      <Component>
+        <File Source="..\etc\CreateMGA.vbs" />
+      </Component>
+      <Component>
+        <File Source="..\etc\CreateXmp.vbs" />
+      </Component>
+      <Component>
+        <File Source="..\etc\Uml.xsd" />
+      </Component>
+      <Component>
+        <File Source="..\etc\UdmProject.xme" />
+      </Component>
+      <Component>
+        <File Source="..\etc\UdmProject_udm.xml" />
+      </Component>
+      <Component>
+        <File Source="..\etc\UdmProject.xsd" />
+      </Component>
+      <Component>
+        <File Source="..\etc\Uml.xml" />
+      </Component>
+      <Component>
+        <File Source="..\etc\Xme2UdmXml.bat" />
+      </Component>
+      <Component>
+        <File Source="..\etc\UmlInUml.xme" />
+      </Component>
+      <Component>
+        <File Source="..\etc\UmlMeta.xme" />
+      </Component>
+    </DirectoryRef>
+
+    <DirectoryRef Id="etc_Java">
+      <Component>
+        <File Source="..\etc\JAVA\judmAPI.bat" />
+      </Component>
+      <Component>
+        <File Source="..\etc\JAVA\.classpath" />
+      </Component>
+      <Component>
+        <File Source="..\etc\JAVA\.project" />
+      </Component>
+      <Component>
+        <File Source="..\etc\JAVA\build.xml" />
+      </Component>
+      <Component>
+        <File Source="..\etc\JAVA\eclipseAPI.bat" />
+      </Component>
+    </DirectoryRef>
+    <?endif?>
+
+    <DirectoryRef Id="lib">
+      <?if $(sys.BUILDARCH)=x86 ?>
+      <Component>
+        <File Source="..\Build\Win32\VC9\Release\UdmDll.lib" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC9\Debug\UdmDllD.lib" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\UdmDll_VS10.lib" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Debug\UdmDll_VS10D.lib" />
+      </Component>
+      <?else?>
+      <Component>
+        <File Source="..\Build\x64\VC10\Release\UdmDll_v100_x64.lib" />
+      </Component>
+      <!-- <Component>
+        <File Source="..\..\Build\x64\VC10\Debug\UdmDll_v100_x64D.lib" />
+      </Component> -->
+      <?endif?>
+    </DirectoryRef>
+
+  </Module>
+</Wix>

Added: UDM/trunk/WiX/Udm_SDK/include.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_SDK/include.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?define include=..\..\include?>
+<!-- generated with ../../../../Documents/META/deploy/gen_dir_wxi.py ../../include/ -->
+    <Fragment>
+        <DirectoryRef Id="include" />
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="include">
+            <Component Id="cmp2264B82A44F0A04D630E38121861F083" Directory="include" Guid="*">
+                <File Id="fil0CA9FD87616FFC2CB596E7E1B9B5A93B" KeyPath="yes" Source="$(var.include)\cint_string.h" />
+            </Component>
+            <Component Id="cmp5E0781E68EC00E6651F32533084289B4" Directory="include" Guid="*">
+                <File Id="filDF65A82E443C97D65806690AEA733F5A" KeyPath="yes" Source="$(var.include)\ErrHand.h" />
+            </Component>
+            <Component Id="cmpC09A6839759DE79FABE75857DF2B6933" Directory="include" Guid="*">
+                <File Id="filF8932AE03BD36A3669F7945EECC534BD" KeyPath="yes" Source="$(var.include)\Makefile.am" />
+            </Component>
+            <Component Id="cmpC3F6E3FABF4231384AFD6BAC3DC04FCE" Directory="include" Guid="*">
+                <File Id="fil7186D7BCFC27A2654698AB5966072146" KeyPath="yes" Source="$(var.include)\readme.txt" />
+            </Component>
+            <Component Id="cmpB67559FFDC4198F809027083E7C57226" Directory="include" Guid="*">
+                <File Id="filA0149958EC7481A5ED49F96CFE226046" KeyPath="yes" Source="$(var.include)\UdmBase.h" />
+            </Component>
+            <Component Id="cmpB3C52B88037DF74748A0C39B249480EB" Directory="include" Guid="*">
+                <File Id="filA3C7FBE3DD06903218613CE57760DB1B" KeyPath="yes" Source="$(var.include)\UdmCintSwig.h" />
+            </Component>
+            <Component Id="cmp28060717991A30FCA7243CA4D65BF3B2" Directory="include" Guid="*">
+                <File Id="fil6C6455D969830AB9BD94895BDEB6B1AD" KeyPath="yes" Source="$(var.include)\UdmDom.h" />
+            </Component>
+            <Component Id="cmp8B6E23324ED17403329926BC91AA4BBD" Directory="include" Guid="*">
+                <File Id="fil4A1F708F0BF013C7FE2C08915719B8CE" KeyPath="yes" Source="$(var.include)\UdmGme.h" />
+            </Component>
+            <Component Id="cmpE5749FF1CE48F200E796117D397C2031" Directory="include" Guid="*">
+                <File Id="fil3C6D5D91DCAF67B31555D1BE62EEE71A" KeyPath="yes" Source="$(var.include)\UdmMPL.h" />
+            </Component>
+            <Component Id="cmp14DA4A30A7482CC5614E0B3D46E03DA9" Directory="include" Guid="*">
+                <File Id="filA1C0574E864F1CEC44F0AE71A7572F78" KeyPath="yes" Source="$(var.include)\UdmOcl.h" />
+            </Component>
+            <Component Id="cmp34D232AFD8BAF17381D2A22DA23AAD47" Directory="include" Guid="*">
+                <File Id="filEA0954D56F952C24058EE35F854805A2" KeyPath="yes" Source="$(var.include)\UdmProject.h" />
+            </Component>
+            <Component Id="cmp85A325ACC52C0AF6F013A993E5207CD6" Directory="include" Guid="*">
+                <File Id="fil057596B86E5EC890D7D2FB94B100A5D1" KeyPath="yes" Source="$(var.include)\UdmStatic.h" />
+            </Component>
+            <Component Id="cmpE7E327435FB258F5E12DC60B07716D80" Directory="include" Guid="*">
+                <File Id="filD0DFC9F1C6FDFFEA552572588C686DDF" KeyPath="yes" Source="$(var.include)\UdmUtil.h" />
+            </Component>
+            <Component Id="cmpF99122177E37DDB32D3EB7B7B3CA9F76" Directory="include" Guid="*">
+                <File Id="fil9F712ED4A5ABA260675F9E1C0A0B1771" KeyPath="yes" Source="$(var.include)\UdmXmi.h" />
+            </Component>
+            <Component Id="cmp7A01CDD020E2CEF6C08C8B44903B11A0" Directory="include" Guid="*">
+                <File Id="fil2733EBCB5957875DB01EFB79B3C7117E" KeyPath="yes" Source="$(var.include)\Uml.h" />
+            </Component>
+            <Component Id="cmpE7890F8D3B879536BF56438D1AA91DDE" Directory="include" Guid="*">
+                <File Id="fil1C34AEC3EDC5C0E03203FB96F1EFAEE7" KeyPath="yes" Source="$(var.include)\UmlExt.h" />
+            </Component>
+            <Component Id="cmpF1FD72D8A6DC0EE759B27D6C3EFE1ECB" Directory="include" Guid="*">
+                <File Id="filDA823A7A192DF25011835B750376ECC5" KeyPath="yes" Source="$(var.include)\Uml_export.h" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
\ No newline at end of file

Added: UDM/trunk/WiX/Udm_SDK/test_UdmPython.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_SDK/test_UdmPython.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?define test_UdmPython=..\..\tests\test_UdmPython?>
+<!-- generated with ../../../../Documents/META/deploy/gen_dir_wxi.py ../../tests/test_UdmPython/ -->
+    <Fragment>
+        <DirectoryRef Id="test_UdmPython" />
+    </Fragment>
+    <Fragment>
+        <ComponentGroup Id="test_UdmPython">
+            <Component Id="cmpEFB76B307BEE8F26896A2640FF64CA85" Directory="test_UdmPython" Guid="*">
+                <File Id="fil794E6F4B98A91F1AC96DA7474370630D" KeyPath="yes" Source="$(var.test_UdmPython)\UdmPythonTestMeta.xme" />
+            </Component>
+            <Component Id="cmp0C8CA9DC841EED779906DCC49C9D018A" Directory="test_UdmPython" Guid="*">
+                <File Id="filC62CE6C8D2AEE344F929D788E145C35A" KeyPath="yes" Source="$(var.test_UdmPython)\UdmPythonTestMeta.xml" />
+            </Component>
+            <Component Id="cmpE2E025F172676CF58F35C6FAA6EC8A9E" Directory="test_UdmPython" Guid="*">
+                <File Id="fil2CCC1B5EC8B84112B2ABFA67A0BEE1E3" KeyPath="yes" Source="$(var.test_UdmPython)\UdmPythonTestMeta.xmp" />
+            </Component>
+            <Component Id="cmp2D501323DD3BA0753326BA48390493A3" Directory="test_UdmPython" Guid="*">
+                <File Id="filCC675C615A95F8FEA94DC1C316A3A4FD" KeyPath="yes" Source="$(var.test_UdmPython)\UdmPythonTestModel.xme" />
+            </Component>
+            <Component Id="cmp03CC4A079D4C0B389D20A53F65CDB6A5" Directory="test_UdmPython" Guid="*">
+                <File Id="fil13125BDE068AED4C1C62DE1AC4A196BA" KeyPath="yes" Source="$(var.test_UdmPython)\udm_python_test.py" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
\ No newline at end of file

Added: UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Fragment>
+  <DirectoryRef Id="bin" />
+</Fragment>
+<Fragment>
+<ComponentGroup Id="MetaGME2Uml">
+  <Component Id="MetaGME2Uml.dll" Directory="bin">
+    <File Source="$(var.GREAT_PATH)\bin\MetaGME2Uml.dll">
+      <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" />
+        </Class>
+      </TypeLib>
+    </File>
+    <RegistryKey Root='HKLM' Key='Software\GME\Components\MGA.Interpreter.MetaGME2Uml'>
+      <RegistryValue Name='Description' Type='string' Value='MetaGME2Uml'/>
+      <RegistryValue Name='Icon' Type='string' Value=',IDI_COMPICON'/>
+      <RegistryValue Name='Paradigm' Type='string' Value='MetaGME'/>
+      <RegistryValue Name='Tooltip' Type='string' Value='Converts GME metamodel to equivalent UML class diagram'/>
+      <RegistryValue Name='Type' Type='integer' Value='1'/>
+
+      <RegistryKey Key='Associated'>
+        <RegistryValue Name='MetaGME' Type='string' Value=''/>
+      </RegistryKey>
+
+    </RegistryKey>
+  </Component>
+</ComponentGroup>
+</Fragment>
+</Wix>

Added: UDM/trunk/WiX/Udm_bin/UML2XML.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_bin/UML2XML.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Fragment>
+  <DirectoryRef Id="bin" />
+</Fragment>
+<Fragment>
+<ComponentGroup Id="UML2XML">
+  <Component Id="UML2XML.dll" Directory="bin">
+    <File Source="..\Build\Win32\VC10\Release\UML2XML.dll">
+      <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" />
+        </Class>
+      </TypeLib>
+    </File>
+    <RegistryKey Root='HKLM' Key='Software\GME\Components\MGA.Interpreter.UML2XML'>
+      <RegistryValue Name='Description' Type='string' Value='UML2XML'/>
+      <RegistryValue Name='Icon' Type='string' Value=',IDI_COMPICON'/>
+      <RegistryValue Name='Paradigm' Type='string' Value='UML,UMLModelTransformer'/>
+      <RegistryValue Name='Tooltip' Type='string' Value='UML 2 UDM/XML Interpreter'/>
+      <RegistryValue Name='Type' Type='integer' Value='1'/>
+
+      <RegistryKey Key='Associated'>
+        <RegistryValue Name='UML' Type='string' Value=''/>
+        <RegistryValue Name='UMLModelTransformer' Type='string' Value=''/>
+      </RegistryKey>
+
+    </RegistryKey>
+  </Component>
+</ComponentGroup>
+</Fragment>
+</Wix>

Added: UDM/trunk/WiX/Udm_bin/UMLOCLExpressionChecker.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_bin/UMLOCLExpressionChecker.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Fragment>
+  <DirectoryRef Id="bin" />
+</Fragment>
+<Fragment>
+<ComponentGroup Id="UMLOCLExpressionChecker">
+  <Component Id="UMLOCLExpressionChecker.dll" Directory="bin">
+    <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">
+          <ProgId Id="MGA.AddOn.UMLOCLExpressionChecker" Description="MGA.AddOn.UMLOCLExpressionChecker" />
+        </Class>
+      </TypeLib>
+    </File>
+    <RegistryKey Root='HKLM' Key='Software\GME\Components\MGA.AddOn.UMLOCLExpressionChecker'>
+      <RegistryValue Name='Description' Type='string' Value='UMLOCLExpressionChecker'/>
+      <RegistryValue Name='Paradigm' Type='string' Value='UML'/>
+      <RegistryValue Name='Type' Type='integer' Value='2'/>
+
+      <RegistryKey Key='Associated'>
+        <RegistryValue Name='UML' Type='string' Value=''/>
+      </RegistryKey>
+
+    </RegistryKey>
+  </Component>
+</ComponentGroup>
+</Fragment>
+</Wix>

Added: UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,120 @@
+<?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 ?>
+
+  <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.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>
+
+    <DirectoryRef Id="bin">
+      <Component>
+        <File Source="$(var.UDM_3RDPARTY_PATH)\xalan-c_1_11_0\bin\Xalan-C_1_11.dll" />
+      </Component>
+      <Component>
+        <File Source="$(var.UDM_3RDPARTY_PATH)\xalan-c_1_11_0\bin\XalanMessages_1_11.dll" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC9\Debug\UdmDll_3_2D.dll" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Debug\UdmDll_3_2_VS10D.dll" />
+      </Component>
+
+      <?if $(sys.BUILDARCH)=x86 ?>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\Udm.exe" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\UdmCopy.exe" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\UdmBackendDump.exe" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\UdmOclPat.exe" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\UdmViz.exe" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\XmiToUdm.exe" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\UdmToXmi.exe" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC9\Release\UdmSwig.dll" />
+      </Component>
+      <Component>
+        <File Source="..\judm\build\build_win\judm\judm.jar" />
+      </Component>
+      <Component>
+        <File Source="..\bin\udm.py" />
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\UdmCli.dll" Assembly=".net"/>
+      </Component>
+      <Component>
+        <File Source="..\Build\Win32\VC10\Release\UdmCliBridge.dll" />
+      </Component>
+      <Component>
+        <File Source="..\src\UdmCliGen\dist\UdmCliGen.exe" />
+      </Component>
+      <Component>
+        <File Source="..\src\UdmCliGen\dist\python26.dll" />
+      </Component>
+      <?endif?>
+    </DirectoryRef>
+
+    <?if $(sys.BUILDARCH)=x86 ?>
+    <ComponentGroupRef Id="UMLOCLExpressionChecker"/>
+    <ComponentGroupRef Id="UML2XML"/>
+    <ComponentGroupRef Id="MetaGME2Uml"/>
+    <DirectoryRef Id="Python26">
+      <Component>
+        <File Source="..\bin\Python26\udm.pyd" />
+      </Component>
+      <Component>
+        <File Source="..\bin\Python26\__init__.py" />
+      </Component>
+      <Component>
+        <File Source="..\bin\Python26\boost_python-vc100-mt-1_44.dll" />
+      </Component>
+
+    </DirectoryRef>
+    <DirectoryRef Id="Python27">
+      <Component>
+        <File Source="..\bin\Python27\udm.pyd" Id="udm.pyd27"/>
+      </Component>
+      <Component>
+        <File Source="..\bin\Python27\__init__.py" Id="initpy27"/>
+      </Component>
+      <Component>
+        <File Source="..\bin\Python27\boost_python-vc100-mt-1_44.dll" Id="boost_python_vc100_mt_1_44.dll27"/>
+      </Component>
+    </DirectoryRef>
+    <?endif?>
+
+  </Module>
+</Wix>

Added: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/Udm_inc.wxi	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='windows-1252'?>
+
+<?define VERSIONSTR=3.2.9?>
+<Include>
+  <?if $(sys.BUILDARCH)=x64 ?>
+  <?define UpgradeCode='11CB0ED6-A45B-49FA-ABB2-A718EB5C970D'?>
+  <?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 ProgramFilesNativeFolder='ProgramFiles64Folder'?>
+  <?define SystemFolderNative='System64Folder'?>
+  <?define Win64='yes'?>
+  <?define ProductName='Udm (64 bit)'?>
+  <?define Release='x64\Release'?>
+  <?define lib='lib\x64'?>
+  <?define bin='bin\x64'?>
+  <?define Build='..\Build\x64\'?>
+  <?define UdmDllVC10=UdmDll_3_2_v100_x64.dll?>
+  <?define XercesC=xerces-c_2_8_x64.dll?>
+  <?else ?>
+  <?define UpgradeCode='D656A56A-F239-4B35-865C-840B1EA235E0'?>
+  <?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 ProgramFilesNativeFolder='ProgramFilesFolder'?>
+  <?define SystemFolderNative='SystemFolder'?>
+  <?define Win64='no'?>
+  <?define ProductName='Udm'?>
+  <?define Release='Release'?>
+  <?define lib='lib'?>
+  <?define bin='bin'?>
+  <?define Build='..\Build\Win32\'?>
+  <?define UdmDllVC10=UdmDll_3_2_VS10.dll?>
+  <?define XercesC=xerces-c_2_8.dll?>
+  <?endif ?>
+</Include>

Added: UDM/trunk/WiX/build_msi.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/build_msi.py	Thu Nov 17 17:46:03 2011	(r3941)
@@ -0,0 +1,107 @@
+#!python -u
+
+import sys
+import os
+import os.path
+import win32com.client
+
+prefs = { 'verbose': True }
+
+os.environ['PATH'] = os.environ['PATH'].replace('"', '')
+
+def add_wix_to_path():
+    import _winreg
+    for wix_ver in ('3.5', '3.6'):
+        try:
+            with _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Microsoft\\Windows Installer XML\\' + wix_ver) as wixkey:
+                os.environ['PATH'] = _winreg.QueryValueEx(wixkey, 'InstallRoot')[0] + ';' + os.environ['PATH']
+        except Exception as e:
+            pass
+
+def system(args, dirname=None):
+    """
+    Executes a system command (throws an exception on error)
+    params
+        args : [command, arg1, arg2, ...]
+        dirname : if set, execute the command within this directory
+    """
+    import subprocess
+    # print args
+    with open(os.devnull, "w") as nulfp:
+        # n.b. stderr=subprocess.STDOUT fails mysteriously
+        import sys
+        subprocess.check_call(args, stdout=(sys.stdout if prefs['verbose'] else nulfp), stderr=subprocess.STDOUT, shell=False, cwd=dirname)
+
+def adjacent_file(file):
+    return os.path.join(os.path.dirname(__file__), file)
+
+def build(sourcedir, arch, msi=False):
+    def get_wixobj(file):
+        return os.path.splitext(file)[0] + ".wixobj"
+
+    def get_svnversion():
+        import subprocess
+        p = subprocess.Popen(['svnversion', '-n', adjacent_file('..')], stdout=subprocess.PIPE)
+        out, err = p.communicate()
+        if p.returncode:
+            raise subprocess.CalledProcessError(p.returncode, 'svnversion')
+        if 'M' in out:
+            return '1'
+            # out = out.replace('M', '')
+        # this will crash for switched or sparse checkouts
+        return int(out)
+
+    #print get_svnversion()
+    sourcedir = adjacent_file(('' if sourcedir == '' else sourcedir + "\\"))
+    import glob
+    sources = glob.glob(sourcedir + '*.wxi') + glob.glob(sourcedir + '*.wxs')
+    if 'Udm_inc.wxi' in sources:
+        sources.remove('Udm_inc.wxi')
+
+    defines = [('UDM_3RDPARTY_PATH',  os.environ['UDM_3RDPARTY_PATH']),
+               ('GREAT_PATH',  os.environ['GREAT_PATH'])]
+
+    for source in sources:
+        #arch = [ '-arch', ('x86' if source.find('x64') == -1 else 'x64') ]
+        system(['candle', '-nologo'] + ['-d' + d[0] + '=' + d[1] for d in defines ] + ['-arch', arch] + ['-out', get_wixobj(source), source])
+
+    #ignore warning 1055, ICE82 from VC9 merge modules
+    if msi:
+        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 ])
+    else:
+        mm_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 ])
+
+if __name__=='__main__':
+    from optparse import OptionParser
+    parser = OptionParser()
+    parser.add_option('-a', '--arch', dest='arch')
+    parser.add_option('-m', '--msi', dest='msi', action='store_true')
+    options, args = parser.parse_args()
+
+    add_wix_to_path()
+
+    if not options.arch:
+        arches = ['x86', 'x64']
+    else:
+        arches = [ options.arch ]
+    
+    files = args
+    if len(files) == 0 and not options.msi:
+        import glob
+        import os.path
+        files = [os.path.dirname(wxs) for wxs in glob.glob(os.path.join(os.path.dirname(__file__ ), '*/*.wxs'))]
+    for file in files:
+        for arch in arches:
+            print 'Building ' + file + ' ' + arch
+            build(file, arch)
+
+    if options.msi or len(args) == 0:
+        for arch in arches:
+            if options.msi == 0 or len(args) == 0:
+                print 'Building msi ' + arch
+                build('', arch, True)


More information about the Mobies-commit mailing list