Permalink
Browse files

added support for SL5 and NET45 to the build scripts

  • Loading branch information...
kkozmic committed Feb 5, 2013
1 parent 33f75dc commit 49adbcdb7dd2f307b80bb5e1b253e2503c832abf
Showing with 43 additions and 13 deletions.
  1. +1 −1 build.cmd
  2. +13 −7 buildscripts/Build.proj
  3. +18 −2 buildscripts/Castle.Common.Targets
  4. +2 −2 buildscripts/CommonAssemblyInfo.cs
  5. +9 −1 buildscripts/build.cmd
View
@@ -1,6 +1,6 @@
@ECHO OFF
REM ****************************************************************************
-REM Copyright 2004-2012 Castle Project - http://www.castleproject.org/
+REM Copyright 2004-2013 Castle Project - http://www.castleproject.org/
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
REM You may obtain a copy of the License at
View
@@ -5,7 +5,7 @@
Main build script
-Copyright 2004-2010 Castle Project - http://www.castleproject.org/
+Copyright 2004-2013 Castle Project - http://www.castleproject.org/
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -164,9 +164,9 @@ limitations under the License.
Condition="$(TestRunner_Enabled)"
>
- <CallTarget Targets="_ExecNUnit" Condition="$(BuildConfigKey) != 'SL4'" />
+ <CallTarget Targets="_ExecNUnit" Condition="$(BuildConfigKey) != 'SL5' and $(BuildConfigKey) != 'SL4'" />
- <CallTarget Targets="_ExecStatLight" Condition="$(BuildConfigKey) == 'SL4'" />
+ <CallTarget Targets="_ExecStatLight" Condition="$(BuildConfigKey) == 'SL5' or $(BuildConfigKey) == 'SL4'" />
</Target>
@@ -177,18 +177,24 @@ limitations under the License.
<Target
Name="_ExecNUnit"
>
-
+
<MakeDir Directories="$(TestResultsPath)" Condition="'$(TestResultsPath)' != '' And !Exists('$(TestResultsPath)')" />
<CreateProperty Value="$(TestResultsPath)/nunit-results.xml" Condition="'$(NUnitTestResultXmlFiles)' == ''">
<Output PropertyName="NUnitTestResultXmlFiles" TaskParameter="Value"/>
</CreateProperty>
+ <CreateProperty Value="v4.0" Condition="'$(TargetFrameworkVersion)' == 'v4.5'">
+ <Output PropertyName="TargetFrameworkVersion" TaskParameter="Value" />
+ </CreateProperty>
<Message Text="Running tests from assemblies: $(TestAssemblies)" />
- <Exec Command="$(NUnitPath)/nunit-console-x86.exe /nologo $(TestAssemblies) /xml=$(NUnitTestResultXmlFiles) /framework=$(TargetFrameworkVersion)" Condition=" '$(TEAMCITY_VERSION)' == '' " />
+ <Exec Command="$(NUnitPath)$(NUnitExecutable) /nologo $(TestAssemblies) /xml=$(NUnitTestResultXmlFiles) /framework=$(TargetFrameworkVersion)" Condition=" '$(TEAMCITY_VERSION)' == '' and '$(OS)' == 'Windows_NT' " />
+ <Exec Command="$(MonoShell) $(NUnitPath)$(NUnitExecutable) $(OutputPath)Castle.Core.Tests.dll -nologo -xml=$(NUnitTestResultXmlFiles)" Condition=" '$(OS)' != 'Windows_NT' " />
- <Exec Command="$(MonoShell) $(teamcity_dotnet_nunitlauncher) mono-2.0 x86 NUnit-2.5.5 $(OutputPath)Castle.Core.Tests.dll" Condition="$(MonoShell) != ''" />
+ <!-- TC NUnit launcher crashes on 64bit Linux with Mono
+ <Exec Command="$(MonoShell) S(teamcity_dotnet_nunitlauncher) mono-2.0 x86 NUnit-2.5.5 $(OutputPath)Castle.Core.Tests.dll" Condition=" '$(TEAMCITY_VERSION)' != '' and '$(OS)' != 'Windows_NT' " />
+ -->
<NUnitTeamCity
Assemblies="@(TestAssemblies)"
@@ -203,7 +209,7 @@ limitations under the License.
Name="_ExecStatLight"
>
- <CreateProperty Value='$(ToolsPath)\StatLight\StatLight.exe -x="$(OutputPath)Castle.Windsor.Tests.xap" -o=NUnit'>
+ <CreateProperty Value='$(ToolsPath)\StatLight\StatLight.exe -b -x="$(OutputPath)Castle.Windsor.Tests.xap" -o=NUnit'>
<Output PropertyName="StatLightCmdLine" TaskParameter="Value"/>
</CreateProperty>
@@ -5,7 +5,7 @@
Common targets and properties for VS and external build files
-Copyright 2004-2010 Castle Project - http://www.castleproject.org/
+Copyright 2004-2013 Castle Project - http://www.castleproject.org/
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -30,6 +30,13 @@ limitations under the License.
</PropertyGroup>
+ <!-- .NET 4.5 -->
+ <PropertyGroup Condition="$(Configuration) == 'NET45-Release' or $(Configuration) == 'NET45-Debug'">
+ <BuildConfigKey>NET45</BuildConfigKey>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ </PropertyGroup>
+
+
<!-- .NET 4.0 (default) -->
<PropertyGroup Condition="$(Configuration) == 'NET40-Release' or $(Configuration) == 'NET40-Debug'">
<BuildConfigKey>NET40</BuildConfigKey>
@@ -73,6 +80,14 @@ limitations under the License.
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
+ <!--Silverlight 5.0 runtime-->
+ <PropertyGroup Condition="$(Configuration) == 'SL5-Release' or $(Configuration) == 'SL5-Debug'">
+ <BuildConfigKey>SL5</BuildConfigKey>
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+ <MSBuildTargets>Silverlight 5.0</MSBuildTargets>
+ <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+ </PropertyGroup>
+
<PropertyGroup>
<BuildConfigDescription Condition=" '$(BuildConfigDescription)' == '' ">$(TargetFrameworkIdentifier) $(TargetFrameworkVersion)</BuildConfigDescription>
<BuildConfigDescription Condition=" '$(TargetFrameworkProfile)' != '' ">$(BuildConfigDescription) Client Profile</BuildConfigDescription>
@@ -141,7 +156,8 @@ limitations under the License.
<!-- 3rd Party Program Paths -->
<PropertyGroup>
- <NUnitPath Condition="'$(NUnitPath)' == ''">$(ToolsPath)/NUnit/bin</NUnitPath>
+ <NUnitExecutable Condition="'$(NUnitExecutable)' == ''">nunit-console-x86.exe</NUnitExecutable>
+ <NUnitPath Condition="'$(NUnitPath)' == ''">$(ToolsPath)/NUnit/bin/</NUnitPath>
<MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)' == ''">$(ToolsPath)/MSBuildCommunityTasks</MSBuildCommunityTasksPath>
</PropertyGroup>
@@ -1,4 +1,4 @@
-// Copyright 2004-2011 Castle Project - http://www.castleproject.org/
+// Copyright 2004-2013 Castle Project - http://www.castleproject.org/
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
using System.Reflection;
[assembly: AssemblyCompany("Castle Project")]
-[assembly: AssemblyCopyright("Copyright (c) 2004-2011 Castle Project - http://www.castleproject.org")]
+[assembly: AssemblyCopyright("Copyright (c) 2004-2013 Castle Project - http://www.castleproject.org")]
View
@@ -1,6 +1,6 @@
@ECHO OFF
REM ****************************************************************************
-REM Copyright 2004-2010 Castle Project - http://www.castleproject.org/
+REM Copyright 2004-2013 Castle Project - http://www.castleproject.org/
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
REM You may obtain a copy of the License at
@@ -40,6 +40,14 @@ IF /i "%1" == "SL4" (SET BuildConfigKey=SL4)
IF /i "%1" == "SL40" (SET FrameworkVersion=v4.0)
IF /i "%1" == "SL40" (SET BuildConfigKey=SL4)
+IF /i "%1" == "SL5" (SET FrameworkVersion=v5.0)
+IF /i "%1" == "SL5" (SET BuildConfigKey=SL5)
+IF /i "%1" == "SL50" (SET FrameworkVersion=v5.0)
+IF /i "%1" == "SL50" (SET BuildConfigKey=SL5)
+
+IF /i "%1" == "NET45" (SET FrameworkVersion=v4.5)
+IF /i "%1" == "NET45" (SET BuildConfigKey=NET45)
+
IF "%2" == "" goto no_target_and_config
SET BuildTarget=%2

0 comments on commit 49adbcd

Please sign in to comment.