Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit f0b909e6 authored by Harald Martini's avatar Harald Martini Committed by Markus Quaritsch
Browse files

Pull request #288: updated build targets, added mockup suffix 

Merge in VECTO/vecto-dev from VECTO/hm_vecto-dev:develop to develop

* commit 'bf8802c0':
  updated build targets, added mockup suffix
parents 5fac0f17 bf8802c0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 0
View file @ f0b909e6
......@@ -226,3 +226,4 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum
/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/EM_Maps.xlsx
/Nuget
/.idea/.idea.hm_vecto-dev.dir/.idea
Directory.Build.props
+ 4
− 0
View file @ f0b909e6
......@@ -51,4 +51,8 @@
<DebugSymbols>false</DebugSymbols>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='MockupDeploy'">
<VersionSuffix>Mockup</VersionSuffix>
</PropertyGroup>
</Project>
\ No newline at end of file
Directory.Build.targets
+ 28
− 20
View file @ f0b909e6
......@@ -11,23 +11,24 @@
<Message Text="Compiling the program in $(Configuration) Configuration" Importance="high" />
</Target>-->
<!-- msbuild VECTO.sln -target:CustomClean -->
<Target Name="CustomClean" >
<!-- BeforeTargets="BeforeBuild" -->
<Target Name="CustomClean" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
<Message Text="Removing old files" Importance="high" />
<RemoveDir Directories="$(SolutionDir)VECTO\bin\" />
<RemoveDir Directories="$(SolutionDir)HashingTool\bin\" />
<RemoveDir Directories="$(SolutionDir)HashingCmd\bin\" />
<RemoveDir Directories="$(SolutionDir)VectoConsole\bin\" />
<RemoveDir Directories="$(SolutionDir)VECTO\bin\" />
<RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" />
<RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" />
<RemoveDir Directories="$(SolutionDir)Tools\VECTOConsoleStart\bin\" />
<RemoveDir Directories="$(SolutionDir)Tools\VECTOMultistageStart\bin\" />
<RemoveDir Directories="$(SolutionDir)Tools\VECTOStart\bin\" />
<RemoveDir Directories="$(SolutionDir)VectoCore\VectoCore\bin\" />
<RemoveDir Directories="$(SolutionDir)VectoCommon\VectoCommon\bin\"/>
<RemoveDir Directories="$(SolutionDir)VectoCommon\VectoHashing\bin\"/>
<RemoveDir Directories="$(SolutionDir)VectoMockup\VectoMockup\bin\"/>
<RemoveDir Directories="$(SolutionDir)VECTO\bin\" Condition="Exists('$(SolutionDir)VECTO\bin\')" />
<RemoveDir Directories="$(SolutionDir)HashingTool\bin\" Condition="Exists('$(SolutionDir)HashingTool\bin\')" />
<RemoveDir Directories="$(SolutionDir)HashingCmd\bin\" Condition="Exists('$(SolutionDir)HashingCmd\bin\')" />
<RemoveDir Directories="$(SolutionDir)VectoConsole\bin\" Condition="Exists('$(SolutionDir)VectoConsole\bin\')" />
<RemoveDir Directories="$(SolutionDir)VECTO\bin\" Condition="Exists('$(SolutionDir)VECTO\bin\')" />
<RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" Condition="Exists('$(SolutionDir)VECTO3GUI2020\bin\')" />
<RemoveDir Directories="$(SolutionDir)VECTO3GUI2020\bin\" Condition="Exists('$(SolutionDir)VECTO3GUI2020\bin\')" />
<RemoveDir Directories="$(SolutionDir)Tools\VECTOConsoleStart\bin\" Condition="Exists('$(SolutionDir)Tools\VECTOConsoleStart\bin\')" />
<RemoveDir Directories="$(SolutionDir)Tools\VECTOMultistageStart\bin\" Condition="Exists('$(SolutionDir)Tools\VECTOMultistageStart\bin\')" />
<RemoveDir Directories="$(SolutionDir)Tools\VECTOStart\bin\" Condition="Exists('$(SolutionDir)Tools\VECTOStart\bin\')" />
<RemoveDir Directories="$(SolutionDir)VectoCore\VectoCore\bin\" Condition="Exists('$(SolutionDir)VectoCore\VectoCore\bin\')" />
<RemoveDir Directories="$(SolutionDir)VectoCommon\VectoCommon\bin\" Condition="Exists('$(SolutionDir)VectoCommon\VectoCommon\bin\')" />
<RemoveDir Directories="$(SolutionDir)VectoCommon\VectoHashing\bin\" Condition="Exists('$(SolutionDir)VectoCommon\VectoHashing\bin\')" />
<RemoveDir Directories="$(SolutionDir)VectoMockup\VectoMockup\bin\" Condition="Exists('$(SolutionDir)VectoMockup\VectoMockup\bin\')" />
</Target>
<Target Name="Packaging" AfterTargets="DispatchToInnerBuilds" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
......@@ -39,10 +40,11 @@
<CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate>
<DeployPath>$(SolutionDir)Deploy\$(CurrentDate)-VECTO-$(Version)\</DeployPath>
<NuGetPath>$(SolutionDir)Nuget\$(CurrentDate)-VECTO-NuGet-$(Version)\</NuGetPath>
<DeployPath Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)Deploy\$(CurrentDate)-VECTO_MOCKUP-$(Version)\</DeployPath>
<NuGetPath Condition="'$(Configuration)'=='MockupDeploy'"> $(SolutionDir)Nuget\$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version)\</NuGetPath>
<!-- <DeployPath Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)Deploy\$(CurrentDate)-VECTO_MOCKUP-$(Version)\</DeployPath>
<NuGetPath Condition="'$(Configuration)'=='MockupDeploy'"> $(SolutionDir)Nuget\$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version)\</NuGetPath> -->
</PropertyGroup>
<RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/>
<RemoveDir Directories="$(SolutionDir)Nuget" Condition="Exists('$(SolutionDir)Nuget')"/>
<RemoveDir Directories="$(NuGetPath)" Condition="Exists('$(NuGetPath)')"/>
<MakeDir Directories="$(DeployPath)"/>
<MakeDir Directories="$(NuGetPath)"/>
......@@ -226,18 +228,24 @@
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*.nupkg" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)'=='MockupDeploy'">
<VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\MockupRelease\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*.nupkg" />
</ItemGroup>
<Copy SourceFiles="@(VectoNuget)" DestinationFolder ="$(NuGetPath)"/>
<PropertyGroup>
<NugetDestinationZip>$(SolutionDir)$(CurrentDate)-VECTO-NuGet-$(Version).zip</NugetDestinationZip>
<NugetDestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version).zip</NugetDestinationZip>
<NugetDestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO-NuGet-$(Version).zip</NugetDestinationZip>
</PropertyGroup>
<ZipDirectory SourceDirectory="$(NuGetPath)" DestinationFile="$(NugetDestinationZip)" Overwrite="true"/>
<PropertyGroup>
<DestinationZip>$(SolutionDir)$(CurrentDate)-VECTO-$(Version).zip</DestinationZip>
<DestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO_MOCKUP-$(Version).zip</DestinationZip>
<DestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO-$(Version).zip</DestinationZip>
</PropertyGroup>
<ZipDirectory SourceDirectory="$(SolutionDir)Deploy\" DestinationFile="$(DestinationZip)" Overwrite="true"/>
</Target>
......
VectoCore/VectoCore/VectoCore.csproj
+ 1
− 0
View file @ f0b909e6
......@@ -7,6 +7,7 @@
<Configurations>Debug;Release;MockupDebug;MockupRelease</Configurations>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<VersionSuffix Condition="('$(Configuration)' == 'MockupRelease') Or ('$(Configuration)' == 'MockupDebug')">Mockup</VersionSuffix>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='MockupDebug|net45|AnyCPU'">
<DebugType>full</DebugType>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about