[Mobies-commit] [commit] r4255 - in UDM/trunk: Projects/Win32/VC10/src/GmeOclExprChecker Projects/Win32/VC10/src/Udm include

ksmyth at redhat3.isis.vanderbilt.edu ksmyth at redhat3.isis.vanderbilt.edu
Tue Mar 4 15:34:47 CST 2014 

Author: ksmyth
Date: Tue Mar  4 15:34:47 2014
New Revision: 4255

Log:
check _ITERATOR_DEBUG_LEVEL. UDM_RVALUE for VS2012. Default to UDM_NO_DYNAMIC_LINKING. Udm.exe and GmeOclExprChecker.dll: use UdmDll

Modified:
   UDM/trunk/Projects/Win32/VC10/src/GmeOclExprChecker/GmeOclExprChecker.vcxproj
   UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj
   UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj.filters
   UDM/trunk/include/ErrHand.h
   UDM/trunk/include/UdmBase.h

Modified: UDM/trunk/Projects/Win32/VC10/src/GmeOclExprChecker/GmeOclExprChecker.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/GmeOclExprChecker/GmeOclExprChecker.vcxproj	Tue Mar  4 14:12:42 2014	(r4254)
+++ UDM/trunk/Projects/Win32/VC10/src/GmeOclExprChecker/GmeOclExprChecker.vcxproj	Tue Mar  4 15:34:47 2014	(r4255)
@@ -116,7 +116,7 @@
       <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ANTLRD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(UDM_PATH)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>..\..\..\..\..\src\UML GME\ExprChecker\GmeOclExprChecker.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -172,7 +172,7 @@
       <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ANTLRD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(UDM_PATH)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>..\..\..\..\..\src\UML GME\ExprChecker\GmeOclExprChecker.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -228,7 +228,7 @@
       <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ANTLR.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(UDM_PATH)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>nafxcw.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>..\..\..\..\..\src\UML GME\ExprChecker\GmeOclExprChecker.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -285,7 +285,7 @@
       <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ANTLR.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);$(UDM_PATH)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>nafxcw.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>..\..\..\..\..\src\UML GME\ExprChecker\GmeOclExprChecker.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -372,6 +372,9 @@
     <ClInclude Include="..\..\..\..\..\src\UML GME\ExprChecker\UMLTypeEx.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\UdmDll\UdmDll.vcxproj">
+      <Project>{3cae3dee-065e-426c-9c3c-f1f59217c00b}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\UdmOclPat\GOCL\src\GOCL.vcxproj">
       <Project>{ee407066-7819-4ae2-b0f5-e64fc5e54415}</Project>
       <Private>true</Private>

Modified: UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj	Tue Mar  4 14:12:42 2014	(r4254)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj	Tue Mar  4 15:34:47 2014	(r4255)
@@ -116,7 +116,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>xerces-c_2.lib;zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -163,7 +163,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>xerces-c_2_x64.lib;zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\zlib-1.2.5\contrib\vstudio\vc10\x64\ZlibDllRelease;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -209,7 +209,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>xerces-c_2.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -254,7 +254,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>xerces-c_2_x64.lib;zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\zlib-1.2.5\contrib\vstudio\vc10\x64\ZlibDllRelease;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -267,6 +267,7 @@
     <PostBuildEvent />
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\..\src\UdmBase\DTDGen.cpp" />
     <ClCompile Include="..\..\..\..\..\src\Udm\ClassGen.cpp" />
     <ClCompile Include="..\..\..\..\..\src\Udm\DiagramGen.cpp" />
     <ClCompile Include="..\..\..\..\..\src\Udm\NamespaceGen.cpp" />
@@ -309,25 +310,8 @@
     <ClInclude Include="..\..\..\..\..\src\Udm\Udm.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\UdmBase\UdmBase.vcxproj">
-      <Project>{30c55da9-9cba-4d6c-bbbd-c7e8823a027d}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\UdmDom\UdmDom.vcxproj">
-      <Project>{9a094c52-e029-4333-ac60-580b9b928e4e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\UdmGme\UdmGme.vcxproj">
-      <Project>{0763153d-e646-403a-93b7-6033b1d13a0c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\UdmUtil\UdmUtil.vcxproj">
-      <Project>{e663042b-f135-4502-b7a1-d62f21126e3b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\Uml\Uml.vcxproj">
-      <Project>{6a53e343-14c2-4463-a9c8-332dae560eaf}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    <ProjectReference Include="..\UdmDll\UdmDll.vcxproj">
+      <Project>{3cae3dee-065e-426c-9c3c-f1f59217c00b}</Project>
     </ProjectReference>
     <ProjectReference Include="File2Code\File2Code.vcxproj">
       <Project>{51a35fc8-1d28-4b8a-9592-ce334ffa7539}</Project>

Modified: UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj.filters	Tue Mar  4 14:12:42 2014	(r4254)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm/Udm.vcxproj.filters	Tue Mar  4 15:34:47 2014	(r4255)
@@ -32,6 +32,9 @@
     <ClCompile Include="..\..\..\..\..\src\Udm\UdmUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\..\src\UdmBase\DTDGen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\..\src\Udm\Udm.h">

Modified: UDM/trunk/include/ErrHand.h
==============================================================================
--- UDM/trunk/include/ErrHand.h	Tue Mar  4 14:12:42 2014	(r4254)
+++ UDM/trunk/include/ErrHand.h	Tue Mar  4 15:34:47 2014	(r4255)
@@ -14,6 +14,11 @@
 #ifndef MOBIES_ERRHAND_H
 #define MOBIES_ERRHAND_H
 
+// static libs are no longer distributed, so default to UDM_DYNAMIC_LINKING for VS2010 and later
+#if _MSC_VER >= 1600 && !defined(UDM_NO_DYNAMIC_LINKING) && !defined(UDM_DLL_EXPORT)
+#define UDM_DYNAMIC_LINKING 1
+#endif
+
 #ifndef UDM_DYNAMIC_LINKING
 #define UDM_DLL 
 #else
@@ -56,6 +61,7 @@
 #define UDM_PLATFORM "Win32"
 #endif
 #define UDM_DLL_LIB "UdmDll_" UDM_PLATFORM_TOOLSET "_" UDM_PLATFORM UDM_DEBUG ".lib"
+#define UDM_RVALUE
 #elif (_MSC_VER == 1600) /* VS2010 */
 #define UDM_NAMESPACE Udm_VS10
 namespace UDM_NAMESPACE {};
@@ -90,6 +96,18 @@
 #define UDM_NAMESPACE Udm
 #endif /* _WIN32 */
 
+#if (_MSC_VER == 1600 || _MSC_VER == 1700) && !defined(UDM_NO_ITERATOR_DEBUG_LEVEL_CHECK)
+# ifdef _DEBUG
+#  define UDM_ITERATOR_DEBUG_LEVEL 2
+# else
+#  define UDM_ITERATOR_DEBUG_LEVEL 0
+# endif
+# if _ITERATOR_DEBUG_LEVEL != UDM_ITERATOR_DEBUG_LEVEL
+#  error _ITERATOR_DEBUG_LEVEL must be the default value
+# endif
+#endif
+
+
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 #define UDM_RVALUE
 #endif

Modified: UDM/trunk/include/UdmBase.h
==============================================================================
--- UDM/trunk/include/UdmBase.h	Tue Mar  4 14:12:42 2014	(r4254)
+++ UDM/trunk/include/UdmBase.h	Tue Mar  4 15:34:47 2014	(r4255)
@@ -199,6 +199,7 @@
 #define MOBIES_UDMBASE_H
 
 #ifdef _WIN32
+#pragma once
 //stupid win32 warnings
 #pragma warning ( disable : 4786 )
 #pragma warning( disable : 4290 ) //C++ Exception Specification Ignored warning

More information about the Mobies-commit mailing list