[Mobies-commit] [commit] r4354 - in UDM/trunk/WiX: . UdmDll_VC12 UdmSDK_VC12

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Mon Jan  5 10:19:03 2015
New Revision: 4354

Log:
UdmDll vc12 in installer

Added:
   UDM/trunk/WiX/UdmDll_VC12/
   UDM/trunk/WiX/UdmDll_VC12/UdmDll_VC12.wxs
   UDM/trunk/WiX/UdmSDK_VC12/
   UDM/trunk/WiX/UdmSDK_VC12/UdmSDK_VC12.wxs
Modified:
   UDM/trunk/WiX/Udm_inc.wxi

Added: UDM/trunk/WiX/UdmDll_VC12/UdmDll_VC12.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/UdmDll_VC12/UdmDll_VC12.wxs	Mon Jan  5 10:19:03 2015	(r4354)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='windows-1252'?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
+
+  <?include ..\Udm_inc.wxi?>
+
+  <Fragment>
+    <DirectoryRef Id='$(var.SystemFolderNative)'/>
+    <ComponentGroup Id='UdmDll_VC12$(sys.BUILDARCH)'>
+        <Component Id='UdmDllVC12$(sys.BUILDARCH)' Directory='$(var.SystemFolderNative)'>
+          <File Source='$(var.Build)v120\Release\$(var.UdmDllVC12)' />
+        </Component>
+    </ComponentGroup>
+
+  </Fragment>
+</Wix>

Added: UDM/trunk/WiX/UdmSDK_VC12/UdmSDK_VC12.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/UdmSDK_VC12/UdmSDK_VC12.wxs	Mon Jan  5 10:19:03 2015	(r4354)
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='windows-1252'?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
+
+  <?include ..\Udm_inc.wxi ?>
+  <Fragment>
+    <DirectoryRef Id='bin$(sys.BUILDARCH)'/>
+    <DirectoryRef Id='lib$(sys.BUILDARCH)'/>
+
+    <ComponentGroup Id='UdmSDK_VC12$(sys.BUILDARCH)'>
+      <?if $(sys.BUILDARCH)=x86 ?>
+      <Component Id='UdmDll_v120_Win32.lib' Directory='lib$(sys.BUILDARCH)'>
+        <File Source="..\Build\Win32\v120\Release\UdmDll_v120_Win32.lib" />
+      </Component>
+      <Component Id='UdmDll_v120_Win32D.lib' Directory='lib$(sys.BUILDARCH)'>
+        <File Source="..\Build\Win32\v120\Debug\UdmDll_v120_Win32D.lib" />
+      </Component>
+      <?else?>
+      <Component Id='UdmDll_v120_x64.lib' Directory='libx86' Win64='no'>
+        <File Source="..\Build\x64\v120\Release\UdmDll_v120_x64.lib" />
+      </Component>
+      <Component Id='UdmDll_v120_x64D.lib' Directory='libx86' Win64='no'>
+        <File Source="..\Build\x64\v120\Debug\UdmDll_v120_x64D.lib" />
+      </Component>
+      <?endif?>
+
+      <?if $(sys.BUILDARCH)=x86 ?>
+      <Component Id='UdmDll_3_2_v120_Win32D.dll' Directory='bin$(sys.BUILDARCH)'>
+        <File Source="..\Build\Win32\v120\Debug\UdmDll_3_2_v120_Win32D.dll" />
+      </Component>
+      <?else?>
+      <Component Id='UdmDll_3_2_v120_x64D.dll' Directory='bin$(sys.BUILDARCH)'>
+        <File Source="..\Build\x64\v120\Debug\UdmDll_3_2_v120_x64D.dll" />
+      </Component>
+      <?endif?>
+    </ComponentGroup>
+  </Fragment>
+</Wix>

Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi	Wed Dec 31 09:26:59 2014	(r4353)
+++ UDM/trunk/WiX/Udm_inc.wxi	Mon Jan  5 10:19:03 2015	(r4354)
@@ -16,6 +16,8 @@
   <?define UdmDllVC10=UdmDll_3_2_v100_x64.dll?>
   <?define UdmDllVC11=UdmDll_3_2_v110_x64.dll?>
   <?define UdmDllVC11_Guid='6D4CBBFD-64C3-4E60-AFA6-357B08EFFC17'?>
+  <?define UdmDllVC12=UdmDll_3_2_v120_x64.dll?>
+  <?define UdmDllVC12_Guid='2F2E2D5B-E926-452E-B57C-8ACDED7452F2'?>
   <?define XercesC=xerces-c_2_8_x64.dll?>
   <?define Great_bin=$(var.GREAT_PATH)\bin\x64?>
   <?else ?>
@@ -32,6 +34,8 @@
   <?define UdmDllVC10=UdmDll_3_2_VS10.dll?>
   <?define UdmDllVC11=UdmDll_3_2_v110_Win32.dll?>
   <?define UdmDllVC11_Guid='F5C3661A-80D5-4888-8BAD-F25F8D3A5125'?>
+  <?define UdmDllVC12=UdmDll_3_2_v120_Win32.dll?>
+  <?define UdmDllVC12_Guid='649B8429-62C0-416C-B932-0211592A1572'?>
   <?define XercesC=xerces-c_2_8.dll?>
   <?define Great_bin=$(var.GREAT_PATH)\bin?>
   <?endif ?>