[Mobies-commit] [commit] r4173 - in UDM/trunk: Projects/Win32/VC10/src/UdmDll WiX WiX/UdmDll_VC11 WiX/UdmSDK_VC11 include

Fri Jul 5 11:38:32 CDT 2013

Author: ksmyth
Date: Fri Jul  5 11:38:32 2013
New Revision: 4173

Log:
VC11 support

Added:
   UDM/trunk/WiX/UdmDll_VC11/
   UDM/trunk/WiX/UdmDll_VC11/UdmDll_VC11.wxs
   UDM/trunk/WiX/UdmSDK_VC11/
   UDM/trunk/WiX/UdmSDK_VC11/UdmSDK_VC11.wxs
Modified:
   UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj
   UDM/trunk/WiX/Udm_inc.wxi
   UDM/trunk/include/ErrHand.h

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj
==============================================================================

--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj	Fri Jul  5 10:34:24 2013	(r4172)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDllv110.vcxproj	Fri Jul  5 11:38:32 2013	(r4173)
@@ -88,9 +88,9 @@
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UdmDll_3_2_VS10D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UdmDll_3_2_$(PlatformToolset)_$(Platform)D</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UdmDll_3_2_$(PlatformToolset)_$(Platform)D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UdmDll_3_2_VS10</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UdmDll_3_2_$(PlatformToolset)_$(Platform)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UdmDll_3_2_$(PlatformToolset)_$(Platform)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
@@ -142,6 +142,7 @@
       </DataExecutionPrevention>
       <ImportLibrary>$(OutDir)UdmDll_$(PlatformToolset)_$(Platform).lib</ImportLibrary>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <DelayLoadDLLs>Xalan-c_1_11.dll</DelayLoadDLLs>
     </Link>
     <PostBuildEvent />
     <CustomBuildStep>

Added: UDM/trunk/WiX/UdmDll_VC11/UdmDll_VC11.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/UdmDll_VC11/UdmDll_VC11.wxs	Fri Jul  5 11:38:32 2013	(r4173)
@@ -0,0 +1,22 @@
+<?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_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)'>
+          <File Source='$(var.Build)v110\Release\$(var.UdmDllVC11)' />
+        </Component>
+      </Directory>
+    </Directory>
+
+  </Module>
+</Wix>

Added: UDM/trunk/WiX/UdmSDK_VC11/UdmSDK_VC11.wxs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/WiX/UdmSDK_VC11/UdmSDK_VC11.wxs	Fri Jul  5 11:38:32 2013	(r4173)
@@ -0,0 +1,56 @@
+<?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='UdmSDK_VC11' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+
+    <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">
+      <?if $(sys.BUILDARCH)=x86 ?>
+      <Component Id='UdmDll_v110_Win32.lib' Guid='1F03A6E0-CEA0-46B1-AE20-5BA5C6085BDE'>
+        <File Source="..\Build\Win32\v110\Release\UdmDll_v110_Win32.lib" />
+      </Component>
+      <Component Id='UdmDll_v110_Win32D.lib' Guid='7972E73A-959C-4D06-8B55-96472AD3F2CD'>
+        <File Source="..\Build\Win32\v110\Debug\UdmDll_v110_Win32D.lib" />
+      </Component>
+      <?else?>
+      <Component Id='UdmDll_v110_x64.lib' Guid='80BAA333-6817-4C22-9F69-5752B0AE6BDB'>
+        <File Source="..\Build\x64\v110\Release\UdmDll_v110_x64.lib" />
+      </Component>
+      <Component Id='UdmDll_v110_x64D.lib' Guid='4414035E-BC87-428D-A8F4-92F0A9B87E58'>
+        <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'>
+        <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'>
+        <File Source="..\Build\x64\v110\Debug\UdmDll_3_2_v110_x64D.dll" />
+      </Component>
+      <?endif?>
+    </DirectoryRef>
+    
+
+  </Module>
+</Wix>

Modified: UDM/trunk/WiX/Udm_inc.wxi
==============================================================================
--- UDM/trunk/WiX/Udm_inc.wxi	Fri Jul  5 10:34:24 2013	(r4172)
+++ UDM/trunk/WiX/Udm_inc.wxi	Fri Jul  5 11:38:32 2013	(r4173)
@@ -5,8 +5,10 @@
   <?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'?>
@@ -17,13 +19,17 @@
   <?define bin='bin\x64'?>
   <?define Build='..\Build\x64\'?>
   <?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 XercesC=xerces-c_2_8_x64.dll?>
   <?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'?>
@@ -34,6 +40,8 @@
   <?define bin='bin'?>
   <?define Build='..\Build\Win32\'?>
   <?define UdmDllVC10=UdmDll_3_2_VS10.dll?>
+  <?define UdmDllVC11=UdmDll_3_2_v110_Win32.dll?>
+  <?define UdmDllVC11_Guid='F5C3661A-80D5-4888-8BAD-F25F8D3A5125'?>
   <?define XercesC=xerces-c_2_8.dll?>
   <?define Great_bin=$(var.GREAT_PATH)\bin?>
   <?endif ?>

Modified: UDM/trunk/include/ErrHand.h
==============================================================================
--- UDM/trunk/include/ErrHand.h	Fri Jul  5 10:34:24 2013	(r4172)
+++ UDM/trunk/include/ErrHand.h	Fri Jul  5 11:38:32 2013	(r4173)
@@ -40,7 +40,23 @@
 #ifndef _DLL
 #pragma message("Warning: Udm clients should be compiled under /MD or /MDd")
 #endif
-#if (_MSC_VER == 1600) /* VS2010 */
+#if (_MSC_VER == 1700) /* VS2012 VC11 */
+#define UDM_NAMESPACE Udm_VC11
+namespace UDM_NAMESPACE {};
+namespace Udm = UDM_NAMESPACE;
+#define UDM_PLATFORM_TOOLSET "v110"
+#ifdef _DEBUG
+#define UDM_DEBUG "D"
+#else
+#define UDM_DEBUG ""
+#endif
+#if defined(_M_AMD64)
+#define UDM_PLATFORM "x64"
+#else
+#define UDM_PLATFORM "Win32"
+#endif
+#define UDM_DLL_LIB "UdmDll_" UDM_PLATFORM_TOOLSET "_" UDM_PLATFORM UDM_DEBUG ".lib"
+#elif (_MSC_VER == 1600) /* VS2010 */
 #define UDM_NAMESPACE Udm_VS10
 namespace UDM_NAMESPACE {};
 namespace Udm = UDM_NAMESPACE;
