[Mobies-commit] [commit] r3842 - in UDM/trunk/Projects/Win32/VC10/tests: . testGetAdjacentObjects testOCL testUdmCint test_assocInheritanceMGA test_childrenorder test_cintstring test_crosslinks test_domstringdn test_generic test_generic2 test_libs test_ns test_ns2 test_refports test_simpleudmops
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Thu Aug 25 14:11:18 CDT 2011
Author: ksmyth
Date: Thu Aug 25 14:11:18 2011
New Revision: 3842
Log:
Fix some tests
Added:
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props (contents, props changed)
Modified:
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
UDM/trunk/Projects/Win32/VC10/tests/UdmTestsAll.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/cppunit.props
UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_crosslinks/Test_CrossLinks.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj.filters
Added: UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.props Thu Aug 25 14:11:18 2011 (r3842)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <IntDir>$([System.IO.Path]::GetFullPath($(UDM_PATH)\Build\Win32\VC10\$(Configuration)\obj\tests\$(ProjectName)\))</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>..\..\..\..\..\samples\CreateLampModel;$(UDM_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Thu Aug 25 14:11:18 2011 (r3842)
@@ -1,17 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreateLampModel", "..\samples\CreateLampModel\CreateLampModel.vcxproj", "{7B2D07A4-E108-45B1-860B-43084AAB9192}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_links", "..\samples\cross_links\cross_links.vcxproj", "{4CA139A6-D338-4C6D-B9AD-86B65B8E5129}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSignalFlow", "test_assocInheritanceMGA\TestSignalFlow.vcxproj", "{B3186C4B-EF81-4474-BDA7-AC44B4339C98}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_childrenorder", "test_childrenorder\test_childrenorder.vcxproj", "{EFA8EF1E-C593-425D-AFAE-E3AE6B9AC546}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cintstring", "test_cintstring\test_cintstring.vcxproj", "{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test_CrossLinks", "test_crosslinks\Test_CrossLinks.vcxproj", "{4AB81545-A658-4D58-AF09-C060DBCB4F7F}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_domstringdn", "test_domstringdn\test_domstringdn.vcxproj", "{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_generic", "test_generic\test_generic.vcxproj", "{CCB8B735-7EBB-4A60-A7E7-B8EAF1B11232}"
@@ -36,20 +30,14 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_refports", "test_refports\test_refports.vcxproj", "{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CreateLampDiagram", "CreateLampDiagram\CreateLampDiagram.vcxproj", "{3FB0A5A6-8815-45A3-8D68-777C708410FB}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {7B2D07A4-E108-45B1-860B-43084AAB9192}.Debug|Win32.ActiveCfg = Debug|Win32
- {7B2D07A4-E108-45B1-860B-43084AAB9192}.Debug|Win32.Build.0 = Debug|Win32
- {7B2D07A4-E108-45B1-860B-43084AAB9192}.Release|Win32.ActiveCfg = Release|Win32
- {7B2D07A4-E108-45B1-860B-43084AAB9192}.Release|Win32.Build.0 = Release|Win32
- {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Debug|Win32.ActiveCfg = Debug|Win32
- {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Debug|Win32.Build.0 = Debug|Win32
- {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Release|Win32.ActiveCfg = Release|Win32
- {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Release|Win32.Build.0 = Release|Win32
{B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Debug|Win32.ActiveCfg = Debug|Win32
{B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Debug|Win32.Build.0 = Debug|Win32
{B3186C4B-EF81-4474-BDA7-AC44B4339C98}.Release|Win32.ActiveCfg = Release|Win32
@@ -62,10 +50,6 @@
{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Debug|Win32.Build.0 = Debug|Win32
{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Release|Win32.ActiveCfg = Release|Win32
{C4C77F9B-540F-4D02-A6E0-90F25740CA6C}.Release|Win32.Build.0 = Release|Win32
- {4AB81545-A658-4D58-AF09-C060DBCB4F7F}.Debug|Win32.ActiveCfg = Debug|Win32
- {4AB81545-A658-4D58-AF09-C060DBCB4F7F}.Debug|Win32.Build.0 = Debug|Win32
- {4AB81545-A658-4D58-AF09-C060DBCB4F7F}.Release|Win32.ActiveCfg = Release|Win32
- {4AB81545-A658-4D58-AF09-C060DBCB4F7F}.Release|Win32.Build.0 = Release|Win32
{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Debug|Win32.ActiveCfg = Debug|Win32
{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Debug|Win32.Build.0 = Debug|Win32
{D38D6A95-8FAA-4437-88B5-BE24C6CB591A}.Release|Win32.ActiveCfg = Release|Win32
@@ -114,6 +98,10 @@
{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Debug|Win32.Build.0 = Debug|Win32
{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Release|Win32.ActiveCfg = Release|Win32
{95B70B72-F65E-44F1-AF18-FCE1ED1B4FC7}.Release|Win32.Build.0 = Release|Win32
+ {3FB0A5A6-8815-45A3-8D68-777C708410FB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3FB0A5A6-8815-45A3-8D68-777C708410FB}.Debug|Win32.Build.0 = Debug|Win32
+ {3FB0A5A6-8815-45A3-8D68-777C708410FB}.Release|Win32.ActiveCfg = Release|Win32
+ {3FB0A5A6-8815-45A3-8D68-777C708410FB}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: UDM/trunk/Projects/Win32/VC10/tests/UdmTestsAll.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/UdmTestsAll.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTestsAll.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -57,14 +57,6 @@
</Midl>
</ItemDefinitionGroup>
<ItemGroup>
- <ProjectReference Include="..\samples\CreateLampModel\CreateLampModel.vcxproj">
- <Project>{7b2d07a4-e108-45b1-860b-43084aab9192}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\samples\cross_links\cross_links.vcxproj">
- <Project>{4ca139a6-d338-4c6d-b9ad-86b65b8e5129}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="testGetAdjacentObjects\testGetAdjacentObjects.vcxproj">
<Project>{9fba3bbe-2fad-4e8a-b766-7067ec217617}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -89,10 +81,6 @@
<Project>{c4c77f9b-540f-4d02-a6e0-90f25740ca6c}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="test_crosslinks\Test_CrossLinks.vcxproj">
- <Project>{4ab81545-a658-4d58-af09-c060dbcb4f7f}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="test_domstringdn\test_domstringdn.vcxproj">
<Project>{d38d6a95-8faa-4437-88b5-be24c6cb591a}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: UDM/trunk/Projects/Win32/VC10/tests/cppunit.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/cppunit.props Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/cppunit.props Thu Aug 25 14:11:18 2011 (r3842)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
- <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Label="UserMacros">
+ <UDM_EXE>$(UDM_PATH)\bin\Udm.exe</UDM_EXE>
+ </PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
@@ -11,5 +13,10 @@
<AdditionalLibraryDirectories>$(UDM_3RDPARTY_PATH)\cppunit-1.12.1\lib_v100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
- <ItemGroup />
+ <ItemGroup>
+ <BuildMacro Include="UDM_EXE">
+ <Value>$(UDM_EXE)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -189,7 +189,7 @@
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating UDM API files...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)udmD.exe" -o "$(OutDir)Gen\tests\testGetAdjacentObjects" %(FullPath)
</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageA.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.h;$(OutDir)Gen\tests\testGetAdjacentObjects\PackageB.xsd;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h;$(OutDir)Gen\tests\testGetAdjacentObjects\testAssociationScenarios.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
@@ -197,4 +197,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -151,7 +151,7 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testOCL" %(FullPath) -t -v -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -g
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testOCL\SBML2.cpp;$(OutDir)Gen\tests\testOCL\SBML2.h;$(OutDir)Gen\tests\testOCL\SBML2.dtd;$(OutDir)Gen\tests\testOCL\SBML2.xsd;$(OutDir)Gen\tests\testOCL\SBML2_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_math.dtd;$(OutDir)Gen\tests\testOCL\SBML2_math.xsd;$(OutDir)Gen\tests\testOCL\SBML2_math_xsd.h;$(OutDir)Gen\tests\testOCL\SBML2_sbml.dtd;$(OutDir)Gen\tests\testOCL\SBML2_sbml.xsd;$(OutDir)Gen\tests\testOCL\SBML2_sbml_xsd.h;%(Outputs)</Outputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\testOCL\SBML2_uml.xme">
@@ -170,4 +170,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -185,7 +185,7 @@
"..\..\$(OutDir)StrResGenD.exe" GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd
"..\..\$(OutDir)StrResGenD.exe" GeneTF.xsd GeneTF_xsd
</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testUdmCint\GeneTF.cpp;$(OutDir)Gen\tests\testUdmCint\GeneTF.h;$(OutDir)Gen\tests\testUdmCint\GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.xsd;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF.dtd;$(OutDir)Gen\tests\testUdmCint\GeneTF_xsd.h;$(OutDir)Gen\tests\testUdmCint\GeneTF_GeneTF_xsd.h;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
@@ -250,4 +250,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -232,7 +232,7 @@
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SignaFlow_udm.xml -> C++ API</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_assocInheritanceMGA" "%(FullPath)"
</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.h;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
@@ -253,4 +253,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -31,10 +31,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -76,7 +78,7 @@
<AdditionalIncludeDirectories>$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UmlD.lib;UdmBaseD.lib;cppunitd.lib;testrunnerd.lib;UdmUtilD.lib;zlibD.lib;UdmDomD.lib;xerces-c_2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_childrenorder.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -151,19 +153,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_childrenorder\test_childrenorder.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -175,22 +164,12 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\..\..\tests\test_childrenorder\childrenorderTest.rc" />
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_childrenorder\childrenorderTest.h" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
<ClInclude Include="..\..\..\..\..\tests\test_childrenorder\resource.h" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\samples\CreateLampModel\CreateLampModel.vcxproj">
- <Project>{7b2d07a4-e108-45b1-860b-43084aab9192}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
+ <Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj.filters Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj.filters Thu Aug 25 14:11:18 2011 (r3842)
@@ -11,12 +11,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_childrenorder\childrenorderTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -25,11 +19,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\..\..\tests\test_childrenorder\childrenorderTest.rc">
- <Filter>Source Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_childrenorder\childrenorderTest.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -37,12 +26,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -31,10 +31,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -129,7 +131,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UmlD.lib;UdmBaseD.lib;cppunitd.lib;testrunnerd.lib;UdmUtild.lib;zlibd.lib;UdmDomd.lib;xerces-c_2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_cintstring.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_crosslinks/Test_CrossLinks.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_crosslinks/Test_CrossLinks.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_crosslinks/Test_CrossLinks.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -265,7 +265,7 @@
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating UDM API files from %(FullPath)</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_crosslinks" "%(FullPath)" -d "%UDM_PATH%\etc"
</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_crosslinks\Package1.h;$(OutDir)Gen\tests\test_crosslinks\Package1.cpp;$(OutDir)Gen\tests\test_crosslinks\Package1.xsd;$(OutDir)Gen\tests\test_crosslinks\Package2.h;$(OutDir)Gen\tests\test_crosslinks\Package2.cpp;$(OutDir)Gen\tests\test_crosslinks\Package2.xsd;$(OutDir)Gen\tests\test_crosslinks\CL.cpp;$(OutDir)Gen\tests\test_crosslinks\CL.h;$(OutDir)Gen\tests\test_crosslinks\CL.xsd;$(OutDir)Gen\tests\test_crosslinks\CLPackage.cpp;$(OutDir)Gen\tests\test_crosslinks\CLPackage.h;$(OutDir)Gen\tests\test_crosslinks\CLPackage.xsd;$(OutDir)Gen\tests\test_crosslinks\Package2_NSp.xsd;$(OutDir)Gen\tests\test_crosslinks\Package2_NSp_NSc.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
@@ -286,4 +286,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -31,12 +31,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
- <Import Project="..\..\src\Xerces-c.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
- <Import Project="..\..\src\Xerces-c.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -123,7 +123,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UmlD.lib;UdmBaseD.lib;cppunitd.lib;testrunnerd.lib;UdmUtild.lib;zlibD.lib;UdmDomD.lib;xerces-c_2D.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_domstringdn.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -151,19 +151,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_domstringdn\test_domstringdn.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -176,17 +163,10 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_domstringdn\domstringdnTest.h" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\samples\CreateLampModel\CreateLampModel.vcxproj">
- <Project>{7b2d07a4-e108-45b1-860b-43084aab9192}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
+ <Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj.filters Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj.filters Thu Aug 25 14:11:18 2011 (r3842)
@@ -11,12 +11,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_domstringdn\domstringdnTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -29,12 +23,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -31,10 +31,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -125,7 +127,7 @@
<AdditionalIncludeDirectories>$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UmlD.lib;UdmGmeD.lib;UdmBaseD.lib;cppunitd.lib;UdmUtild.lib;zlibD.lib;UdmDomD.lib;xerces-c_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_generic.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -153,19 +155,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_generic\test_generic.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -177,22 +166,12 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\..\..\tests\test_generic\genericTest.rc" />
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_generic\genericTest.h" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
<ClInclude Include="..\..\..\..\..\tests\test_generic\resource.h" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\samples\CreateLampModel\CreateLampModel.vcxproj">
- <Project>{7b2d07a4-e108-45b1-860b-43084aab9192}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
+ <Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj.filters Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj.filters Thu Aug 25 14:11:18 2011 (r3842)
@@ -11,12 +11,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_generic\genericTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -25,11 +19,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\..\..\tests\test_generic\genericTest.rc">
- <Filter>Source Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_generic\genericTest.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -37,12 +26,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -32,11 +32,13 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\..\src\boost.props" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\..\src\boost.props" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -157,19 +159,6 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_generic2\LampDiagram.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_generic2\LampDiagram.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_generic2\test_generic.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -185,36 +174,11 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_generic2\genericTest.h" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_generic2\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_generic2\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
<ClInclude Include="..\..\..\..\..\tests\test_generic2\resource.h" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram_udm.xml">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LampDiagram_udm.xml -> C++ API</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_generic2" "%(FullPath)" -v --leesa
-</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_generic2\LampDiagram.xsd;$(OutDir)Gen\tests\test_generic2\LampDiagram.cpp;$(OutDir)Gen\tests\test_generic2\LampDiagram.h;%(Outputs)</Outputs>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram_udm.xml">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LampDiagram_udm.xml -> C++ API</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_generic2" "%(FullPath)" -v --leesa
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_generic2\LampDiagram.xsd;$(OutDir)Gen\tests\test_generic2\LampDiagram.cpp;$(OutDir)Gen\tests\test_generic2\LampDiagram.h;%(Outputs)</Outputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
- </CustomBuild>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\samples\CreateLampModel\CreateLampModel.vcxproj">
- <Project>{7b2d07a4-e108-45b1-860b-43084aab9192}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
+ <Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj.filters Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_generic2/test_generic2.vcxproj.filters Thu Aug 25 14:11:18 2011 (r3842)
@@ -9,18 +9,8 @@
<UniqueIdentifier>{39f8b096-acae-44ef-b427-2978631d669c}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
- <Filter Include="UML Diagrams">
- <UniqueIdentifier>{c7c3867c-cc68-4c8a-9586-f56e950c47b8}</UniqueIdentifier>
- <Extensions>xml</Extensions>
- </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_generic2\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_generic2\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_generic2\genericTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -41,18 +31,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram_udm.xml">
- <Filter>UML Diagrams</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_generic2\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram_udm.xml">
- <Filter>UML Diagrams</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_generic2\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -30,10 +30,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -43,6 +45,7 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\Build\Win32\VC10\Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)obj\tests\$(ProjectName)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -57,7 +60,6 @@
</ClCompile>
<Link>
<AdditionalDependencies>cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(ProjectName)D.exe</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -103,28 +105,15 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_libs\LibsTest.cpp" />
<ClCompile Include="..\..\..\..\..\tests\test_libs\main.cpp" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
<ClInclude Include="..\..\..\..\..\tests\test_libs\LibsTest.h" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\samples\CreateLampModel\CreateLampModel.vcxproj">
- <Project>{7b2d07a4-e108-45b1-860b-43084aab9192}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
+ <Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj.filters Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj.filters Thu Aug 25 14:11:18 2011 (r3842)
@@ -11,12 +11,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_libs\LibsTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -29,12 +23,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -146,7 +146,7 @@
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns_udm.xml">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_ns" %(FullPath) -t -v
</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_ns\test_ns.cpp;$(OutDir)Gen\tests\test_ns\test_ns.h;$(OutDir)Gen\tests\test_ns\test_ns.dtd;$(OutDir)Gen\tests\test_ns\test_ns.xsd;$(OutDir)Gen\tests\test_ns\test_ns_A.dtd;$(OutDir)Gen\tests\test_ns\test_ns_A.xsd;$(OutDir)Gen\tests\test_ns\test_ns_B.dtd;$(OutDir)Gen\tests\test_ns\test_ns_B.xsd;$(OutDir)Gen\tests\test_ns\test_ns_AB.dtd;$(OutDir)Gen\tests\test_ns\test_ns_AB.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
@@ -165,4 +165,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -161,7 +161,7 @@
<CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost_udm.xml">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_ns2" %(FullPath) -t -v
</Command>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_ns2\CHost.cpp;$(OutDir)Gen\tests\test_ns2\CHost.h;$(OutDir)Gen\tests\test_ns2\CHost.dtd;$(OutDir)Gen\tests\test_ns2\CHost.xsd;$(OutDir)Gen\tests\test_ns2\CHost_A.dtd;$(OutDir)Gen\tests\test_ns2\CHost_A.xsd;$(OutDir)Gen\tests\test_ns2\CHost_B.dtd;$(OutDir)Gen\tests\test_ns2\CHost_B.xsd;$(OutDir)Gen\tests\test_ns2\CHost_C.dtd;$(OutDir)Gen\tests\test_ns2\CHost_C.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</CustomBuild>
@@ -180,4 +180,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -143,7 +143,7 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_refports\RefPort.h;$(OutDir)Gen\tests\test_refports\RefPort.cpp;$(OutDir)Gen\tests\test_refports\RefPort.xsd;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe"</AdditionalInputs>
+ <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
</CustomBuild>
<CustomBuild Include="..\..\..\..\..\tests\test_refports\RefPortGme.xme">
<FileType>Document</FileType>
@@ -177,4 +177,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj Thu Aug 25 14:11:18 2011 (r3842)
@@ -31,10 +31,12 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.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')" />
<Import Project="..\cppunit.props" />
+ <Import Project="..\UdmTests.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
@@ -141,19 +143,6 @@
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_simpleudmops\LampTest.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -174,18 +163,11 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </CustomBuild>
<ClInclude Include="..\..\..\..\..\tests\test_simpleudmops\UDMTest.h" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\samples\CreateLampModel\CreateLampModel.vcxproj">
- <Project>{7b2d07a4-e108-45b1-860b-43084aab9192}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
+ <Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj.filters Wed Aug 24 16:40:27 2011 (r3841)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj.filters Thu Aug 25 14:11:18 2011 (r3842)
@@ -11,12 +11,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_simpleudmops\LampTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -29,12 +23,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\samples\LampDiagram.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- </ItemGroup>
</Project>
\ No newline at end of file
More information about the Mobies-commit
mailing list