[Mobies-commit] [commit] r4322 - in UDM/trunk: . Projects/Win32/VC10/samples Projects/Win32/VC10/samples/cross_links Projects/Win32/VC10/tests samples/cross_links scripts
ksmyth at redhat3.isis.vanderbilt.edu
ksmyth at redhat3.isis.vanderbilt.edu
Fri Sep 26 10:25:21 CDT 2014
Author: ksmyth
Date: Fri Sep 26 10:25:20 2014
New Revision: 4322
Log:
Fix archive-model-files.bat VC10 Release
Deleted:
UDM/trunk/samples/cross_links/cross_links.dsp
UDM/trunk/samples/cross_links/cross_links.dsw
Modified:
UDM/trunk/.gitignore
UDM/trunk/Projects/Win32/VC10/samples/cross_links/cross_links.vcxproj
UDM/trunk/Projects/Win32/VC10/samples/cross_links/cross_links.vcxproj.filters
UDM/trunk/Projects/Win32/VC10/samples/samples-paths.props
UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
UDM/trunk/scripts/_archive-model-files.bat
UDM/trunk/scripts/archive-model-files.bat
UDM/trunk/scripts/vc10-env.bat
Modified: UDM/trunk/.gitignore
==============================================================================
--- UDM/trunk/.gitignore Wed Sep 24 09:50:47 2014 (r4321)
+++ UDM/trunk/.gitignore Fri Sep 26 10:25:20 2014 (r4322)
@@ -218,6 +218,10 @@
*.vcproj.*.user
*.ncb
*.suo
+ipch
+*.opensdf
+*.sdf
+*.vcxproj.user
bin/UdmDll_3_2.dll
bin/UdmDll_3_2D.dll
lib/File2Code.lib
@@ -242,3 +246,31 @@
lib/UdmXmiD.lib
lib/Uml.lib
lib/UmlD.lib
+Projects/Win32/VC10/src/UdmCli/obj/
+Projects/Win32/VC10/tests/test_ns_nested_models/Release/
+WiX/Release/
+WiX/UdmWiX.vcxproj.user
+bin/Python26/udm_pyd26.pdb
+bin/Python27/udm_pyd27.pdb
+model-files-VC9-Release.zip
+model-files-VC10-Release.zip
+samples/CL_udm.udm
+samples/LampDiagram_udm.xml
+samples/cross_links/CD1.cpp
+samples/cross_links/CD1.h
+samples/cross_links/CD1.xsd
+samples/cross_links/CD1_xsd.h
+samples/cross_links/CD2.cpp
+samples/cross_links/CD2.h
+samples/cross_links/CD2.xsd
+samples/cross_links/CD2_xsd.h
+samples/cross_links/CD3.cpp
+samples/cross_links/CD3.h
+samples/cross_links/CD3.xsd
+samples/cross_links/CD3_xsd.h
+samples/cross_links/CL.cpp
+samples/cross_links/CL.h
+samples/cross_links/CL.mga
+samples/cross_links/CL.xsd
+samples/cross_links/CL_udm.udm
+samples/cross_links/CL_xsd.h
Modified: UDM/trunk/Projects/Win32/VC10/samples/cross_links/cross_links.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/samples/cross_links/cross_links.vcxproj Wed Sep 24 09:50:47 2014 (r4321)
+++ UDM/trunk/Projects/Win32/VC10/samples/cross_links/cross_links.vcxproj Fri Sep 26 10:25:20 2014 (r4322)
@@ -27,6 +27,8 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="..\..\..\..\..\common-scripts\build_customization\udm.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')" />
@@ -46,6 +48,11 @@
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">*.obj;*.ilk;*.pdb;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.bat;$(TargetPath);*.xsd;*.xml</ExtensionsToDeleteOnClean>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
+ <CustomBuildBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ClCompile</CustomBuildBeforeTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">mga2udmudm</udm_RuleAfterTargets>
+ <udm_RuleAfterTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">mga2udmudm</udm_RuleAfterTargets>
+ <mga2udmudm_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">udm</mga2udmudm_RuleBeforeTargets>
+ <mga2udmudm_RuleBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">udm</mga2udmudm_RuleBeforeTargets>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -61,7 +68,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(UDM_PATH)\samples\cross_links;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -73,17 +80,12 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<CompileAs>Default</CompileAs>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>UmlD.lib;UdmBaseD.lib;UdmDomD.lib;UdmUtilD.lib;xerces-c_2.lib;zlibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)cross_linksD.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -95,21 +97,6 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
@@ -126,7 +113,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(UDM_PATH)\samples\cross_links;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -138,17 +125,12 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>Uml.lib;UdmBase.lib;UdmDom.lib;UdmUtil.lib;xerces-c_2.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)cross_links.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -159,67 +141,12 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
- <CustomBuild>
- <ExcludedFromBuild>true</ExcludedFromBuild>
- </CustomBuild>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="$(ReleaseGenPath)\CD1.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="$(DebugGenPath)\CD1.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- </ClCompile>
- <ClCompile Include="$(ReleaseGenPath)\CD2.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="$(DebugGenPath)\CD2.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- </ClCompile>
- <ClCompile Include="$(DebugGenPath)\CD3.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- </ClCompile>
- <ClCompile Include="$(ReleaseGenPath)\CD3.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="$(ReleaseGenPath)\CL.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="$(DebugGenPath)\CL.cpp">
- <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
- </ClCompile>
+ <ClCompile Include="..\..\..\..\..\samples\cross_links\CD1.cpp" />
+ <ClCompile Include="..\..\..\..\..\samples\cross_links\CD2.cpp" />
+ <ClCompile Include="..\..\..\..\..\samples\cross_links\CD3.cpp" />
+ <ClCompile Include="..\..\..\..\..\samples\cross_links\CL.cpp" />
<ClCompile Include="..\..\..\..\..\samples\cross_links\cross_links.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -231,18 +158,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="$(ReleaseGenPath)\CD1.h" />
- <CustomBuild Include="$(DebugGenPath)\CD1.h" />
- <CustomBuild Include="$(ReleaseGenPath)\CD2.h" />
- <CustomBuild Include="$(DebugGenPath)\CD2.h" />
- <CustomBuild Include="$(ReleaseGenPath)\CD3.h" />
- <CustomBuild Include="$(DebugGenPath)\CD3.h" />
- <CustomBuild Include="$(ReleaseGenPath)\CL.h" />
- <CustomBuild Include="$(DebugGenPath)\CL.h" />
- </ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\..\..\..\samples\cross_links\CL.xme">
- <FileType>Document</FileType>
+ <mga2udmudm Include="..\..\..\..\..\samples\cross_links\CL.xme">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(GenPath)"
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
@@ -251,22 +167,33 @@
"$(UDM_PATH)\etc\xme2udmxml" "%(FullPath)" "%(FileName).mga"
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenPath)\%(FileName).mga;$(GenPath)\CL_udm.udm;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="$(DebugGenPath)\CL_udm.udm">
<FileType>Document</FileType>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(OutDir)UdmD.exe" -o "$(GenPath)" "%(FullPath)"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenPath)\CD1.cpp;$(GenPath)\CD2.cpp;$(GenPath)\CD3.cpp;$(GenPath)\CL.cpp;$(GenPath)\CD1.h;$(GenPath)\CD2.h;$(GenPath)\CD3.h;$(GenPath)\CL.h;$(GenPath)\CD1.xsd;$(GenPath)\CD2.xsd;$(GenPath)\CD3.xsd;$(GenPath)\CL.xsd;%(Outputs)</Outputs>
- </CustomBuild>
- <CustomBuild Include="$(ReleaseGenPath)\CL_udm.udm">
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CL</MetaName>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CL</MetaName>
+ </mga2udmudm>
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\samples\cross_links\CL_udm.udm">
<FileType>Document</FileType>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(OutDir)Udm.exe" -o "$(GenPath)" "%(FullPath)"
-</Command>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenPath)\CD1.cpp;$(GenPath)\CD2.cpp;$(GenPath)\CD3.cpp;$(GenPath)\CL.cpp;$(GenPath)\CD1.h;$(GenPath)\CD2.h;$(GenPath)\CD3.h;$(GenPath)\CL.h;$(GenPath)\CD1.xsd;$(GenPath)\CD2.xsd;$(GenPath)\CD3.xsd;$(GenPath)\CL.xsd;%(Outputs)</Outputs>
- </CustomBuild>
- <None Include="..\..\..\..\..\samples\cross_links\ReadMe.txt" />
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CL</MetaName>
+ <IntegrateXSD Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IntegrateXSD>
+ <MetaName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CL</MetaName>
+ <IntegrateXSD Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IntegrateXSD>
+ </udm>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD1.h" />
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD1_xsd.h" />
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD2.h" />
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD2_xsd.h" />
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD3.h" />
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD3_xsd.h" />
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CL.h" />
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CL_xsd.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\mga2udmudm.targets" />
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/samples/cross_links/cross_links.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/samples/cross_links/cross_links.vcxproj.filters Wed Sep 24 09:50:47 2014 (r4321)
+++ UDM/trunk/Projects/Win32/VC10/samples/cross_links/cross_links.vcxproj.filters Fri Sep 26 10:25:20 2014 (r4322)
@@ -18,61 +18,49 @@
<ClCompile Include="..\..\..\..\..\samples\cross_links\cross_links.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="$(ReleaseGenPath)\CD1.cpp">
+ <ClCompile Include="..\..\..\..\..\samples\cross_links\CD1.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="$(DebugGenPath)\CD1.cpp">
+ <ClCompile Include="..\..\..\..\..\samples\cross_links\CD2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="$(ReleaseGenPath)\CD2.cpp">
+ <ClCompile Include="..\..\..\..\..\samples\cross_links\CD3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="$(DebugGenPath)\CD2.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="$(DebugGenPath)\CD3.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="$(ReleaseGenPath)\CD3.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="$(ReleaseGenPath)\CL.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="$(DebugGenPath)\CL.cpp">
+ <ClCompile Include="..\..\..\..\..\samples\cross_links\CL.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <None Include="..\..\..\..\..\samples\cross_links\ReadMe.txt" />
+ <mga2udmudm Include="..\..\..\..\..\samples\cross_links\CL.xme" />
+ </ItemGroup>
+ <ItemGroup>
+ <udm Include="..\..\..\..\..\samples\cross_links\CL_udm.udm" />
</ItemGroup>
<ItemGroup>
- <CustomBuild Include="$(DebugGenPath)\CD1.h">
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD1.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="$(DebugGenPath)\CD2.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD1_xsd.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="$(DebugGenPath)\CD3.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD2.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="$(DebugGenPath)\CL.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD2_xsd.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="$(DebugGenPath)\CL_udm.udm" />
- <CustomBuild Include="$(ReleaseGenPath)\CD1.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD3.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="$(ReleaseGenPath)\CD2.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CD3_xsd.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="$(ReleaseGenPath)\CD3.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CL.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="$(ReleaseGenPath)\CL.h">
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\samples\cross_links\CL_xsd.h">
<Filter>Header Files</Filter>
- </CustomBuild>
- <CustomBuild Include="$(ReleaseGenPath)\CL_udm.udm" />
- <CustomBuild Include="..\..\..\..\..\samples\cross_links\CL.xme" />
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/samples/samples-paths.props
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/samples/samples-paths.props Wed Sep 24 09:50:47 2014 (r4321)
+++ UDM/trunk/Projects/Win32/VC10/samples/samples-paths.props Fri Sep 26 10:25:20 2014 (r4322)
@@ -16,7 +16,7 @@
<AdditionalIncludeDirectories>..\..\..\..\..\include;$(GenPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(UDM_PATH)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PreBuildEvent>
<Message>
Modified: UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Wed Sep 24 09:50:47 2014 (r4321)
+++ UDM/trunk/Projects/Win32/VC10/tests/UdmTests.sln Fri Sep 26 10:25:20 2014 (r4322)
@@ -38,6 +38,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ns_nested", "test_ns_nested\test_ns_nested.vcxproj", "{CCE9DFB3-8014-4678-AEB1-CF6704E11903}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_links", "..\samples\cross_links\cross_links.vcxproj", "{4CA139A6-D338-4C6D-B9AD-86B65B8E5129}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -192,6 +194,12 @@
{CCE9DFB3-8014-4678-AEB1-CF6704E11903}.Release|Win32.Build.0 = Release|Win32
{CCE9DFB3-8014-4678-AEB1-CF6704E11903}.Release|x64.ActiveCfg = Release|x64
{CCE9DFB3-8014-4678-AEB1-CF6704E11903}.Release|x64.Build.0 = Release|x64
+ {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Debug|Win32.Build.0 = Debug|Win32
+ {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Debug|x64.ActiveCfg = Debug|Win32
+ {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Release|Win32.ActiveCfg = Release|Win32
+ {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Release|Win32.Build.0 = Release|Win32
+ {4CA139A6-D338-4C6D-B9AD-86B65B8E5129}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: UDM/trunk/scripts/_archive-model-files.bat
==============================================================================
--- UDM/trunk/scripts/_archive-model-files.bat Wed Sep 24 09:50:47 2014 (r4321)
+++ UDM/trunk/scripts/_archive-model-files.bat Fri Sep 26 10:25:20 2014 (r4322)
@@ -1,4 +1,4 @@
- at echo off
+ at echo on
setlocal
@@ -10,14 +10,20 @@
rem Set environment
call "%_UDM_PATH%\scripts\%_VC%-env.bat"
-if ERRORLEVEL 1 echo Environment not set & exit /b
+if ERRORLEVEL 1 echo Environment not set & exit /b 1
-pushd %_UDM_PATH%\Build\Win32\%_VC%\%_UDM_BUILD%\Gen
-zip -r %_UDM_PATH%\model-files-%_VC%-%_UDM_BUILD%.zip . -i *_udm.xml -i *_udm.udm
+if "%_VC%" == "VC10" (
+xcopy /y/d samples\cross_links\CL_udm.udm samples\ || exit /b 2
+xcopy /y/d samples\CreateLampModel\LampDiagram_udm.xml samples\ || exit /b 2
+zip %_UDM_PATH%\model-files-%_VC%-%_UDM_BUILD%.zip samples/CL_udm.udm samples/LampDiagram_udm.xml tests/testGetAdjacentObjects/testAssociationScenarios_udm.udm tests/testOCL/SBML2_udm.xml tests/testUdmCint/GeneTF_udm.xml tests/testUdmCint/SBML2Ex_udm.xml tests/test_assocInheritanceMGA/SignalFlow_udm.xml tests/test_ns/test_ns_udm.xml tests/test_ns2/CHost_udm.xml tests/test_refports/RefPort_udm.xml judm/samples/GeneTF/meta/GeneTF_udm.xml judm/samples/GeneTRE/meta/GeneTRE_udm.xml judm/samples/SBML2Ex/meta/SBML2Ex_udm.xml judm/samples/TimeSeries/meta/TimeSeries_udm.xml || exit /b 3
+) else (
+pushd %_UDM_PATH%\Build\Win32\%_VC%\%_UDM_BUILD%\Gen || exit /b 2
+zip -r %_UDM_PATH%\model-files-%_VC%-%_UDM_BUILD%.zip . -i *_udm.xml -i *_udm.udm || exit /b 3
popd
pushd %_UDM_PATH%
-zip -r %_UDM_PATH%\model-files-%_VC%-%_UDM_BUILD%.zip judm -i *_udm.xml -i *_udm.udm -x judm/build/*
+zip -r %_UDM_PATH%\model-files-%_VC%-%_UDM_BUILD%.zip judm -i *_udm.xml -i *_udm.udm -x judm/build/* || exit /b 4
popd
+)
-exit /b
+exit /b 0
Modified: UDM/trunk/scripts/archive-model-files.bat
==============================================================================
--- UDM/trunk/scripts/archive-model-files.bat Wed Sep 24 09:50:47 2014 (r4321)
+++ UDM/trunk/scripts/archive-model-files.bat Fri Sep 26 10:25:20 2014 (r4322)
@@ -1,11 +1,11 @@
- at echo off
+ at echo on
-if /i not "%1"=="VC7.1" if /i not "%1"=="VC8" if /i not "%1"=="VC9" goto :usage
+if /i not "%1"=="VC10" if /i not "%1"=="VC8" if /i not "%1"=="VC9" goto :usage
if /i not "%2"=="Debug" if /i not "%2"=="Release" goto :usage
cmd /c "call "%~dp0_%~nx0" %*"
-exit /b
+exit /b %ERRORLEVEL%
:usage
echo zips model files necessary for Linux build.
Modified: UDM/trunk/scripts/vc10-env.bat
==============================================================================
--- UDM/trunk/scripts/vc10-env.bat Wed Sep 24 09:50:47 2014 (r4321)
+++ UDM/trunk/scripts/vc10-env.bat Fri Sep 26 10:25:20 2014 (r4322)
@@ -1,4 +1,4 @@
- at echo off
+ at echo on
: Read UDM_3RDPARTY_PATH and JAVA_HOME from script with local settings
if exist "%~dp0"vc10-env-local.bat call "%~dp0"vc10-env-local.bat
More information about the Mobies-commit
mailing list