Skip to content

Commit

Permalink
fixup! tweaking quartz20 build scripts and removing quartz 1.x support
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbohlen
sbohlen committed May 10, 2012
1 parent 9d8ac9c commit 1a5fd19
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 23 deletions.
10 changes: 10 additions & 0 deletions Spring.Net.2010.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,16 @@ Global
{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Any CPU.Build.0 = Release|Any CPU
{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E823D54C-CE82-4868-929F-5F95A999F123}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|.NET.ActiveCfg = Debug|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Any CPU.Build.0 = Debug|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|.NET.ActiveCfg = Release|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Any CPU.ActiveCfg = Release|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Any CPU.Build.0 = Release|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{247787CF-ECE1-4675-8B42-7DF4329A4891}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|.NET.ActiveCfg = Debug|Any CPU
{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E823D54C-CE82-4868-929F-5F95A999F61E}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand Down
22 changes: 0 additions & 22 deletions Spring.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@ Commandline Examples:
<property name="lib.dir" value="${spring.basedir}/lib/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh32.lib.dir" value="${spring.basedir}/lib/NHibernate32/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="nh33.lib.dir" value="${spring.basedir}/lib/NHibernate33/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="quartz.lib.dir" value="${spring.basedir}/lib/Quartz10/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<property name="quartz20.lib.dir" value="${spring.basedir}/lib/Quartz20/${framework::get-family(framework::get-target-framework())}/${framework::get-version(framework::get-target-framework())}"/>
<call target="copylibtobin"/>

Expand All @@ -409,10 +408,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' )}"/>
<nant buildfile="src/Spring/Spring.Messaging.Nms/Spring.Messaging.Nms.build" target="build" if="${build-nms}"/>
<nant buildfile="src/Spring/Spring.Scheduling.Quartz/Spring.Scheduling.Quartz.build" target="build" if="${build-quartz}"/>
<!--
<nant buildfile="src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.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}"/>

Expand All @@ -439,10 +435,7 @@ Commandline Examples:
<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.Quartz.Tests/Spring.Scheduling.Quartz.Tests.build" target="test" if="${build-quartz}"/>
<!--
<nant buildfile="test/Spring/Spring.Scheduling.Quartz20.Tests/Spring.Scheduling.Quartz20.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}"/>

Expand Down Expand Up @@ -672,8 +665,6 @@ Commandline Examples:
<delete dir="src/Spring/Spring.Messaging.Ems/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Messaging/obj" failonerror="false"/>
<delete dir="src/Spring/Spring.Messaging/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Scheduling.Quartz/obj" failonerror="false"/>
<delete dir="src/Spring/Spring.Scheduling.Quartz/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Scheduling.Quartz20/obj" failonerror="false"/>
<delete dir="src/Spring/Spring.Scheduling.Quartz20/bin" failonerror="false"/>
<delete dir="src/Spring/Spring.Template.Velocity/obj" failonerror="false"/>
Expand Down Expand Up @@ -713,8 +704,6 @@ Commandline Examples:
<delete dir="test/Spring/Spring.Messaging.Ems.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Messaging.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Messaging.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Scheduling.Quartz.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Scheduling.Quartz.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Scheduling.Quartz20.Tests/obj" failonerror="false"/>
<delete dir="test/Spring/Spring.Scheduling.Quartz20.Tests/bin" failonerror="false"/>
<delete dir="test/Spring/Spring.Template.Velocity.Tests/obj" failonerror="false"/>
Expand Down Expand Up @@ -1256,10 +1245,6 @@ Commandline Examples:
<include name="*/*/Spring.Messaging.xml"/>
<include name="*/*/Spring.Messaging.pdb"/>

<include name="*/*/Spring.Scheduling.Quartz.dll"/>
<include name="*/*/Spring.Scheduling.Quartz.xml"/>
<include name="*/*/Spring.Scheduling.Quartz.pdb"/>

<include name="*/*/Spring.Scheduling.Quartz20.dll"/>
<include name="*/*/Spring.Scheduling.Quartz20.xml"/>
<include name="*/*/Spring.Scheduling.Quartz20.pdb"/>
Expand All @@ -1279,9 +1264,6 @@ Commandline Examples:
<include name="*/Spring.Services.xml"/>
<include name="*/Spring.Services.pdb"/>

<include name="*/*/Spring.Scheduling.Quartz.dll"/>
<include name="*/*/Spring.Scheduling.Quartz.xml"/>
<include name="*/*/Spring.Scheduling.Quartz.pdb"/>
<include name="*/*/Spring.Scheduling.Quartz20.dll"/>
<include name="*/*/Spring.Scheduling.Quartz20.xml"/>
<include name="*/*/Spring.Scheduling.Quartz20.pdb"/>
Expand Down Expand Up @@ -1492,7 +1474,6 @@ Commandline Examples:
<include name="src/Spring/Spring.Messaging/**"/>
<include name="src/Spring/Spring.Messaging.Nms/**"/>
<include name="src/Spring/Spring.Messaging.Ems/**"/>
<include name="src/Spring/Spring.Scheduling.Quartz/**"/>
<include name="src/Spring/Spring.Scheduling.Quartz20/**"/>
<include name="src/Spring/Spring.Template.Velocity/**"/>
<include name="src/Spring/Spring.Testing.NUnit/**"/>
Expand All @@ -1516,7 +1497,6 @@ Commandline Examples:
<include name="test/Spring/Spring.Messaging.Nms.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Nms.Integration.Tests/**"/>
<include name="test/Spring/Spring.Messaging.Ems.Tests/**"/>
<include name="test/Spring/Spring.Scheduling.Quartz.Tests/**"/>
<include name="test/Spring/Spring.Scheduling.Quartz20.Tests/**"/>
<include name="test/Spring/Spring.Template.Velocity.Tests/**"/>
<include name="test/Spring/Spring.Testing.NUnit.Tests/**"/>
Expand Down Expand Up @@ -1624,8 +1604,6 @@ Commandline Examples:
<in>
<items basedir="${spring.basedir}/src/spring">
<include name="**/*.nuspec" />
<exclude name="**/Spring.Messaging.Ems.nuspec" />
<exclude name="**/Spring.Scheduling.Quartz20.nuspec" />
</items>
</in>
<do>
Expand Down
Binary file modified lib/Net/2.0/Common.Logging.dll
View file
Binary file not shown.
1 change: 0 additions & 1 deletion src/Spring/Spring.Scheduling.Quartz20/Spring.Scheduling.Quartz20.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<exclude name="../Spring.Scheduling.Quartz/**/SchedulerAccessor.cs" />
<exclude name="../Spring.Scheduling.Quartz/**/SimpleTriggerObject.cs" />
<exclude name="../Spring.Scheduling.Quartz/**/StatefulMethodInvokingJob.cs" />
<exclude name="../Spring.Scheduling.Quartz/**/JobMethodInvocationFailedException.cs" />
<exclude name="../Spring.Scheduling.Quartz/**/ResourceJobSchedulingDataProcessor.cs" />
<include name="../GenCommonAssemblyInfo.cs" />
</sources>
Expand Down

0 comments on commit 1a5fd19

Please sign in to comment.