[Mobies-commit] [commit] r4104 - in UDM/trunk: . Projects/Win32/VC10/tests Projects/Win32/VC10/tests/CreateLampDiagram Projects/Win32/VC10/tests/testGetAdjacentObjects Projects/Win32/VC10/tests/testOCL Projects/Win32/VC10/tests/testUdmCint Projects/Win32/VC10/tests/test_assocInheritanceMGA Projects/Win32/VC10/tests/test_childrenorder Projects/Win32/VC10/tests/test_cintstring Projects/Win32/VC10/tests/test_domstringdn Projects/Win32/VC10/tests/test_generic Projects/Win32/VC10/tests/test_libs Projects/Win32/VC10/tests/test_ns Projects/Win32/VC10/tests/test_ns2 Projects/Win32/VC10/tests/test_refports Projects/Win32/VC10/tests/test_simpleudmops tests/test_staticleaksdll
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Wed Sep 12 16:40:16 CDT 2012
Author: ksmyth
Date: Wed Sep 12 16:40:12 2012
New Revision: 4104
Log:
Fix tests on VS10 and use build_customizations
Added:
UDM/trunk/.gitignore
Modified:
UDM/trunk/Projects/Win32/VC10/tests/CreateLampDiagram/CreateLampDiagram.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj
UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj
UDM/trunk/make.msbuild
UDM/trunk/tests/test_staticleaksdll/DllMain.cpp
Added: UDM/trunk/.gitignore
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/.gitignore Wed Sep 12 16:40:12 2012 (r4104)
@@ -0,0 +1,83 @@
+tests/testGetAdjacentObjects/PackageA.cpp
+tests/testGetAdjacentObjects/PackageA.h
+tests/testGetAdjacentObjects/PackageA.xsd
+tests/testGetAdjacentObjects/PackageB.cpp
+tests/testGetAdjacentObjects/PackageB.h
+tests/testGetAdjacentObjects/PackageB.xsd
+tests/testGetAdjacentObjects/testAssociationScenarios.cpp
+tests/testGetAdjacentObjects/testAssociationScenarios.h
+tests/testGetAdjacentObjects/testAssociationScenarios.mga
+tests/testGetAdjacentObjects/testAssociationScenarios.xsd
+tests/testGetAdjacentObjects/testAssociationScenarios_udm.udm
+tests/testOCL/SBML2.cpp
+tests/testOCL/SBML2.dtd
+tests/testOCL/SBML2.h
+tests/testOCL/SBML2.xsd
+tests/testOCL/SBML2_math.dtd
+tests/testOCL/SBML2_math.xsd
+tests/testOCL/SBML2_sbml.dtd
+tests/testOCL/SBML2_sbml.xsd
+tests/testOCL/SBML2_udm.xml
+tests/testOCL/SBML2_uml.mga
+tests/testUdmCint/GeneTF.cpp
+tests/testUdmCint/GeneTF.dtd
+tests/testUdmCint/GeneTF.h
+tests/testUdmCint/GeneTF.xsd
+tests/testUdmCint/GeneTF_GeneTF.dtd
+tests/testUdmCint/GeneTF_GeneTF.xsd
+tests/testUdmCint/GeneTF_GeneTF_xsd.h
+tests/testUdmCint/GeneTF_udm.xml
+tests/testUdmCint/GeneTF_uml.mga
+tests/testUdmCint/GeneTF_xsd.h
+tests/testUdmCint/SBML2Ex.cpp
+tests/testUdmCint/SBML2Ex.h
+tests/testUdmCint/SBML2Ex.xsd
+tests/testUdmCint/SBML2Ex_bc.xsd
+tests/testUdmCint/SBML2Ex_bc_xsd.h
+tests/testUdmCint/SBML2Ex_dbi.xsd
+tests/testUdmCint/SBML2Ex_dbi_xsd.h
+tests/testUdmCint/SBML2Ex_flux.xsd
+tests/testUdmCint/SBML2Ex_flux_xsd.h
+tests/testUdmCint/SBML2Ex_jd.xsd
+tests/testUdmCint/SBML2Ex_jd_xsd.h
+tests/testUdmCint/SBML2Ex_jigcell.xsd
+tests/testUdmCint/SBML2Ex_jigcell_xsd.h
+tests/testUdmCint/SBML2Ex_math.xsd
+tests/testUdmCint/SBML2Ex_math_xsd.h
+tests/testUdmCint/SBML2Ex_sbml.xsd
+tests/testUdmCint/SBML2Ex_sbml_xsd.h
+tests/testUdmCint/SBML2Ex_udm.xml
+tests/testUdmCint/SBML2Ex_uml.mga
+tests/testUdmCint/SBML2Ex_unigene.xsd
+tests/testUdmCint/SBML2Ex_unigene_xsd.h
+tests/testUdmCint/SBML2Ex_xhtml.xsd
+tests/testUdmCint/SBML2Ex_xhtml_xsd.h
+tests/testUdmCint/SBML2Ex_xsd.h
+tests/testUdmCint/tmp
+tests/test_assocInheritanceMGA/SignalFlow.cpp
+tests/test_assocInheritanceMGA/SignalFlow.h
+tests/test_assocInheritanceMGA/SignalFlow.xsd
+tests/test_assocInheritanceMGA/SignalFlow_uml.mga
+tests/test_ns/test.xml
+tests/test_ns/test_ns.cpp
+tests/test_ns/test_ns.h
+tests/test_ns/test_ns.xsd
+tests/test_ns/test_ns_A.xsd
+tests/test_ns/test_ns_AB.xsd
+tests/test_ns/test_ns_AB_ABAB.xsd
+tests/test_ns/test_ns_A_AA.xsd
+tests/test_ns/test_ns_B.xsd
+tests/test_ns/test_ns_udm.xml
+tests/test_ns/test_ns_uml.mga
+tests/test_ns2/CHost.cpp
+tests/test_ns2/CHost.h
+tests/test_ns2/CHost.xsd
+tests/test_ns2/CHost_A.xsd
+tests/test_ns2/CHost_B.xsd
+tests/test_ns2/CHost_C.xsd
+tests/test_ns2/CHost_udm.xml
+tests/test_ns2/CHost_uml.mga
+tests/test_refports/RefPort.cpp
+tests/test_refports/RefPort.h
+tests/test_refports/RefPort.xsd
+tests/test_refports/RefPort_udm.xml
Modified: UDM/trunk/Projects/Win32/VC10/tests/CreateLampDiagram/CreateLampDiagram.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/CreateLampDiagram/CreateLampDiagram.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/CreateLampDiagram/CreateLampDiagram.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -49,6 +49,7 @@
<ImportGroup Label="ExtensionSettings">
<Import Project="..\..\..\..\..\common-scripts\build_customization\udm.props" />
<Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -199,5 +200,6 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\..\..\common-scripts\build_customization\udm.targets" />
<Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.targets" />
</ImportGroup>
</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 Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Wed Sep 12 16:40:12 2012 (r4104)
@@ -117,11 +117,9 @@
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Debug|Win32.ActiveCfg = Debug|Win32
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Debug|Win32.Build.0 = Debug|Win32
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Debug|x64.ActiveCfg = Debug|x64
- {461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Debug|x64.Build.0 = Debug|x64
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Release|Win32.ActiveCfg = Release|Win32
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Release|Win32.Build.0 = Release|Win32
{461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Release|x64.ActiveCfg = Release|x64
- {461D768D-AEE4-4011-9AAF-8DC70E292F5A}.Release|x64.Build.0 = Release|x64
{F2B871C3-36D2-4781-B82D-FC6C572A9290}.Debug|Win32.ActiveCfg = Debug|Win32
{F2B871C3-36D2-4781-B82D-FC6C572A9290}.Debug|Win32.Build.0 = Debug|Win32
{F2B871C3-36D2-4781-B82D-FC6C572A9290}.Debug|x64.ActiveCfg = Debug|x64
Modified: UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -42,6 +42,10 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmudm.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')" />
@@ -74,6 +78,22 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmudm</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmudm</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmudm</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmudm</udm_RuleAfterTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmudm</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmudm</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmudm</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmudm</xme2mga_RuleBeforeTargets>
+ <mga2udmudm_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">udm</mga2udmudm_RuleBeforeTargets>
+ <mga2udmudm_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</mga2udmudm_RuleBeforeTargets>
+ <mga2udmudm_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">udm</mga2udmudm_RuleBeforeTargets>
+ <mga2udmudm_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm</mga2udmudm_RuleBeforeTargets>
+ <mga2udmudm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xme2mga</mga2udmudm_RuleAfterTargets>
+ <mga2udmudm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xme2mga</mga2udmudm_RuleAfterTargets>
+ <mga2udmudm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xme2mga</mga2udmudm_RuleAfterTargets>
+ <mga2udmudm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xme2mga</mga2udmudm_RuleAfterTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -227,7 +247,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)testGetAdjacentObjects.exe</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -256,62 +276,19 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\main.cpp" />
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageA.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageA.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageB.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageB.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\PackageA.cpp" />
+ <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\PackageB.cpp" />
+ <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.cpp" />
<ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\TestGetAdjacentObjects.cpp" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageA.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageA.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageB.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageB.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
+ <ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\PackageA.h" />
+ <ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\PackageB.h" />
+ <ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.h" />
<ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\testGetAdjacentObjects.h" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.xme">
- <FileType>Document</FileType>
+ <xme2mga Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.xme">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Converting %(FullPath) to $(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Converting %(FullPath) to $(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\testGetAdjacentObjects"
@@ -332,44 +309,37 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName).mga;$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName).mga;$(OutDir)Gen\tests\testGetAdjacentObjects\%(FileName)_udm.udm;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm">
<FileType>Document</FileType>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating UDM API files...</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating UDM API files...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)udm.exe" -o "$(OutDir)Gen\tests\testGetAdjacentObjects" %(FullPath)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)udm.exe" -o "$(OutDir)Gen\tests\testGetAdjacentObjects" %(FullPath)
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(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>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm">
- <FileType>Document</FileType>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating UDM API files...</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating UDM API files...</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)udmD.exe" -o "$(OutDir)Gen\tests\testGetAdjacentObjects" %(FullPath)
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(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|x64'">$(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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(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>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
+ </xme2mga>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
<Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <mga2udmudm Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.mga">
+ <FileType>Document</FileType>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">testAssociationScenarios</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">testAssociationScenarios</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">testAssociationScenarios</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">testAssociationScenarios</MetaName>
+ </mga2udmudm>
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm">
+ <FileType>Document</FileType>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">testAssociationScenarios</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">testAssociationScenarios</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">testAssociationScenarios</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">testAssociationScenarios</MetaName>
+ </udm>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmudm.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj.filters Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/testGetAdjacentObjects/testGetAdjacentObjects.vcxproj.filters Wed Sep 12 16:40:12 2012 (r4104)
@@ -15,28 +15,19 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageA.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageB.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageA.cpp">
+ <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageB.cpp">
+ <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\TestGetAdjacentObjects.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.cpp">
+ <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\PackageA.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\main.cpp">
+ <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\PackageB.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\TestGetAdjacentObjects.cpp">
+ <ClCompile Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -44,34 +35,29 @@
<ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\testGetAdjacentObjects.h">
<Filter>Header Files</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageA.h">
+ <ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\PackageB.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\PackageB.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\PackageA.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm">
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <xme2mga Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.xme">
<Filter>Resource Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageA.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\PackageB.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm">
+ </xme2mga>
+ </ItemGroup>
+ <ItemGroup>
+ <mga2udmudm Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.mga">
<Filter>Resource Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios.xme">
+ </mga2udmudm>
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\testGetAdjacentObjects\testAssociationScenarios_udm.udm">
<Filter>Resource Files</Filter>
- </CustomBuild>
+ </udm>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -42,6 +42,9 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.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')" />
@@ -74,6 +77,22 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -197,7 +216,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)testOCL.exe</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -216,54 +235,15 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\testOCL\main.cpp" />
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\testOCL\SBML2.cpp" />
<ClCompile Include="..\..\..\..\..\tests\testOCL\Test.cpp" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
+ <ClInclude Include="..\..\..\..\..\tests\testOCL\SBML2.h" />
<ClInclude Include="..\..\..\..\..\tests\testOCL\Test.h" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2_udm.xml">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.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>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.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)'=='Release|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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(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)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2_udm.xml">
- <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>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(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|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\testOCL\SBML2_uml.xme">
- <FileType>Document</FileType>
+ <xme2mga Include="..\..\..\..\..\tests\testOCL\SBML2_uml.xme">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\testOCL"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
@@ -280,10 +260,31 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testOCL\%(FileName).mga;$(OutDir)Gen\tests\testOCL\SBML2_udm.xml;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testOCL\%(FileName).mga;$(OutDir)Gen\tests\testOCL\SBML2_udm.xml;%(Outputs)</Outputs>
- </CustomBuild>
+ <FileType>Document</FileType>
+ </xme2mga>
+ <mga2udmxml Include="..\..\..\..\..\tests\testOCL\SBML2_uml.mga">
+ <FileType>Document</FileType>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SBML2</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SBML2</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SBML2</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SBML2</MetaName>
+ </mga2udmxml>
+ <udm Include="..\..\..\..\..\tests\testOCL\SBML2_udm.xml">
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SBML2</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SBML2</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SBML2</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SBML2</MetaName>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-t -v -T -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-t -v -T -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-t -v -T -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-t -v -T -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 %(AdditionalOptions)</AdditionalOptions>
+ </udm>
<None Include="..\..\..\..\..\tests\testOCL\versionCheck.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj.filters Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/testOCL/testOCL.vcxproj.filters Wed Sep 12 16:40:12 2012 (r4104)
@@ -15,36 +15,34 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\testOCL\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\testOCL\Test.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\testOCL\SBML2.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\testOCL\Test.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\..\..\tests\testOCL\SBML2.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\..\tests\testOCL\versionCheck.xml" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testOCL\SBML2_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testOCL\SBML2_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\tests\testOCL\SBML2_uml.xme" />
+ <xme2mga Include="..\..\..\..\..\tests\testOCL\SBML2_uml.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2udmxml Include="..\..\..\..\..\tests\testOCL\SBML2_uml.mga" />
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\testOCL\SBML2_udm.xml" />
</ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -46,6 +46,10 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.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')" />
@@ -90,6 +94,22 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm</mga2udmxml_RuleBeforeTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -105,7 +125,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\..\tests\testUdmCint;..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -127,7 +147,6 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)testUdmCint.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
@@ -135,10 +154,21 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>xcopy /y ..\..\..\..\..\tests\testUdmCint\*.xml "$(OutDir)Gen\tests\testUdmCint"
-cd "$(OutDir)Gen\tests\testUdmCint"
+ <Command>cd ..\..\..\..\..\tests\testUdmCint
"$(TargetPath)"</Command>
</PostBuildEvent>
+ <mga2udmxml />
+ <udm>
+ <IntegrateXSD>true</IntegrateXSD>
+ </udm>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>BUILD_ALWAYS</Outputs>
+ <Command>cd ..\..\..\..\..\tests\testUdmCint
+"$(TargetPath)"</Command>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
@@ -154,8 +184,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..\..\..\tests\testUdmCint;..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderOutputFile>$(IntDir)testUdmCint.pch</PrecompiledHeaderOutputFile>
@@ -172,21 +202,31 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>UdmPOID.lib;cppunitd_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(IntDir)testUdmCint.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
<PostBuildEvent>
- <Command>xcopy /y ..\..\..\..\..\tests\testUdmCint\*.xml "$(OutDir)Gen\tests\testUdmCint"
-cd "$(OutDir)Gen\tests\testUdmCint"
+ <Command>cd ..\..\..\..\..\tests\testUdmCint
"$(TargetPath)"</Command>
</PostBuildEvent>
+ <mga2udmxml />
+ <udm>
+ <IntegrateXSD>true</IntegrateXSD>
+ </udm>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>BUILD_ALWAYS</Outputs>
+ <Command>cd ..\..\..\..\..\tests\testUdmCint
+"$(TargetPath)"</Command>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
@@ -203,7 +243,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\..\tests\testUdmCint;..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -224,18 +264,29 @@
<AdditionalDependencies>UdmPOI.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>$(IntDir)testUdmCint.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
- <Command>xcopy /y ..\..\..\..\..\tests\testUdmCint\*.xml "$(OutDir)Gen\tests\testUdmCint"
-cd "$(OutDir)Gen\tests\testUdmCint"
+ <Command>cd ..\..\..\..\..\tests\testUdmCint
"$(TargetPath)"</Command>
</PostBuildEvent>
+ <mga2udmxml />
+ <udm>
+ <IntegrateXSD>true</IntegrateXSD>
+ </udm>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>BUILD_ALWAYS</Outputs>
+ <Command>cd ..\..\..\..\..\tests\testUdmCint
+"$(TargetPath)"</Command>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
@@ -252,7 +303,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\..\tests\testUdmCint;..\..\..\..\..\include;$(OutDir)Gen\tests\testUdmCint;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -270,20 +321,31 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UdmPOI.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>UdmPOI.lib;cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ProgramDatabaseFile>$(IntDir)testUdmCint.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PostBuildEvent>
- <Command>xcopy /y ..\..\..\..\..\tests\testUdmCint\*.xml "$(OutDir)Gen\tests\testUdmCint"
-cd "$(OutDir)Gen\tests\testUdmCint"
+ <Command>cd ..\..\..\..\..\tests\testUdmCint
"$(TargetPath)"</Command>
</PostBuildEvent>
+ <mga2udmxml />
+ <udm>
+ <IntegrateXSD>true</IntegrateXSD>
+ </udm>
+ <CustomBuildStep>
+ <Message>Running $(TargetName)</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>BUILD_ALWAYS</Outputs>
+ <Command>cd ..\..\..\..\..\tests\testUdmCint
+"$(TargetPath)"</Command>
+ </CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\testUdmCint\main.cpp">
@@ -306,46 +368,7 @@
<ClInclude Include="..\..\..\..\..\tests\testUdmCint\Test.h" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testUdmCint\GeneTF_udm.xml">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)\Gen\tests\testUdmCint" "%(FullPath)" -t -v -uGeneTF=http://kutykuruty.khm.edu
-cd "$(OutDir)\Gen\tests\testUdmCint"
-"$(OutDir)StrResGen.exe" GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd
-"$(OutDir)StrResGen.exe" GeneTF.xsd GeneTF_xsd
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)\Gen\tests\testUdmCint" "%(FullPath)" -t -v -uGeneTF=http://kutykuruty.khm.edu
-cd "$(OutDir)\Gen\tests\testUdmCint"
-"$(OutDir)StrResGen.exe" GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd
-"$(OutDir)StrResGen.exe" GeneTF.xsd GeneTF_xsd
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(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>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Udm %(FileName)</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Udm %(FileName)</Message>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testUdmCint\GeneTF_udm.xml">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testUdmCint" %(FullPath) -t -v -uGeneTF=http://kutykuruty.khm.edu
-cd "$(OutDir)Gen\tests\testUdmCint"
-"..\..\$(OutDir)StrResGenD.exe" GeneTF_GeneTF.xsd GeneTF_GeneTF_xsd
-"..\..\$(OutDir)StrResGenD.exe" GeneTF.xsd GeneTF_xsd
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testUdmCint" %(FullPath) -t -v -uGeneTF=http://kutykuruty.khm.edu
-cd "$(OutDir)Gen\tests\testUdmCint"
-"..\..\$(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|x64'">$(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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(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>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\testUdmCint\GeneTF_uml.xme">
- <FileType>Document</FileType>
+ <xme2mga Include="..\..\..\..\..\tests\testUdmCint\GeneTF_uml.xme">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\testUdmCint"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
@@ -362,73 +385,9 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testUdmCint\%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\GeneTF_udm.xml;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testUdmCint\%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\GeneTF_udm.xml;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testUdmCint\SBML2Ex_udm.xml">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\testUdmCint" "%(FullPath)" -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns
-cd "$(OutDir)Gen\tests\testUdmCint"
-"$(OutDir)StrResGen.exe" SBML2Ex_math.xsd SBML2Ex_math_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_flux.xsd SBML2Ex_flux_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_jd.xsd SBML2Ex_jd_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_bc.xsd SBML2Ex_bc_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex.xsd SBML2Ex_xsd
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\testUdmCint" "%(FullPath)" -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns
-cd "$(OutDir)Gen\tests\testUdmCint"
-"$(OutDir)StrResGen.exe" SBML2Ex_math.xsd SBML2Ex_math_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_flux.xsd SBML2Ex_flux_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_jd.xsd SBML2Ex_jd_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex_bc.xsd SBML2Ex_bc_xsd
-"$(OutDir)StrResGen.exe" SBML2Ex.xsd SBML2Ex_xsd
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testUdmCint\SBML2Ex.cpp;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2E!
x_bc.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xsd.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testUdmCint\SBML2Ex.cpp;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_!
bc.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xsd.h;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testUdmCint\SBML2Ex_udm.xml">
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testUdmCint" "%(FullPath)" -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns
-cd "$(OutDir)Gen\tests\testUdmCint"
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_math.xsd SBML2Ex_math_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_flux.xsd SBML2Ex_flux_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_jd.xsd SBML2Ex_jd_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_bc.xsd SBML2Ex_bc_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex.xsd SBML2Ex_xsd
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\testUdmCint" "%(FullPath)" -g -v -e -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns
-cd "$(OutDir)Gen\tests\testUdmCint"
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_math.xsd SBML2Ex_math_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_sbml.xsd SBML2Ex_sbml_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_dbi.xsd SBML2Ex_dbi_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_unigene.xsd SBML2Ex_unigene_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_xhtml.xsd SBML2Ex_xhtml_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_flux.xsd SBML2Ex_flux_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_jigcell.xsd SBML2Ex_jigcell_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_jd.xsd SBML2Ex_jd_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex_bc.xsd SBML2Ex_bc_xsd
-"..\..\$(OutDir)StrResGenD.exe" SBML2Ex.xsd SBML2Ex_xsd
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\testUdmCint\SBML2Ex.cpp;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_!
bc.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xsd.h;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\testUdmCint\SBML2Ex.cpp;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_math_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_sbml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_dbi_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_unigene_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xhtml_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_flux_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jigcell_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_jd_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc!
.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_bc_xsd.h;$(OutDir)Gen\tests\testUdmCint\SBML2Ex.xsd;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_xsd.h;%(Outputs)</Outputs>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_uml.xme">
<FileType>Document</FileType>
+ </xme2mga>
+ <xme2mga Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_uml.xme">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\testUdmCint"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
@@ -445,10 +404,49 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\testUdmCint%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_udm.xml;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\testUdmCint%(FileName).mga;$(OutDir)Gen\tests\testUdmCint\SBML2Ex_udm.xml;%(Outputs)</Outputs>
- </CustomBuild>
+ <FileType>Document</FileType>
+ </xme2mga>
+ <mga2udmxml Include="..\..\..\..\..\tests\testUdmCint\GeneTF_uml.mga">
+ <FileType>Document</FileType>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">GeneTF</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">GeneTF</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">GeneTF</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">GeneTF</MetaName>
+ </mga2udmxml>
+ <mga2udmxml Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_uml.mga">
+ <FileType>Document</FileType>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SBML2Ex</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SBML2Ex</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SBML2Ex</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SBML2Ex</MetaName>
+ </mga2udmxml>
+ <udm Include="..\..\..\..\..\tests\testUdmCint\GeneTF_udm.xml">
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">GeneTF</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">GeneTF</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">GeneTF</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">GeneTF</MetaName>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-t -v -T -u GeneTF=http://kutykuruty.khm.edu %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-t -v -T -u GeneTF=http://kutykuruty.khm.edu %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-t -v -T -u GeneTF=http://kutykuruty.khm.edu %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-t -v -T -u GeneTF=http://kutykuruty.khm.edu %(AdditionalOptions)</AdditionalOptions>
+ </udm>
+ <udm Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_udm.xml">
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SBML2Ex</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SBML2Ex</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SBML2Ex</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SBML2Ex</MetaName>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">-v -e -T -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">-v -e -T -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">-v -e -T -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">-v -e -T -q jigcell -i xhtml -u math=http://www.w3.org/1998/Math/MathML -u sbml=http://www.sbml.org/sbml/level2 -u dbi=http://www.dbi.tju.edu/xmlns/dbi -u unigene=http://www.dbi.tju.edu/xmlns/unigene -u xhtml=http://www.w3.org/1999/xhtml -u jigcell=http://mpf.biol.vt.edu/ns -u bc=http://www.sbml.org/2001/ns/biocharon -u flux=http://arep.med.harvard.edu/fluxns %(AdditionalOptions)</AdditionalOptions>
+ </udm>
<None Include="..\..\..\..\..\tests\testUdmCint\versionCheck.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj.filters Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/testUdmCint/testUdmCint.vcxproj.filters Wed Sep 12 16:40:12 2012 (r4104)
@@ -13,6 +13,9 @@
<UniqueIdentifier>{3861cd47-266d-4d58-b018-8fc389595648}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
+ <Filter Include="NewFilter1">
+ <UniqueIdentifier>{03d1ffa4-0138-43eb-99cb-49fc3e64959f}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\testUdmCint\main.cpp">
@@ -31,11 +34,15 @@
<None Include="..\..\..\..\..\tests\testUdmCint\versionCheck.xml" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testUdmCint\GeneTF_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\testUdmCint\SBML2Ex_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testUdmCint\GeneTF_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\testUdmCint\SBML2Ex_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\tests\testUdmCint\GeneTF_uml.xme" />
- <CustomBuild Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_uml.xme" />
+ <xme2mga Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_uml.xme" />
+ <xme2mga Include="..\..\..\..\..\tests\testUdmCint\GeneTF_uml.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2udmxml Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_uml.mga" />
+ <mga2udmxml Include="..\..\..\..\..\tests\testUdmCint\GeneTF_uml.mga" />
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\testUdmCint\SBML2Ex_udm.xml" />
+ <udm Include="..\..\..\..\..\tests\testUdmCint\GeneTF_udm.xml" />
</ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -45,6 +45,10 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.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')" />
@@ -77,6 +81,22 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -290,7 +310,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)TestSignalFlow.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -349,39 +369,11 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_assocInheritanceMGA\AssociationInheritanceTest.h" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
+ <ClInclude Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow.h" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\sf1.xme">
@@ -409,8 +401,7 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;%(Outputs)</Outputs>
</CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_meta.xme">
- <FileType>Document</FileType>
+ <mga2xmp Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_meta.xme">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Signalflow_meta.xme -> Signalflow_meta.xmp, Registering SignalFlow paradigm</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Signalflow_meta.xme -> Signalflow_meta.xmp, Registering SignalFlow paradigm</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "%(RootDir)%(Directory)"
@@ -435,37 +426,9 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)\SignalFlow.xmp;%(RootDir)%(Directory)\SignalFlow.xmp.log;%(RootDir)%(Directory)\SignalFlow.mta;%(RootDir)%(Directory)\%(FileName).mga;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)\SignalFlow.xmp;%(RootDir)%(Directory)\SignalFlow.xmp.log;%(RootDir)%(Directory)\SignalFlow.mta;%(RootDir)%(Directory)\%(FileName).mga;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SignaFlow_udm.xml -> C++ API</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SignaFlow_udm.xml -> C++ API</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_assocInheritanceMGA" "%(FullPath)"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_assocInheritanceMGA" "%(FullPath)"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.h;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.h;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow.xsd;%(Outputs)</Outputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SignaFlow_udm.xml -> C++ API</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SignaFlow_udm.xml -> C++ API</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_assocInheritanceMGA" "%(FullPath)"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(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|x64'">$(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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(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>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_uml.xme">
<FileType>Document</FileType>
+ </mga2xmp>
+ <xme2mga Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_uml.xme">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SignalFlow_uml.xme -> SignalFlow_udm.xml </Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SignalFlow_uml.xme -> SignalFlow_udm.xml </Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_assocInheritanceMGA"
@@ -486,9 +449,31 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_assocInheritanceMGA\%(FileName).mga;$(OutDir)Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml;%(Outputs)</Outputs>
- </CustomBuild>
+ <FileType>Document</FileType>
+ </xme2mga>
+ </ItemGroup>
+ <ItemGroup>
+ <mga2udmxml Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_uml.mga">
+ <FileType>Document</FileType>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SignalFlow</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SignalFlow</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SignalFlow</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SignalFlow</MetaName>
+ </mga2udmxml>
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_udm.xml">
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SignalFlow</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SignalFlow</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SignalFlow</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SignalFlow</MetaName>
+ </udm>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj.filters Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_assocInheritanceMGA/TestSignalFlow.vcxproj.filters Wed Sep 12 16:40:12 2012 (r4104)
@@ -11,35 +11,37 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_assocInheritanceMGA\AssociationInheritanceTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_assocInheritanceMGA\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\tests\test_assocInheritanceMGA\AssociationInheritanceTest.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_assocInheritanceMGA\SignalFlow_udm.xml" />
<CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\sf1.xme" />
- <CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_meta.xme" />
- <CustomBuild Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_uml.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2xmp Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_meta.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <xme2mga Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_uml.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2udmxml Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_uml.mga" />
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\test_assocInheritanceMGA\SignalFlow_udm.xml" />
</ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_childrenorder/test_childrenorder.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -264,7 +264,7 @@
<AdditionalIncludeDirectories>$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_childrenorder.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -328,6 +328,9 @@
<ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
<Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
+ <ProjectReference Include="..\RegisterLampDiagram\RegisterLampDiagram.vcxproj">
+ <Project>{dbe04af7-af6a-408d-8734-e45ea656441a}</Project>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_cintstring/test_cintstring.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -165,7 +165,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_cintstring.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_domstringdn/test_domstringdn.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -161,7 +161,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_domstringdn.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -338,6 +338,9 @@
<ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
<Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
+ <ProjectReference Include="..\RegisterLampDiagram\RegisterLampDiagram.vcxproj">
+ <Project>{dbe04af7-af6a-408d-8734-e45ea656441a}</Project>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_generic/test_generic.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -166,7 +166,7 @@
<AdditionalIncludeDirectories>$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_generic.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -348,6 +348,9 @@
<ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
<Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
+ <ProjectReference Include="..\RegisterLampDiagram\RegisterLampDiagram.vcxproj">
+ <Project>{dbe04af7-af6a-408d-8734-e45ea656441a}</Project>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_libs/test_libs.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -186,13 +186,13 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\samples;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>CPPUNIT_DLL;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -42,6 +42,10 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.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')" />
@@ -74,6 +78,22 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -110,7 +130,7 @@
</Command>
</PostBuildEvent>
<CustomBuildStep>
- <Command>cd "$(OutDir)Gen\tests\test_ns"
+ <Command>cd ..\..\..\..\..\tests\test_ns
"$(TargetPath)"
</Command>
</CustomBuildStep>
@@ -152,7 +172,7 @@
</Command>
</PostBuildEvent>
<CustomBuildStep>
- <Command>cd "$(OutDir)Gen\tests\test_ns"
+ <Command>cd ..\..\..\..\..\tests\test_ns
"$(TargetPath)"
</Command>
</CustomBuildStep>
@@ -195,7 +215,7 @@
</Command>
</PostBuildEvent>
<CustomBuildStep>
- <Command>cd "$(OutDir)Gen\tests\test_ns"
+ <Command>cd ..\..\..\..\..\tests\test_ns
"$(TargetPath)"
</Command>
</CustomBuildStep>
@@ -213,7 +233,7 @@
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_ns;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>UDM_DYNAMIC_LINKING;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>CPPUNIT_DLL;UDM_DYNAMIC_LINKING;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -221,7 +241,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)test_ns.exe</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -237,7 +257,7 @@
</Command>
</PostBuildEvent>
<CustomBuildStep>
- <Command>cd "$(OutDir)Gen\tests\test_ns"
+ <Command>cd ..\..\..\..\..\tests\test_ns
"$(TargetPath)"
</Command>
</CustomBuildStep>
@@ -248,72 +268,37 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_ns\main.cpp" />
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_ns\test_ns.cpp" />
<ClCompile Include="..\..\..\..\..\tests\test_ns\test_ns_test.cpp" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
+ <xme2mga Include="..\..\..\..\..\tests\test_ns\test_ns_uml.xme" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns_udm.xml">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_ns" "%(FullPath)" -t -v
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_ns" "%(FullPath)" -t -v
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(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>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
- </CustomBuild>
- <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>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(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|x64'">$(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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(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>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\test_ns\test_ns_uml.xme">
+ <mga2udmxml Include="..\..\..\..\..\tests\test_ns\test_ns_uml.mga">
<FileType>Document</FileType>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_ns"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\test_ns"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_ns\%(FileName).mga;$(OutDir)Gen\tests\test_ns\test_ns_udm.xml;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_ns\%(FileName).mga;$(OutDir)Gen\tests\test_ns\test_ns_udm.xml;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\test_ns"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\test_ns"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_ns\%(FileName).mga;$(OutDir)Gen\tests\test_ns\test_ns_udm.xml;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_ns\%(FileName).mga;$(OutDir)Gen\tests\test_ns\test_ns_udm.xml;%(Outputs)</Outputs>
- </CustomBuild>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">test_ns</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">test_ns</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">test_ns</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">test_ns</MetaName>
+ </mga2udmxml>
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\test_ns\test_ns_udm.xml">
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">test_ns</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">test_ns</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">test_ns</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">test_ns</MetaName>
+ </udm>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\..\tests\test_ns\test_ns.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj.filters Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns/test_ns.vcxproj.filters Wed Sep 12 16:40:12 2012 (r4104)
@@ -15,28 +15,28 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_ns\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_ns\test_ns_test.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_ns\test_ns.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns\test_ns_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns.h">
+ <xme2mga Include="..\..\..\..\..\tests\test_ns\test_ns_uml.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2udmxml Include="..\..\..\..\..\tests\test_ns\test_ns_uml.mga" />
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\test_ns\test_ns_udm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\..\tests\test_ns\test_ns.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns\test_ns_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\tests\test_ns\test_ns_uml.xme" />
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -42,6 +42,10 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.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')" />
@@ -74,6 +78,26 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)D</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)D</TargetName>
+ <mga2xmp_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xme2mga</mga2xmp_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2udmxml_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xme2mga</mga2udmxml_RuleAfterTargets>
+ <mga2xmp_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xme2mga</mga2xmp_RuleAfterTargets>
+ <mga2xmp_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xme2mga</mga2xmp_RuleAfterTargets>
+ <mga2xmp_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xme2mga</mga2xmp_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</xme2mga_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm</mga2udmxml_RuleBeforeTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -247,99 +271,41 @@
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_ns2\CHost.cpp" />
<ClCompile Include="..\..\..\..\..\tests\test_ns2\main.cpp" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
+ <xme2mga Include="..\..\..\..\..\tests\test_ns2\CHost.xme" />
+ <xme2mga Include="..\..\..\..\..\tests\test_ns2\CHost_uml.xme" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\tests\test_ns2\CHost.xme">
+ <mga2xmp Include="..\..\..\..\..\tests\test_ns2\CHost.mga">
<FileType>Document</FileType>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).xme -> %(FileName).xmp, Registering %(FileName) paradigm</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FileName).xme -> %(FileName).xmp, Registering %(FileName) paradigm</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "%(RootDir)%(Directory)"
-"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
-"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "%(RootDir)%(Directory)"
-"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
-"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).xmp;%(FileName).xmp.log;%(FileName).mta;%(FileName).mga;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FileName).xmp;%(FileName).xmp.log;%(FileName).mta;%(FileName).mga;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).xme -> %(FileName).xmp, Registering %(FileName) paradigm</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FileName).xme -> %(FileName).xmp, Registering %(FileName) paradigm</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "%(RootDir)%(Directory)"
-"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
-"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "%(RootDir)%(Directory)"
-"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
-"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).xmp;%(FileName).xmp.log;%(FileName).mta;%(FileName).mga;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FileName).xmp;%(FileName).xmp.log;%(FileName).mta;%(FileName).mga;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost_udm.xml">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_ns2" "%(FullPath)" -t -v
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_ns2" "%(FullPath)" -t -v
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(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>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
- </CustomBuild>
- <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>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(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|x64'">$(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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(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>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\test_ns2\CHost_uml.xme">
+ </mga2xmp>
+ <mga2udmxml Include="..\..\..\..\..\tests\test_ns2\CHost_uml.mga">
<FileType>Document</FileType>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_ns2"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\test_ns2"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_ns2\%(FileName).mga;$(OutDir)Gen\tests\test_ns2\CHost_udm.xml;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_ns2\%(FileName).mga;$(OutDir)Gen\tests\test_ns2\CHost_udm.xml;%(Outputs)</Outputs>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\test_ns2"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\test_ns2"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_ns2\%(FileName).mga;$(OutDir)Gen\tests\test_ns2\CHost_udm.xml;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_ns2\%(FileName).mga;$(OutDir)Gen\tests\test_ns2\CHost_udm.xml;%(Outputs)</Outputs>
- </CustomBuild>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CHost</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CHost</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CHost</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CHost</MetaName>
+ </mga2udmxml>
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\test_ns2\CHost_udm.xml">
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CHost</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CHost</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CHost</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CHost</MetaName>
+ </udm>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\..\tests\test_ns2\CHost.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj.filters Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_ns2/test_ns2.vcxproj.filters Wed Sep 12 16:40:12 2012 (r4104)
@@ -15,26 +15,29 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost.cpp">
+ <ClCompile Include="..\..\..\..\..\tests\test_ns2\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\..\tests\test_ns2\main.cpp">
+ <ClCompile Include="..\..\..\..\..\tests\test_ns2\CHost.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_ns2\CHost_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost.h">
+ <xme2mga Include="..\..\..\..\..\tests\test_ns2\CHost.xme" />
+ <xme2mga Include="..\..\..\..\..\tests\test_ns2\CHost_uml.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2udmxml Include="..\..\..\..\..\tests\test_ns2\CHost_uml.mga" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2xmp Include="..\..\..\..\..\tests\test_ns2\CHost.mga" />
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\test_ns2\CHost_udm.xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\..\tests\test_ns2\CHost.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_ns2\CHost_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\tests\test_ns2\CHost.xme" />
- <CustomBuild Include="..\..\..\..\..\tests\test_ns2\CHost_uml.xme" />
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -42,6 +42,10 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.props" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.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')" />
@@ -72,6 +76,22 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
+ <mga2xmp_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xme2mga</mga2xmp_RuleAfterTargets>
+ <mga2xmp_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xme2mga</mga2xmp_RuleAfterTargets>
+ <mga2xmp_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">xme2mga</mga2xmp_RuleAfterTargets>
+ <mga2xmp_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">xme2mga</mga2xmp_RuleAfterTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2xmp</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2xmp</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2xmp</xme2mga_RuleBeforeTargets>
+ <xme2mga_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2xmp</xme2mga_RuleBeforeTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">mga2udmxml</udm_RuleAfterTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">udm</mga2udmxml_RuleBeforeTargets>
+ <mga2udmxml_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">udm</mga2udmxml_RuleBeforeTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -82,7 +102,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;K:\git\UDM\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +124,7 @@
</Command>
</PostBuildEvent>
<CustomBuildStep>
- <Command>cd "$(OutDir)Gen\tests\test_refports"
+ <Command>cd ..\..\..\..\..\tests\test_refports
"$(TargetPath)"
</Command>
</CustomBuildStep>
@@ -124,7 +144,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;K:\git\UDM\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -144,7 +164,7 @@
</Command>
</PostBuildEvent>
<CustomBuildStep>
- <Command>cd "$(OutDir)Gen\tests\test_refports"
+ <Command>cd ..\..\..\..\..\tests\test_refports
"$(TargetPath)"
</Command>
</CustomBuildStep>
@@ -163,7 +183,7 @@
</Command>
</PreBuildEvent>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;K:\git\UDM\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -185,7 +205,7 @@
</Command>
</PostBuildEvent>
<CustomBuildStep>
- <Command>cd "$(OutDir)Gen\tests\test_refports"
+ <Command>cd ..\..\..\..\..\tests\test_refports
"$(TargetPath)"
</Command>
</CustomBuildStep>
@@ -204,7 +224,7 @@
</Command>
</PreBuildEvent>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..\..\..\include;$(OutDir)Gen\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\..\include;K:\git\UDM\tests\test_refports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CONSOLE;UDM_DYNAMIC_LINKING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@@ -213,7 +233,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -225,7 +245,7 @@
</Command>
</PostBuildEvent>
<CustomBuildStep>
- <Command>cd "$(OutDir)Gen\tests\test_refports"
+ <Command>cd ..\..\..\..\..\tests\test_refports
"$(TargetPath)"
</Command>
</CustomBuildStep>
@@ -237,109 +257,48 @@
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort.h">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </CustomBuild>
+ <ClInclude Include="..\..\..\..\..\tests\test_refports\RefPort.h" />
<ClInclude Include="..\..\..\..\..\tests\test_refports\RefPortsTest.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\tests\test_refports\main.cpp" />
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_refports\RefPort.cpp" />
<ClCompile Include="..\..\..\..\..\tests\test_refports\RefPortsTest.cpp" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort_udm.xml">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating UDM API files</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating UDM API files</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_refports" "%(FullPath)"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(OutDir)Udm.exe" -o "$(OutDir)Gen\tests\test_refports" "%(FullPath)"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_refports\RefPort.h;$(OutDir)Gen\tests\test_refports\RefPort.cpp;$(OutDir)Gen\tests\test_refports\RefPort.xsd;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_refports\RefPort.h;$(OutDir)Gen\tests\test_refports\RefPort.cpp;$(OutDir)Gen\tests\test_refports\RefPort.xsd;%(Outputs)</Outputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Udm.exe</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Udm.exe</AdditionalInputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort_udm.xml">
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating UDM API files</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating UDM API files</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_refports" "%(FullPath)"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(OutDir)UdmD.exe" -o "$(OutDir)Gen\tests\test_refports" "%(FullPath)"
-</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>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(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>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)UdmD.exe</AdditionalInputs>
- <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)UdmD.exe</AdditionalInputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\test_refports\RefPortGme.xme">
+ <xme2mga Include="..\..\..\..\..\tests\test_refports\RefPortGme.xme">
<FileType>Document</FileType>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).xme -> %(FileName).xmp, Registering RefPort paradigm</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FileName).xme -> %(FileName).xmp, Registering RefPort paradigm</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "%(RootDir)%(Directory)"
-"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
-"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "%(RootDir)%(Directory)"
-"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
-"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RootDir)%(Directory)RefPortGme.mga;%(RootDir)%(Directory)RefPort.mta;%(RootDir)%(Directory)RefPort.xmp;%(RootDir)%(Directory)RefPort.xmp.log;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RootDir)%(Directory)RefPortGme.mga;%(RootDir)%(Directory)RefPort.mta;%(RootDir)%(Directory)RefPort.xmp;%(RootDir)%(Directory)RefPort.xmp.log;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).xme -> %(FileName).xmp, Registering RefPort paradigm</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FileName).xme -> %(FileName).xmp, Registering RefPort paradigm</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "%(RootDir)%(Directory)"
-"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
-"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "%(RootDir)%(Directory)"
-"$(UDM_PATH)\etc\CreateMga" "%(FileName).xme" "%(FileName).mga" MetaGME
-"$(UDM_PATH)\etc\CreateXmp" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RootDir)%(Directory)RefPortGme.mga;%(RootDir)%(Directory)RefPort.mta;%(RootDir)%(Directory)RefPort.xmp;%(RootDir)%(Directory)RefPort.xmp.log;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RootDir)%(Directory)RefPortGme.mga;%(RootDir)%(Directory)RefPort.mta;%(RootDir)%(Directory)RefPort.xmp;%(RootDir)%(Directory)RefPort.xmp.log;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\tests\test_refports\RefPortUml.xme">
+ </xme2mga>
+ <mga2udmxml Include="..\..\..\..\..\tests\test_refports\RefPortUml.xme">
<FileType>Document</FileType>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(FileName).xme -> %(FileName).mga</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(FileName).xme -> %(FileName).mga</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(TargetDir)\Gen\tests\test_refports"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cd "$(TargetDir)\Gen\tests\test_refports"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Gen\tests\test_refports\%(FileName).mga;$(OutDir)Gen\tests\test_refports\RefPort_udm.xml;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)Gen\tests\test_refports\%(FileName).mga;$(OutDir)Gen\tests\test_refports\RefPort_udm.xml;%(Outputs)</Outputs>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(FileName).xme -> %(FileName).mga</Message>
- <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(FileName).xme -> %(FileName).mga</Message>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(TargetDir)\Gen\tests\test_refports"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cd "$(TargetDir)\Gen\tests\test_refports"
-"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Gen\tests\test_refports\%(FileName).mga;$(OutDir)Gen\tests\test_refports\RefPort_udm.xml;%(Outputs)</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)Gen\tests\test_refports\%(FileName).mga;$(OutDir)Gen\tests\test_refports\RefPort_udm.xml;%(Outputs)</Outputs>
- </CustomBuild>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RefPort</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RefPort</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">RefPort</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">RefPort</MetaName>
+ </mga2udmxml>
+ </ItemGroup>
+ <ItemGroup>
+ <mga2xmp Include="..\..\..\..\..\tests\test_refports\RefPortGme.mga">
+ <FileType>Document</FileType>
+ <OutFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(RelativeDir)RefPort.xmp</OutFile>
+ <OutFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(RelativeDir)RefPort.xmp</OutFile>
+ <OutFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(RelativeDir)RefPort.xmp</OutFile>
+ <OutFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(RelativeDir)RefPort.xmp</OutFile>
+ </mga2xmp>
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\test_refports\RefPort_udm.xml">
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RefPort</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RefPort</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">RefPort</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">RefPort</MetaName>
+ </udm>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2xmp.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\xme2mga.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\mga2udmxml.targets" />
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj.filters Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_refports/test_refports.vcxproj.filters Wed Sep 12 16:40:12 2012 (r4104)
@@ -18,31 +18,31 @@
<ClInclude Include="..\..\..\..\..\tests\test_refports\RefPortsTest.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\..\..\tests\test_refports\RefPort.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_refports\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\tests\test_refports\RefPortsTest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\..\..\tests\test_refports\RefPort.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Debug\Gen\tests\test_refports\RefPort_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort.h">
- <Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="..\..\..\..\..\Build\Win32\VC10\Release\Gen\tests\test_refports\RefPort_udm.xml" />
- <CustomBuild Include="..\..\..\..\..\tests\test_refports\RefPortGme.xme" />
- <CustomBuild Include="..\..\..\..\..\tests\test_refports\RefPortUml.xme" />
+ <xme2mga Include="..\..\..\..\..\tests\test_refports\RefPortGme.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2xmp Include="..\..\..\..\..\tests\test_refports\RefPortGme.mga" />
+ </ItemGroup>
+ <ItemGroup>
+ <mga2udmxml Include="..\..\..\..\..\tests\test_refports\RefPortUml.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\tests\test_refports\RefPort_udm.xml" />
</ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/Projects/Win32/VC10/tests/test_simpleudmops/LampTest.vcxproj Wed Sep 12 16:40:12 2012 (r4104)
@@ -164,7 +164,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>cppunit.lib</AdditionalDependencies>
+ <AdditionalDependencies>cppunit_dllx64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)LampTest.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -349,6 +349,9 @@
<ProjectReference Include="..\CreateLampDiagram\CreateLampDiagram.vcxproj">
<Project>{3fb0a5a6-8815-45a3-8d68-777c708410fb}</Project>
</ProjectReference>
+ <ProjectReference Include="..\RegisterLampDiagram\RegisterLampDiagram.vcxproj">
+ <Project>{dbe04af7-af6a-408d-8734-e45ea656441a}</Project>
+ </ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Modified: UDM/trunk/make.msbuild
==============================================================================
--- UDM/trunk/make.msbuild Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/make.msbuild Wed Sep 12 16:40:12 2012 (r4104)
@@ -26,16 +26,22 @@
</Target>
<Target Name="BuildVS10" DependsOnTargets="CheckEnv">
- <MSBuild Projects="Projects\Win32\VC10\src\Udm.sln" Targets="Build" Properties="Configuration=Debug" />
+ <MSBuild Projects="Projects\Win32\VC10\src\Udm.sln" Targets="UdmDll" Properties="Configuration=Debug" />
<MSBuild Projects="Projects\Win32\VC10\src\Udm.sln" Targets="Build" Properties="Configuration=Release" />
<MSBuild Projects="Projects\Win32\VC10\src\UdmCli.sln" Targets="Build" Properties="Configuration=Release" />
<MSBuild Projects="Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj" Targets="Build" Properties="Configuration=Release27" />
- <!-- TODO: tests -->
+ </Target>
+ <Target Name="TestVS10">
+ <MSBuild Projects="Projects\Win32\VC10\tests\UdmTests.sln" Targets="Build" Properties="Configuration=Debug" />
+ <MSBuild Projects="Projects\Win32\VC10\tests\UdmTests.sln" Targets="Build" Properties="Configuration=Release" />
</Target>
<Target Name="BuildVS10_x64" DependsOnTargets="CheckEnv">
<MSBuild Projects="Projects\Win32\VC10\src\Udm.sln" Targets="Build" Properties="Configuration=Debug;Platform=x64" />
<MSBuild Projects="Projects\Win32\VC10\src\Udm.sln" Targets="Build" Properties="Configuration=Release;Platform=x64" />
- <!-- TODO: tests -->
+ </Target>
+ <Target Name="TestVS10_x64" DependsOnTargets="CheckEnv">
+ <MSBuild Projects="Projects\Win32\VC10\tests\UdmTests.sln" Targets="Build" Properties="Configuration=Debug;Platform=x64" />
+ <MSBuild Projects="Projects\Win32\VC10\tests\UdmTests.sln" Targets="Build" Properties="Configuration=Release;Platform=x64" />
</Target>
<Target Name="UdmCliGen" DependsOnTargets="CheckEnv">
<MSBuild Projects="src\UdmCliGen\make.msbuild"/>
Modified: UDM/trunk/tests/test_staticleaksdll/DllMain.cpp
==============================================================================
--- UDM/trunk/tests/test_staticleaksdll/DllMain.cpp Wed Sep 12 16:39:10 2012 (r4103)
+++ UDM/trunk/tests/test_staticleaksdll/DllMain.cpp Wed Sep 12 16:40:12 2012 (r4104)
@@ -18,7 +18,7 @@
//RefPort::Initialize();
LampDiagram::Initialize();
UdmUtil::stacktrace();
-#if defined(_M_IX86)
+#if defined(_M_IX86) // fails with cppunit dll, since there is only one test registry
main(0, NULL);
#endif
}
\ No newline at end of file
More information about the Mobies-commit
mailing list