convert packages.config files to project.json
* reduce console output in builds
This commit is contained in:
Marko Lahma
65
Spring.build
65
Spring.build
@@ -109,6 +109,7 @@ Commandline Examples:
|
||||
<property name="project.name" value="Spring.NET"/>
|
||||
<property name="project.name.full" value="Spring.NET Framework"/>
|
||||
<property name="spring.basedir" value="${project::get-base-directory()}"/>
|
||||
<property name="nuget.packages.dir" value="${environment::get-variable('HOMEPATH') + '\.nuget\packages'}"/>
|
||||
<property name="spring.nonredistdir" value="${spring.basedir}\..\..\nonredist"/>
|
||||
<property name="tool.dir" value="${project::get-base-directory()}\build-support\tools"/>
|
||||
<property name="nuget.exe" value="${tool.dir}\NuGet\NuGet.exe"/>
|
||||
@@ -490,23 +491,24 @@ Commandline Examples:
|
||||
|
||||
<target name="compile-test"> <!-- used as configurable template by all compile-{net|mono|netcf}-x.x targets -->
|
||||
<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
|
||||
<property name="nh3.lib.dir" value="${spring.basedir}/packages/NHibernate.3.3.3.4001/lib/Net35"/>
|
||||
<property name="iesi3.lib.dir" value="${spring.basedir}/packages/Iesi.Collections.3.3.3.4001/lib/Net35"/>
|
||||
<property name="nh4.lib.dir" value="${spring.basedir}/packages/NHibernate.4.0.3.4000/lib/Net40"/>
|
||||
<property name="iesi4.lib.dir" value="${spring.basedir}/packages/Iesi.Collections.4.0.1.4000/lib/Net40"/>
|
||||
<property name="quartz2.lib.dir" value="${spring.basedir}/packages/Quartz.2.3.1/lib/net35"/>
|
||||
<property name="nunit.lib.dir" value="${spring.basedir}/packages/NUnit.3.5.0/lib/net35"/>
|
||||
<property name="nh3.lib.dir" value="${nuget.packages.dir}/NHibernate/3.3.3.4001/lib/Net35"/>
|
||||
<property name="iesi3.lib.dir" value="${nuget.packages.dir}/Iesi.Collections/3.3.3.4001/lib/Net35"/>
|
||||
<property name="nh4.lib.dir" value="${nuget.packages.dir}/NHibernate/4.0.3.4000/lib/Net40"/>
|
||||
<property name="iesi4.lib.dir" value="${nuget.packages.dir}/Iesi.Collections/4.0.1.4000/lib/Net40"/>
|
||||
<property name="quartz2.lib.dir" value="${nuget.packages.dir}/Quartz/2.3.1/lib/net35"/>
|
||||
<property name="nunit.lib.dir" value="${nuget.packages.dir}/NUnit/3.5.0/lib/net35"/>
|
||||
|
||||
<property name="common.logging.lib.dir" value="${spring.basedir}/packages/Common.Logging.3.0.0/lib/net35"/>
|
||||
<property name="common.logging.core.lib.dir" value="${spring.basedir}/packages/Common.Logging.Core.3.0.0/lib/net35"/>
|
||||
<property name="common.logging.lib.dir" value="${nuget.packages.dir}/Common.Logging/3.0.0/lib/net35"/>
|
||||
<property name="common.logging.core.lib.dir" value="${nuget.packages.dir}/Common.Logging.Core/3.0.0/lib/net35"/>
|
||||
|
||||
<!-- we use same libs for both 4.0 and 4.5 builds -->
|
||||
<if test="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}">
|
||||
<property name="common.logging.lib.dir" value="${spring.basedir}/packages/Common.Logging.3.0.0/lib/net40"/>
|
||||
<property name="common.logging.core.lib.dir" value="${spring.basedir}/packages/Common.Logging.Core.3.0.0/lib/net40"/>
|
||||
<property name="common.logging.lib.dir" value="${nuget.packages.dir}/Common.Logging/3.0.0/lib/net40"/>
|
||||
<property name="common.logging.core.lib.dir" value="${nuget.packages.dir}/Common.Logging.Core/3.0.0/lib/net40"/>
|
||||
<property name="lib.dir" value="${spring.basedir}/lib/net/4.0"/>
|
||||
<property name="nunit.lib.dir" value="${spring.basedir}/packages/NUnit.3.5.0/lib/net40"/>
|
||||
<property name="quartz2.lib.dir" value="${spring.basedir}/packages/Quartz.2.3.1/lib/net40"/>
|
||||
<property name="quartz2.lib.dir" value="${nuget.packages.dir}/Quartz/2.3.1/lib/net40"/>
|
||||
<property name="nunit.lib.dir" value="${nuget.packages.dir}/NUnit/3.5.0/lib/net40"/>
|
||||
|
||||
</if>
|
||||
|
||||
|
||||
@@ -518,8 +520,8 @@ Commandline Examples:
|
||||
<nant buildfile="src/Spring/Spring.Web/Spring.Web.build" target="build" if="${build-web}"/>
|
||||
<nant buildfile="src/Spring/Spring.Web.Extensions/Spring.Web.Extensions.build" target="build" if="${build-web and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' or nant.settings.currentframework == 'mono-2.0')}"/>
|
||||
<nant buildfile="src/Spring/Spring.Web.Mvc3/Spring.Web.Mvc3.build" target="build" if="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build" target="build" if="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build" target="build" if="${nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="src/Spring/Spring.Web.Mvc4/Spring.Web.Mvc4.build" target="build" if="${nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="src/Spring/Spring.Web.Mvc5/Spring.Web.Mvc5.build" target="build" if="${nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="src/Spring/Spring.Data/Spring.Data.build" target="build" if="${build-data}"/>
|
||||
|
||||
<nant buildfile="src/Spring/Spring.Data.NHibernate3/Spring.Data.NHibernate3.build" target="build" if="${build-data}"/>
|
||||
@@ -530,7 +532,7 @@ Commandline Examples:
|
||||
<nant buildfile="src/Spring/Spring.Testing.Microsoft/Spring.Testing.Microsoft.build" target="build" if="${build-testing-microsoft}"/>
|
||||
<nant buildfile="src/Spring/Spring.Messaging.Ems/Spring.Messaging.Ems.build" target="build" if="${build-ems and (nant.settings.currentframework == 'net-3.5' or nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5' )}"/>
|
||||
<nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms}"/>
|
||||
<nant buildfile="src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build" target="build" if="${build-quartz}"/>
|
||||
<nant buildfile="src/Spring/Spring.Scheduling.Quartz2/Spring.Scheduling.Quartz2.build" target="build" if="${build-quartz}"/>
|
||||
<nant buildfile="src/Spring/Spring.Messaging/Spring.Messaging.build" target="build" if="${build-msmq}"/>
|
||||
<nant buildfile="src/Spring/Spring.Template.Velocity/Spring.Template.Velocity.build" target="build" if="${build-velocity}"/>
|
||||
<nant buildfile="src/Spring/Spring.Template.Velocity.Castle/Spring.Template.Velocity.Castle.build" target="build" if="${build-velocity}"/>
|
||||
@@ -553,25 +555,25 @@ Commandline Examples:
|
||||
<!-- newer NUnit runners cannot handle test properly, so running just the build target -->
|
||||
<nant buildfile="test/Spring/Spring.Services.Tests/Spring.Services.Tests.build" target="build" if="${build-services}"/>
|
||||
<nant buildfile="test/Spring/Spring.Web.Tests/Spring.Web.Tests.build" target="test" if="${build-web and nant.settings.currentframework != 'net-3.5'}"/>
|
||||
<nant buildfile="test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="test/Spring/Spring.Web.Mvc3.Tests/Spring.Web.Mvc3.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="test/Spring/Spring.Web.Mvc4.Tests/Spring.Web.Mvc4.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.0' or nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="test/Spring/Spring.Web.Mvc5.Tests/Spring.Web.Mvc5.Tests.build" target="test" if="${build-web and nant.settings.currentframework == 'net-4.5'}"/>
|
||||
<nant buildfile="test/Spring/Spring.Testing.NUnit.Tests/Spring.Testing.NUnit.Tests.build" target="test" if="${build-testing-nunit}"/>
|
||||
<nant buildfile="test/Spring/Spring.Testing.Microsoft.Tests/Spring.Testing.Microsoft.Tests.build" target="test" if="${run-testing-microsoft and build-testing-microsoft}"/>
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Ems.Tests/Spring.Messaging.Ems.Tests.build" target="test" if="${build-ems}"/>
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Ems.Integration.Tests/Spring.Messaging.Ems.Integration.Tests.build" target="test" if="${build-ems}"/>
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.build" target="test" if="${build-nms}"/>
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Nms.Integration.Tests/Spring.Messaging.Nms.Integration.Tests.build" target="test" if="${build-nms}"/>
|
||||
<nant buildfile="test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build" target="test" if="${build-quartz}"/>
|
||||
<nant buildfile="test/Spring/Spring.Scheduling.Quartz2.Tests/Spring.Scheduling.Quartz2.Tests.build" target="test" if="${build-quartz}"/>
|
||||
<nant buildfile="test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.build" target="test" if="${build-msmq}"/>
|
||||
<nant buildfile="test/Spring/Spring.Template.Velocity.Tests/Spring.Template.Velocity.Tests.build" target="test" if="${build-velocity}"/>
|
||||
<nant buildfile="test/Spring/Spring.Template.Velocity.Castle.Tests/Spring.Template.Velocity.Castle.Tests.build" target="test" if="${build-velocity}"/>
|
||||
<!--"Spring.ConversationWA.NH*.Tests.dll" should be at last to prevent the other tests are compiled with reference to this-->
|
||||
|
||||
<!-- conversation tests disabled for now because with .NET 4.5 installed NUnitAsp does not seem to work anymore -->
|
||||
<if test="${nant.settings.currentframework == 'net-3.5'}">
|
||||
<nant buildfile="test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build" target="test" if="${build-conversation}"/>
|
||||
</if>
|
||||
<!-- conversation tests disabled for now because with .NET 4.5 installed NUnitAsp does not seem to work anymore -->
|
||||
<if test="${nant.settings.currentframework == 'net-3.5'}">
|
||||
<nant buildfile="test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Spring.Web.Conversation.NHibernate3.Tests.build" target="test" if="${build-conversation}"/>
|
||||
</if>
|
||||
|
||||
<!-- Main solutions and examples are compiled via task build-solutions -->
|
||||
|
||||
@@ -1338,10 +1340,7 @@ Commandline Examples:
|
||||
<echo message="Current package directory = ${current.package.dir}"/>
|
||||
<copy todir="${current.package.dir}" verbose="${copy-verbose}">
|
||||
<fileset>
|
||||
<include name="${solution.file.2003}"/>
|
||||
<include name="${solution.file.2005}"/>
|
||||
<include name="${solution.file.2008}"/>
|
||||
<include name="${solution.file.2010}"/>
|
||||
<include name="${solution.file.2010}"/>
|
||||
<include name="readme.txt"/>
|
||||
<include name="changelog.txt"/>
|
||||
<include name="license.txt"/>
|
||||
@@ -1391,14 +1390,11 @@ Commandline Examples:
|
||||
<include name="**/NUnitAsp.dll"/>
|
||||
<include name="**/NUnitAspEx.dll"/>
|
||||
<include name="**/Rhino.Mocks.dll"/>
|
||||
<include name="**/NVelocity.*"/>
|
||||
<include if="${not net-4.0}" name="**/System.Web.Extensions.dll"/>
|
||||
<include name="**/Apache.NMS.dll"/>
|
||||
<include name="**/Apache.NMS.pdb"/>
|
||||
<include name="**/Apache.NMS.ActiveMQ.dll"/>
|
||||
<include name="**/Apache.NMS.ActiveMQ.pdb"/>
|
||||
<include name="**/Quartz.dll"/>
|
||||
<include name="**/Nullables.dll"/>
|
||||
<include name="**/EULA.rtf"/>
|
||||
<exclude name="**/TIBCO.EMS.ADMIN.dll"/>
|
||||
<exclude name="**/TIBCO.EMS.dll"/>
|
||||
@@ -1831,17 +1827,14 @@ Commandline Examples:
|
||||
<property name="build-quartz" value="true" />
|
||||
<property name="build-msmq" value="true" />
|
||||
<property name="build-velocity" value="true" />
|
||||
<property name="solution.file.2003" value="Spring.Net.2003.sln"/>
|
||||
<property name="solution.file.2005" value="Spring.Net.2005.sln"/>
|
||||
<property name="solution.file.2008" value="Spring.Net.2008.sln"/>
|
||||
<property name="solution.file.2010" value="Spring.Net.2010.sln"/>
|
||||
<property name="solution.file.2010" value="Spring.Net.2010.sln"/>
|
||||
<fileset id="src.to.copy">
|
||||
<include name="src/Spring/Spring.Core/**"/>
|
||||
<include name="src/Spring/Spring.Aop/**"/>
|
||||
<include name="src/Spring/Spring.Web/**"/>
|
||||
<include name="src/Spring/Spring.Web.Mvc3/**"/>
|
||||
<include name="src/Spring/Spring.Web.Mvc4/**"/>
|
||||
<include name="src/Spring/Spring.Web.Mvc5/**"/>
|
||||
<include name="src/Spring/Spring.Web.Mvc4/**"/>
|
||||
<include name="src/Spring/Spring.Web.Mvc5/**"/>
|
||||
<include name="src/Spring/Spring.Web.Extensions/**"/>
|
||||
<include name="src/Spring/Spring.Services/**"/>
|
||||
<include name="src/Spring/Spring.Data/**"/>
|
||||
|
||||
Reference in New Issue
Block a user