[Mobies-commit] [commit] r4016 - in UDM/trunk/WiX: . Udm_bin

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Mar 20 11:58:33 2012
New Revision: 4016

Log:
x64 UML2XML and MetaGME2UML

Modified:
   UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi
   UDM/trunk/WiX/Udm_bin/UML2XML.wxi
   UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
   UDM/trunk/WiX/Udm_inc.wxi

Modified: UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi	Tue Mar 20 11:58:19 2012	(r4015)
+++ UDM/trunk/WiX/Udm_bin/MetaGME2Uml.wxi	Tue Mar 20 11:58:33 2012	(r4016)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?include ..\Udm_inc.wxi ?>
 <Fragment>
   <DirectoryRef Id="bin" />
 </Fragment>
 <Fragment>
 <ComponentGroup Id="MetaGME2Uml">
   <Component Id="MetaGME2Uml.dll" Directory="bin">
-    <File Source="$(var.GREAT_PATH)\bin\MetaGME2Uml.dll">
+    <File Source="$(var.Great_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" />

Modified: UDM/trunk/WiX/Udm_bin/UML2XML.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_bin/UML2XML.wxi	Tue Mar 20 11:58:19 2012	(r4015)
+++ UDM/trunk/WiX/Udm_bin/UML2XML.wxi	Tue Mar 20 11:58:33 2012	(r4016)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<?include ..\Udm_inc.wxi ?>
 <Fragment>
   <DirectoryRef Id="bin" />
 </Fragment>
 <Fragment>
 <ComponentGroup Id="UML2XML">
   <Component Id="UML2XML.dll" Directory="bin">
-    <File Source="..\Build\Win32\VC10\Release\UML2XML.dll">
+    <File Source="$(var.Build)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" />

Modified: UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Tue Mar 20 11:58:19 2012	(r4015)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs	Tue Mar 20 11:58:33 2012	(r4016)
@@ -112,10 +112,10 @@
       <?endif?>
     </DirectoryRef>
 
+    <ComponentGroupRef Id="MetaGME2Uml"/>
+    <ComponentGroupRef Id="UML2XML"/>
     <?if $(sys.BUILDARCH)=x86 ?>
     <ComponentGroupRef Id="UMLOCLExpressionChecker"/>
-    <ComponentGroupRef Id="UML2XML"/>
-    <ComponentGroupRef Id="MetaGME2Uml"/>
     <DirectoryRef Id="Python26">
       <Component>
         <File Source="..\bin\Python26\udm.pyd" />

Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi	Tue Mar 20 11:58:19 2012	(r4015)
+++ UDM/trunk/WiX/Udm_inc.wxi	Tue Mar 20 11:58:33 2012	(r4016)
@@ -18,6 +18,7 @@
   <?define Build='..\Build\x64\'?>
   <?define UdmDllVC10=UdmDll_3_2_v100_x64.dll?>
   <?define XercesC=xerces-c_2_8_x64.dll?>
+  <?define Great_bin=$(var.GREAT_PATH)\bin?>
   <?else ?>
   <?define UpgradeCode='D656A56A-F239-4B35-865C-840B1EA235E0'?>
   <?define UdmDll_VS10_Package_Id='8A4C258E-953D-402B-9B16-5706B1A8CF56'?>
@@ -34,5 +35,6 @@
   <?define Build='..\Build\Win32\'?>
   <?define UdmDllVC10=UdmDll_3_2_VS10.dll?>
   <?define XercesC=xerces-c_2_8.dll?>
+  <?define Great_bin=$(var.GREAT_PATH)\bin?>
   <?endif ?>
 </Include>