[Mobies-commit] [commit] r4311 - in UDM/trunk: . Projects/Win32/VC10/src/UdmDll include

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Jul 22 09:50:10 2014
New Revision: 4311

Log:
Support for compiling UdmDll with VC13 express

Modified:
   UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
   UDM/trunk/include/ErrHand.h
   UDM/trunk/make.msbuild

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc	Wed Jul  9 13:37:16 2014	(r4310)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmDll/UdmDll.rc	Tue Jul 22 09:50:10 2014	(r4311)
@@ -1,15 +1,4 @@
-// Microsoft Visual C++ generated resource script.
-//
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
+#include "WinNT.rh"
 
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
@@ -20,33 +9,12 @@
 #pragma code_page(1252)
 #endif //_WIN32
 
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
-VS_VERSION_INFO VERSIONINFO
+1 VERSIONINFO
  FILEVERSION 3,2,13,0
  PRODUCTVERSION 3,2,13
  FILEFLAGSMASK 0x17L
@@ -80,17 +48,4 @@
 END
 
 #endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
 

Modified: UDM/trunk/include/ErrHand.h
==============================================================================
--- UDM/trunk/include/ErrHand.h	Wed Jul  9 13:37:16 2014	(r4310)
+++ UDM/trunk/include/ErrHand.h	Tue Jul 22 09:50:10 2014	(r4311)
@@ -45,11 +45,17 @@
 #ifndef _DLL
 #pragma message("Warning: Udm clients should be compiled under /MD or /MDd")
 #endif
-#if (_MSC_VER == 1700) /* VS2012 VC11 */
+#if (_MSC_VER == 1800) /* VS2013 VC12 */
+#define UDM_NAMESPACE Udm_VC12
+#define UDM_PLATFORM_TOOLSET "v120"
+#elif (_MSC_VER == 1700) /* VS2012 VC11 */
 #define UDM_NAMESPACE Udm_VC11
+#define UDM_PLATFORM_TOOLSET "v110"
+#endif
+
+#if (_MSC_VER == 1700) /* VS2012 VC11 */ || (_MSC_VER == 1800) /* VS2013 VC12 */
 namespace UDM_NAMESPACE {};
 namespace Udm = UDM_NAMESPACE;
-#define UDM_PLATFORM_TOOLSET "v110"
 #ifdef _DEBUG
 #define UDM_DEBUG "D"
 #else

Modified: UDM/trunk/make.msbuild
==============================================================================
--- UDM/trunk/make.msbuild	Wed Jul  9 13:37:16 2014	(r4310)
+++ UDM/trunk/make.msbuild	Tue Jul 22 09:50:10 2014	(r4311)
@@ -7,8 +7,6 @@
 
   <Target Name="CheckEnv" DependsOnTargets="CheckEnvGme;CheckEnvUdm">
     <Error Text="UDM_3RDPARTY_PATH='$(UDM_3RDPARTY_PATH)' doesn't exist" Condition="!Exists('$(UDM_3RDPARTY_PATH)')"/>
-    <Error Text="JAVA_HOME='$(JAVA_HOME)' doesn't exist" Condition="!Exists('$(JAVA_HOME)')"/>
-    <Error Text="JAVA_HOME='$(JAVA_HOME)' doesn't point to a JDK" Condition="!Exists('$(JAVA_HOME)\include\jni.h')"/>
   </Target>
 
   <ItemGroup>
@@ -27,6 +25,8 @@
   </Target>
 
   <Target Name="BuildVS10" DependsOnTargets="CheckEnv">
+    <Error Text="JAVA_HOME='$(JAVA_HOME)' doesn't exist" Condition="!Exists('$(JAVA_HOME)')"/>
+    <Error Text="JAVA_HOME='$(JAVA_HOME)' doesn't point to a JDK" Condition="!Exists('$(JAVA_HOME)\include\jni.h')"/>
     <MSBuild Projects="Projects\Win32\VC10\src\Udm.sln" Targets="UdmDll" Properties="Configuration=Debug" />
     <MSBuild Projects="Projects\Win32\VC10\src\Udm.sln" Targets="Build" Properties="Configuration=Release" />
     <MSBuild Projects="Projects\Win32\VC10\src\UdmCli.sln" Targets="Build" Properties="Configuration=Release" />
@@ -52,6 +52,15 @@
     <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="VisualStudioVersion=11.0;PlatformToolset=v110;Configuration=Debug;Platform=x64" />
     <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="VisualStudioVersion=11.0;PlatformToolset=v110;Configuration=Release;Platform=x64" />
   </Target>
+  <Target Name="BuildVS12" DependsOnTargets="CheckEnv">
+    <!-- invoke: msbuild make.msbuild  /t:BuildVS12;BuildVS12_x64 /p:"VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120" -->
+    <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v120;Configuration=Debug" />
+    <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v120;Configuration=Release" />
+  </Target>
+  <Target Name="BuildVS12_x64" DependsOnTargets="CheckEnv">
+    <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v120;Configuration=Debug;Platform=x64" />
+    <MSBuild Projects="Projects\Win32\VC10\src\Udmv110.sln" Targets="Build" Properties="PlatformToolset=v120;Configuration=Release;Platform=x64" />
+  </Target>
 
   <Target Name="UdmCliGen" DependsOnTargets="CheckEnv">
     <MSBuild Projects="src\UdmCliGen\make.msbuild"/>