[Mobies-commit] [commit] r3766 - in GReAT/trunk: . Tools/UMTInterpreters Tools/UMTInterpreters/UMTDecorator

ksmyth at redhat1.isis.vanderbilt.edu ksmyth at redhat1.isis.vanderbilt.edu
Wed Jun 22 11:42:02 CDT 2011 

Author: ksmyth
Date: Wed Jun 22 11:42:02 2011
New Revision: 3766

Log:
Include DecoratorLib as svn:externals

Modified:
   GReAT/trunk/GReATVS2010.sln
   GReAT/trunk/Tools/UMTInterpreters/   (props changed)
   GReAT/trunk/Tools/UMTInterpreters/UMTDecorator/UMTDecoratorVS2010.vcxproj
   GReAT/trunk/make.msbuild

Modified: GReAT/trunk/GReATVS2010.sln
==============================================================================
--- GReAT/trunk/GReATVS2010.sln	Mon Jun 20 11:53:07 2011	(r3765)
+++ GReAT/trunk/GReATVS2010.sln	Wed Jun 22 11:42:02 2011	(r3766)
@@ -49,7 +49,7 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UML", "Tools\MetaGME2UMX\MetaGME2UMLVS2010.vcxproj", "{C6D78EF7-DE19-4D15-8446-0DC4556A1023}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UML Interpreters", "Tools\MetaGME2UMX\MetaGME2UMX Interpreters\MetaGME2UML_interpreterVS2010.vcxproj", "{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UML Interpreter", "Tools\MetaGME2UMX\MetaGME2UMX Interpreters\MetaGME2UML_interpreterVS2010.vcxproj", "{6A83C9AA-35B2-427B-B3D0-D9CB7FC729A3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaGME2UMT Interpreters", "Tools\MetaGME2UMX\MetaGME2UMX Interpreters\MetaGME2UMT_interpreterVS2010.vcxproj", "{BB01B6C2-A5F2-4733-9DB4-558168B2E970}"
 EndProject
@@ -89,6 +89,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GRCC", "Libraries\GRCC\GRCCVS2010.vcxproj", "{6AC9F565-4C4C-4BEA-B394-876FBE81BD17}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DecoratorLib", "Tools\UMTInterpreters\DecoratorLib\DecoratorLib.vcxproj", "{77FEBD41-CD6C-4D55-B561-3957F7151CC2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -410,8 +412,10 @@
 		{30A2ECA7-FECA-1BAD-83D3-100AA69FC885}.ReleaseVS9|Win32.ActiveCfg = ReleaseVS9|Win32
 		{30A2ECA7-FECA-1BAD-83D3-100AA69FC885}.ReleaseVS9|Win32.Build.0 = ReleaseVS9|Win32
 		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.Debug|Win32.Build.0 = Debug|Win32
 		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.DebugVS9|Win32.ActiveCfg = DebugVS9|Win32
 		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.Release|Win32.ActiveCfg = Release|Win32
+		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.Release|Win32.Build.0 = Release|Win32
 		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.ReleaseVS9|Win32.ActiveCfg = ReleaseVS9|Win32
 		{CADC2A22-8029-4CE1-95F3-A0005E8CA488}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CADC2A22-8029-4CE1-95F3-A0005E8CA488}.Debug|Win32.Build.0 = Debug|Win32
@@ -437,6 +441,12 @@
 		{6AC9F565-4C4C-4BEA-B394-876FBE81BD17}.Release|Win32.Build.0 = Release|Win32
 		{6AC9F565-4C4C-4BEA-B394-876FBE81BD17}.ReleaseVS9|Win32.ActiveCfg = ReleaseVS9|Win32
 		{6AC9F565-4C4C-4BEA-B394-876FBE81BD17}.ReleaseVS9|Win32.Build.0 = ReleaseVS9|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Debug|Win32.Build.0 = Debug|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.DebugVS9|Win32.ActiveCfg = Debug|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Release|Win32.ActiveCfg = Release|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Release|Win32.Build.0 = Release|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.ReleaseVS9|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: GReAT/trunk/Tools/UMTInterpreters/UMTDecorator/UMTDecoratorVS2010.vcxproj
==============================================================================
--- GReAT/trunk/Tools/UMTInterpreters/UMTDecorator/UMTDecoratorVS2010.vcxproj	Mon Jun 20 11:53:07 2011	(r3765)
+++ GReAT/trunk/Tools/UMTInterpreters/UMTDecorator/UMTDecoratorVS2010.vcxproj	Wed Jun 22 11:42:02 2011	(r3766)
@@ -57,28 +57,27 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\GReAT.props" />
-    <Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
+    <Import Project="..\DecoratorLib\Decorator.props" />
     <Import Project="..\..\..\common-scripts\GMEVS2010.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugVS9|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\GReAT.props" />
-    <Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
     <Import Project="..\..\..\VS9.props" />
+    <Import Project="..\DecoratorLib\Decorator.props" />
     <Import Project="..\..\..\common-scripts\GMEVS2010.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\GReAT.props" />
-    <Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
-    <Import Project="..\..\..\common-scripts\GMEVS2010.props" />
+    <Import Project="..\DecoratorLib\Decorator.props" />
     <Import Project="..\..\..\common-scripts\GMEVS2010.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseVS9|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\GReAT.props" />
     <Import Project="..\..\..\VS9.props" />
-    <Import Project="..\..\..\common-scripts\GMEInterpreter.props" />
+    <Import Project="..\DecoratorLib\Decorator.props" />
     <Import Project="..\..\..\common-scripts\GMEVS2010.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -119,7 +118,6 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\SDK\DecoratorLib;$(GME_ROOT)\SDK\Common;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -137,10 +135,9 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>gdiplus.lib;DecoratorLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)UMTDecorator.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(GME_ROOT)\GME\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>.\UMLDecoratorApp.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
@@ -171,7 +168,6 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\SDK\DecoratorLib;$(GME_ROOT)\SDK\Common;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -189,10 +185,9 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>gdiplus.lib;DecoratorLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(GME_ROOT)\GME\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>.\UMLDecoratorApp.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
@@ -220,7 +215,6 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\SDK\DecoratorLib;$(GME_ROOT)\SDK\Common;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -237,10 +231,9 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>gdiplus.lib;DecoratorLibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)UMTDecorator_D.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(GME_ROOT)\GME\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>.\UMLDecoratorApp.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
@@ -268,7 +261,6 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(GME_ROOT)\SDK\DecoratorLib;$(GME_ROOT)\SDK\Common;$(GME_ROOT)\Interfaces;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -285,10 +277,9 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>gdiplus.lib;DecoratorLibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(GME_ROOT)\GME\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>.\UMLDecoratorApp.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
@@ -395,7 +386,12 @@
     <ClInclude Include="UMLDecoratorImpl.h" />
     <ClInclude Include="UMLStereoLabelPart.h" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ItemGroup>
+    <ProjectReference Include="..\DecoratorLib\DecoratorLib.vcxproj">
+      <Project>{77febd41-cd6c-4d55-b561-3957f7151cc2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: GReAT/trunk/make.msbuild
==============================================================================
--- GReAT/trunk/make.msbuild	Mon Jun 20 11:53:07 2011	(r3765)
+++ GReAT/trunk/make.msbuild	Wed Jun 22 11:42:02 2011	(r3766)
@@ -8,15 +8,8 @@
 
   <ItemGroup>
     <ProjectToBuild Include="GReATVS2010.sln"/>
-    <ProjectToBuild Include="Tools\UMTInterpreters\UMTDecorator\UMTDecoratorVS2010.vcxproj"
-                    Condition="(('$(Configuration)'=='DebugVS9' OR '$(Configuration)'=='ReleaseVS9') AND !$(GMEVS2010)) OR 
-                               (('$(Configuration)'=='Debug' OR '$(Configuration)'=='Release') AND $(GMEVS2010))"/>
   </ItemGroup>
 
-  <Target Name="BuildDecoratorLib" DependsOnTargets="CheckEnvGme">
-    <MSBuild Projects="$(GME_ROOT)\SDK\DecoratorLib\DecoratorLib.sln" Properties="Configuration=Release"/>
-    <MSBuild Projects="$(GME_ROOT)\SDK\DecoratorLib\DecoratorLib.sln" Properties="Configuration=Debug"/>
-  </Target>
   <Target Name="BuildReleaseVS9">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="Build" Properties="Configuration=ReleaseVS9" />
   </Target>

More information about the Mobies-commit mailing list