[Mobies-commit] [commit] r4298 - in UDM/trunk/Projects/Win32/VC9: src src/UdmDll src/UdmOclPat/GOCL/src src/UdmSwig tests tests/testUdmCint tests/test_childrenorder tests/test_generic2
endre at redhat3.isis.vanderbilt.edu
endre at redhat3.isis.vanderbilt.edu
Sat May 17 22:43:44 CDT 2014
Author: endre
Date: Sat May 17 22:43:44 2014
New Revision: 4298
Log:
Use PCCTS 133 MR from third party instead of some 3rd Party files in trunk\src\UdmOclPat\GOCL\src\ANTLRBase
Modified:
UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops
UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj
UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/GOCL/src/GOCL.vcproj
UDM/trunk/Projects/Win32/VC9/src/UdmSwig/UdmSwig.vcproj
UDM/trunk/Projects/Win32/VC9/tests/UdmTests.vsprops
UDM/trunk/Projects/Win32/VC9/tests/testUdmCint/testUdmCint.vcproj
UDM/trunk/Projects/Win32/VC9/tests/test_childrenorder/test_childrenorder.vcproj
UDM/trunk/Projects/Win32/VC9/tests/test_generic2/test_generic2.vcproj
Modified: UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops Thu May 1 13:52:44 2014 (r4297)
+++ UDM/trunk/Projects/Win32/VC9/src/Udm.vsprops Sat May 17 22:43:44 2014 (r4298)
@@ -6,11 +6,11 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include";"$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\include";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\cpp";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\zlib\contrib\minizip";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\include";"$(UDM_3RDPARTY_PATH)\boost_1_44_0";"$(JAVA_HOME)\include\win32";"$(JAVA_HOME)\include";"$(GME_ROOT)\Interfaces";"$(GME_ROOT)\Gme\Interfaces";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib\cpp";"$(UDM_3RDPARTY_PATH)\json_spirit""
+ AdditionalIncludeDirectories=""$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\include";"$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\include";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\cpp";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\zlib\contrib\minizip";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\include";"$(UDM_3RDPARTY_PATH)\boost_1_44_0";"$(JAVA_HOME)\include\win32";"$(JAVA_HOME)\include";"$(GME_ROOT)\Interfaces";"$(GME_ROOT)\Gme\Interfaces";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib\cpp";"$(UDM_3RDPARTY_PATH)\json_spirit";"$(UDM_3RDPARTY_PATH)\pccts\h""
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories=""$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\lib";"$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\lib";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib";"$(JAVA_HOME)\lib""
+ AdditionalLibraryDirectories=""$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\lib";"$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\lib";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\antlr-2.7.7\lib";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib";"$(JAVA_HOME)\lib";"$(UDM_3RDPARTY_PATH)\pccts\lib""
/>
<Tool
Name="VCMIDLTool"
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj Thu May 1 13:52:44 2014 (r4297)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmDll/UdmDll.vcproj Sat May 17 22:43:44 2014 (r4298)
@@ -84,7 +84,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="UdmUtil.lib UdmBase.lib UDMPOI.lib UdmOcl.lib Uml.lib UdmDom.lib UdmGme.lib xerces-c_2.lib zlib.lib GOCL.lib dbghelp.lib"
+ AdditionalDependencies="UdmUtil.lib UdmBase.lib UDMPOI.lib UdmOcl.lib Uml.lib UdmDom.lib UdmGme.lib xerces-c_2.lib zlib.lib GOCL.lib dbghelp.lib pccts_release.lib"
OutputFile="$(OutDir)\UdmDll_3_2.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -187,7 +187,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="UdmBaseD.lib UdmOclD.lib UdmPOID.lib UmlD.lib UdmDomD.lib UdmGmeD.lib UdmUtilD.lib xerces-c_2.lib zlibD.lib GOCLD.lib dbghelp.lib"
+ AdditionalDependencies="UdmBaseD.lib UdmOclD.lib UdmPOID.lib UmlD.lib UdmDomD.lib UdmGmeD.lib UdmUtilD.lib xerces-c_2.lib zlibD.lib GOCLD.lib dbghelp.lib pccts_debug.lib"
OutputFile="$(OutDir)\UdmDll_3_2D.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/GOCL/src/GOCL.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/GOCL/src/GOCL.vcproj Thu May 1 13:52:44 2014 (r4297)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmOclPat/GOCL/src/GOCL.vcproj Sat May 17 22:43:44 2014 (r4298)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src,..\..\..\..\..\..\..\src\UdmOclPat\GOCL\src\ANTLRBase,..\..\..\..\..\..\..\src\UdmOclPat\GOCL\Include"
+ AdditionalIncludeDirectories=""$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src";..\..\..\..\..\..\..\src\UdmOclPat\GOCL\Include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OCL_USING_STL_NAMESPACE;_AFX_NOFORCE_LIBS;_CRT_SECURE_NO_WARNINGS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -119,7 +119,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src,..\..\..\..\..\..\..\src\UdmOclPat\GOCL\src\ANTLRBase,..\..\..\..\..\..\..\src\UdmOclPat\GOCL\Include"
+ AdditionalIncludeDirectories=""$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src";..\..\..\..\..\..\..\src\UdmOclPat\GOCL\Include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OCL_USING_STL_NAMESPACE;_AFX_NOFORCE_LIBS;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="2"
@@ -176,81 +176,6 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath="..\..\..\..\..\..\..\src\UdmOclPat\GOCL\src\ANTLRBase\AParser.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\..\..\..\src\UdmOclPat\GOCL\src\ANTLRBase\ATokenBuffer.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\..\..\..\..\..\..\src\UdmOclPat\GOCL\src\ANTLRBase\DLexerBase.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\..\..\..\..\..\Build\Win32\VC9\Gen\src\UdmOclPat\GOCL\src\ocl.cpp"
>
<FileConfiguration
@@ -283,7 +208,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="mkdir "$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src"
cd "$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src"
copy /y "$(InputPath)" .
"$(InputDir)\ANTLRBase\antlr" -CC -ft OCLTokens.h -fl OCLParser.dlg -mrhoist off "$(InputFileName)"
"$(InputDir)\ANTLRBase\dlg" -C2 -i -CC -cl OCLLexer OCLParser.dlg
"
+ CommandLine="mkdir "$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src"
cd "$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src"
copy /y "$(InputPath)" .
"$(UDM_3RDPARTY_PATH)\pccts\bin\Antlr" -CC -ft OCLTokens.h -fl OCLParser.dlg -mrhoist off "$(InputFileName)"
"$(UDM_3RDPARTY_PATH)\pccts\bin\Dlg" -C2 -i -CC -cl OCLLexer OCLParser.dlg
"
Outputs="$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLLexer.cpp; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLLexer.h; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLParser.cpp; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLParser.h; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\ocl.cpp; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLTokens.h; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLParser.dlg"
/>
</FileConfiguration>
@@ -292,7 +217,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="mkdir "$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src"
cd "$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src"
copy /y "$(InputPath)" .
"$(InputDir)\ANTLRBase\antlr" -CC -ft OCLTokens.h -fl OCLParser.dlg -mrhoist off "$(InputFileName)"
"$(InputDir)\ANTLRBase\dlg" -C2 -i -CC -cl OCLLexer OCLParser.dlg
"
+ CommandLine="mkdir "$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src"
cd "$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src"
copy /y "$(InputPath)" .
"$(UDM_3RDPARTY_PATH)\pccts\bin\Antlr" -CC -ft OCLTokens.h -fl OCLParser.dlg -mrhoist off "$(InputFileName)"
"$(UDM_3RDPARTY_PATH)\pccts\bin\Dlg" -C2 -i -CC -cl OCLLexer OCLParser.dlg
"
Outputs="$(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLLexer.cpp; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLLexer.h; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLParser.cpp; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLParser.h; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\ocl.cpp; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLTokens.h; $(OutDir)\..\Gen\src\UdmOclPat\GOCL\src\OCLParser.dlg"
/>
</FileConfiguration>
Modified: UDM/trunk/Projects/Win32/VC9/src/UdmSwig/UdmSwig.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/src/UdmSwig/UdmSwig.vcproj Thu May 1 13:52:44 2014 (r4297)
+++ UDM/trunk/Projects/Win32/VC9/src/UdmSwig/UdmSwig.vcproj Sat May 17 22:43:44 2014 (r4298)
@@ -77,7 +77,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="UmlD.lib GOCLd.lib UdmOcld.lib jvm.lib jawt.lib UdmPOID.lib Xalan-C_1d.lib xerces-c_2.lib UdmBaseD.lib UdmDomD.lib UdmUtilD.lib zlibd.lib"
+ AdditionalDependencies="UmlD.lib GOCLd.lib UdmOcld.lib jvm.lib jawt.lib UdmPOID.lib Xalan-C_1d.lib xerces-c_2.lib UdmBaseD.lib UdmDomD.lib UdmUtilD.lib zlibd.lib pccts_debug.lib"
OutputFile="$(OutDir)\UdmSwigD.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -176,7 +176,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Uml.lib GOCL.lib UdmOcl.lib jvm.lib jawt.lib UdmPOI.lib xerces-c_2.lib UdmBase.lib UdmDom.lib UdmUtil.lib zlib.lib"
+ AdditionalDependencies="Uml.lib GOCL.lib UdmOcl.lib jvm.lib jawt.lib UdmPOI.lib xerces-c_2.lib UdmBase.lib UdmDom.lib UdmUtil.lib zlib.lib pccts_release.lib"
OutputFile="$(OutDir)\UdmSwig.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: UDM/trunk/Projects/Win32/VC9/tests/UdmTests.vsprops
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/UdmTests.vsprops Thu May 1 13:52:44 2014 (r4297)
+++ UDM/trunk/Projects/Win32/VC9/tests/UdmTests.vsprops Sat May 17 22:43:44 2014 (r4298)
@@ -14,7 +14,7 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(OutDir)";"$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\lib";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib";"$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\lib";"$(UDM_3RDPARTY_PATH)\boost_1_44_0";"$(UDM_3RDPARTY_PATH)\zlib""
+ AdditionalLibraryDirectories=""$(OutDir)";"$(UDM_3RDPARTY_PATH)\xerces-c_2_8_0\lib";"$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib";"$(UDM_3RDPARTY_PATH)\Xalan-C_1_11_0\lib";"$(UDM_3RDPARTY_PATH)\boost_1_44_0";"$(UDM_3RDPARTY_PATH)\zlib";"$(UDM_3RDPARTY_PATH)\pccts\lib""
GenerateDebugInformation="true"
SubSystem="1"
/>
Modified: UDM/trunk/Projects/Win32/VC9/tests/testUdmCint/testUdmCint.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/testUdmCint/testUdmCint.vcproj Thu May 1 13:52:44 2014 (r4297)
+++ UDM/trunk/Projects/Win32/VC9/tests/testUdmCint/testUdmCint.vcproj Sat May 17 22:43:44 2014 (r4298)
@@ -52,7 +52,6 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include;$(OutDir)\Gen\tests\testUdmCint"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
PrecompiledHeaderFile="$(IntDir)/testUdmCint.pch"
@@ -77,7 +76,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="UmlD.lib UdmOcld.lib GOCLd.lib cppunitd.lib testrunnerd.lib UdmPOID.lib Xalan-C_1d.lib xerces-c_2.lib UdmBaseD.lib UdmDomD.lib UdmUtilD.lib zlibd.lib"
+ AdditionalDependencies="UdmOclD.lib UmlD.lib UdmBaseD.lib UdmDomD.lib UdmGmeD.lib UdmUtilD.lib GOCLD.lib UdmPoiD.lib pccts_debug.lib cppunitd.lib testrunnerd.lib Xalan-C_1d.lib xerces-c_2.lib zlibd.lib"
OutputFile="$(OutDir)\testUdmCintD.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -150,7 +149,6 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\..\include;$(OutDir)\Gen\tests\testUdmCint"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -175,7 +173,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Uml.lib UdmOcl.lib GOCL.lib cppunit.lib testrunner.lib UdmPOI.lib Xalan-C_1.lib xerces-c_2.lib UdmBase.lib UdmDom.lib UdmGme.lib UdmUtil.lib zlib.lib"
+ AdditionalDependencies="UdmOcl.lib Uml.lib UdmBase.lib UdmDom.lib UdmGme.lib UdmUtil.lib GOCL.lib cppunit.lib testrunner.lib Xalan-C_1.lib xerces-c_2.lib zlib.lib UdmPoi.lib pccts_release.lib"
OutputFile="$(OutDir)\testUdmCint.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: UDM/trunk/Projects/Win32/VC9/tests/test_childrenorder/test_childrenorder.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_childrenorder/test_childrenorder.vcproj Thu May 1 13:52:44 2014 (r4297)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_childrenorder/test_childrenorder.vcproj Sat May 17 22:43:44 2014 (r4298)
@@ -49,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include;$(OutDir)\Gen\samples"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -76,7 +76,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="UmlD.lib UdmBaseD.lib cppunitd.lib testrunnerd.lib UdmUtilD.lib zlibD.lib UdmDomD.lib xerces-c_2.lib"
+ AdditionalDependencies="UdmDllD.lib cppunitd.lib testrunnerd.lib xerces-c_2.lib"
OutputFile="$(OutDir)\test_childrenorder.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -147,7 +147,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\..\include;$(OutDir)\Gen\samples"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UDM_DYNAMIC_LINKING"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -174,7 +174,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Uml.lib UdmBase.lib cppunit.lib testrunner.lib UdmUtil.lib zlib.lib UdmDom.lib xerces-c_2.lib"
+ AdditionalDependencies="UdmDll.lib cppunit.lib testrunner.lib xerces-c_2.lib"
OutputFile="$(OutDir)\test_childrenorder.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -244,45 +244,45 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.cpp"
>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -319,10 +319,10 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -331,10 +331,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram.h"
>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Modified: UDM/trunk/Projects/Win32/VC9/tests/test_generic2/test_generic2.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_generic2/test_generic2.vcproj Thu May 1 13:52:44 2014 (r4297)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_generic2/test_generic2.vcproj Sat May 17 22:43:44 2014 (r4298)
@@ -50,7 +50,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\..\include;$(OutDir)\Gen\tests\test_generic2"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE; UDM_DYNAMIC_LINKING"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -77,7 +77,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="Uml.lib UdmGme.lib UdmBase.lib cppunit.lib testrunner.lib UdmUtil.lib zlib.lib UdmDom.lib xerces-c_2.lib"
+ AdditionalDependencies="UdmDll.lib cppunit.lib testrunner.lib zlib.lib xerces-c_2.lib"
OutputFile="$(OutDir)\test_generic2.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -145,7 +145,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\..\include;$(OutDir)\Gen\tests\test_generic2"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE; UDM_DYNAMIC_LINKING"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="UmlD.lib UdmGmeD.lib UdmBaseD.lib cppunitd.lib testrunnerd.lib UdmUtild.lib zlibD.lib UdmDomD.lib xerces-c_2.lib"
+ AdditionalDependencies="UdmDllD.lib cppunitd.lib testrunnerd.lib zlibD.lib xerces-c_2.lib"
OutputFile="$(OutDir)\test_generic2.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -244,45 +244,45 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_generic2\LampDiagram.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_generic2\LampDiagram.cpp"
>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_generic2\LampDiagram.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_generic2\LampDiagram.cpp"
>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
/>
</FileConfiguration>
</File>
@@ -319,10 +319,10 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_generic2\LampDiagram.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_generic2\LampDiagram.h"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -331,10 +331,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_generic2\LampDiagram.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_generic2\LampDiagram.h"
>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -352,46 +352,46 @@
Filter="xml"
>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram_udm.xml"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram_udm.xml"
>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ Description="LampDiagram_udm.xml -> C++ API"
+ CommandLine=""$(OutDir)\Udm.exe" -o "$(OutDir)\Gen\tests\test_generic2" "$(InputPath)" -v --leesa
"
+ Outputs="$(OutDir)\Gen\tests\test_generic2\LampDiagram.xsd; $(OutDir)\Gen\tests\test_generic2\LampDiagram.cpp; $(OutDir)\Gen\tests\test_generic2\LampDiagram.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
- Description="LampDiagram_udm.xml -> C++ API"
- CommandLine=""$(OutDir)\UdmD.exe" -o "$(OutDir)\Gen\tests\test_generic2" "$(InputPath)" -v --leesa
"
- Outputs="$(OutDir)\Gen\tests\test_generic2\LampDiagram.xsd; $(OutDir)\Gen\tests\test_generic2\LampDiagram.cpp; $(OutDir)\Gen\tests\test_generic2\LampDiagram.h"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\samples\LampDiagram_udm.xml"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\samples\LampDiagram_udm.xml"
>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
- Description="LampDiagram_udm.xml -> C++ API"
- CommandLine=""$(OutDir)\Udm.exe" -o "$(OutDir)\Gen\tests\test_generic2" "$(InputPath)" -v --leesa
"
- Outputs="$(OutDir)\Gen\tests\test_generic2\LampDiagram.xsd; $(OutDir)\Gen\tests\test_generic2\LampDiagram.cpp; $(OutDir)\Gen\tests\test_generic2\LampDiagram.h"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ Description="LampDiagram_udm.xml -> C++ API"
+ CommandLine=""$(OutDir)\UdmD.exe" -o "$(OutDir)\Gen\tests\test_generic2" "$(InputPath)" -v --leesa
"
+ Outputs="$(OutDir)\Gen\tests\test_generic2\LampDiagram.xsd; $(OutDir)\Gen\tests\test_generic2\LampDiagram.cpp; $(OutDir)\Gen\tests\test_generic2\LampDiagram.h"
/>
</FileConfiguration>
</File>
More information about the Mobies-commit
mailing list