activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r703229 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/tags/1.0.0/ Apache.NMS.EMS/tags/1.0.0/ Apache.NMS.EMS/trunk/ Apache.NMS.MSMQ/tags/1.0.0/ Apache.NMS.MSMQ/trunk/ Apache.NMS/tags/1.0.0/ Apache.NMS/trunk/ BuildScripts/
Date Thu, 09 Oct 2008 18:54:17 GMT
Author: jgomes
Date: Thu Oct  9 11:54:17 2008
New Revision: 703229

URL: http://svn.apache.org/viewvc?rev=703229&view=rev
Log:
Consolidate nant build files to use single common script.

Removed:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/BuildScripts/
Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build
    activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS/tags/1.0.0/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build?rev=703229&r1=703228&r2=703229&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/nant.build Thu Oct  9 11:54:17
2008
@@ -102,6 +102,6 @@
   </target>
 
   <!-- Load the common target definitions  -->
-  <include buildfile="${basedir}/nant-common.xml"/>
+  <include buildfile="${basedir}/vendor/Apache.NMS/nant-common.xml"/>
 
 </project>

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build?rev=703229&r1=703228&r2=703229&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/tags/1.0.0/nant.build Thu Oct  9 11:54:17 2008
@@ -119,6 +119,6 @@
   </target>
 
   <!-- Load the common target definitions  -->
-	<include buildfile="${basedir}/nant-common.xml"/>
+	<include buildfile="${basedir}/vendor/Apache.NMS/nant-common.xml"/>
 
 </project>

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build?rev=703229&r1=703228&r2=703229&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Thu Oct  9 11:54:17 2008
@@ -119,6 +119,6 @@
   </target>
 
   <!-- Load the common target definitions  -->
-	<include buildfile="${basedir}/nant-common.xml"/>
+	<include buildfile="${basedir}/vendor/Apache.NMS/nant-common.xml"/>
 
 </project>

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build?rev=703229&r1=703228&r2=703229&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant.build Thu Oct  9 11:54:17 2008
@@ -113,6 +113,6 @@
   </target>
 
   <!-- Load the common target definitions  -->
-	<include buildfile="${basedir}/nant-common.xml"/>
+	<include buildfile="${basedir}/vendor/Apache.NMS/nant-common.xml"/>
 
 </project>

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build?rev=703229&r1=703228&r2=703229&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Thu Oct  9 11:54:17 2008
@@ -115,6 +115,6 @@
   </target>
 
   <!-- Load the common target definitions  -->
-	<include buildfile="${basedir}/nant-common.xml"/>
+	<include buildfile="${basedir}/vendor/Apache.NMS/nant-common.xml"/>
 
 </project>

Modified: activemq/activemq-dotnet/Apache.NMS/tags/1.0.0/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/tags/1.0.0/nant-common.xml?rev=703229&r1=703228&r2=703229&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/tags/1.0.0/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/tags/1.0.0/nant-common.xml Thu Oct  9 11:54:17 2008
@@ -110,16 +110,15 @@
   </target>
 
   <target name="release-init" description="Initializes release build properties">
-    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" />
+    <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
+            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
+            unless="${property::exists('snk.file')}"/>
+    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" if="${not property::exists('snk.file')}"/>
     <if test="${not file::exists(snk.file)}">
       <if test="${build.noskip}">
-    <fail message="Release key file not found. You can generate a key file by running
'sn -k ${snk.file}'." />
-      </if>
-      <if test="${not(build.noskip)}">
-        <echo message="Release key file not found. You can generate a key file by running
'sn -k ${snk.file}'." />
-        <echo message="The Release build will be skipped." />
-        <property name="build.skip.release" value="true"/>
+        <fail message="Release key file not found. You can generate a key file by running
'sn -k activemq-dotnet.snk'.  Then set the ACTIVEMQ_DOTNET_SNK environment variable to the
full pathname of the file." />
       </if>
+      <property name="build.skip.release" value="true" />
     </if>
     <if test="${file::exists(snk.file)}">
       <property name="build.skip.release" value="false" />
@@ -141,11 +140,8 @@
        <!-- Make sure that the activemq-dotnet.snk exists for release builds -->
        <if test="${current.build.config.release}">
          <call target="release-init"/>
-         <property name="build.skip" value="${build.skip.release}" />
-       </if>
-       <if test="${not current.build.config.release}">
-         <property name="build.skip" value="false" />
        </if>
+       <property name="build.skip" value="false" />
     </if>
     <if test="${not framework::exists(current.build.framework)}">
        <if test="${build.noskip}">
@@ -166,7 +162,7 @@
     </if>
 
     <if test="${not(build.skip)}">
-       <property name="current.build.keysign" value="${current.build.config=='release'
and current.build.framework.sign}"/>
+       <property name="current.build.keysign" value="${current.build.config=='release'
and file::exists(snk.file) and current.build.framework.sign}"/>
        <echo message="Doing ${if(current.build.keysign,'a signed','an unsigned')} ${current.build.config}
build for the ${current.build.framework.name} framework" />
        <property name="build.bin.dir" value="${basedir}/build/${nant.settings.currentframework}/${current.build.config}"
/>
        <mkdir dir="${build.bin.dir}"/>
@@ -270,15 +266,12 @@
     <call target="set-mono-2.0-framework-configuration" /><call target="conditional-compile"
/>
     <call target="set-netcf-2.0-framework-configuration"/><call target="conditional-compile"
/>
 
-    <!-- we can only do a release skip if the Key file is available -->
-    <if test="${not build.skip.release}">
-      <call target="set-release-configuration" />
-      <call target="set-net-1.1-framework-configuration"  /><call target="conditional-compile"
/>
-      <call target="set-net-2.0-framework-configuration"  /><call target="conditional-compile"
/>
-      <call target="set-net-3.5-framework-configuration"  /><call target="conditional-compile"
/>
-      <call target="set-mono-2.0-framework-configuration" /><call target="conditional-compile"
/>
-      <call target="set-netcf-2.0-framework-configuration"/><call target="conditional-compile"
/>
-    </if>
+    <call target="set-release-configuration" />
+    <call target="set-net-1.1-framework-configuration"  /><call target="conditional-compile"
/>
+    <call target="set-net-2.0-framework-configuration"  /><call target="conditional-compile"
/>
+    <call target="set-net-3.5-framework-configuration"  /><call target="conditional-compile"
/>
+    <call target="set-mono-2.0-framework-configuration" /><call target="conditional-compile"
/>
+    <call target="set-netcf-2.0-framework-configuration"/><call target="conditional-compile"
/>
   </target>
 
   <target name="conditional-compile" depends="init" unless="${build.skip}"
@@ -313,12 +306,11 @@
       </attributes>
     </asminfo>
 
-    <csc if="${current.build.keysign}" keyfile="${basedir}/activemq-dotnet.snk" target="library"
+    <csc if="${current.build.keysign}" keyfile="${snk.file}" target="library"
       define="${current.build.defines}" warnaserror="false" debug="${csc.debug}" optimize="${csc.optimize}"
       output="${build.bin.dir}/${project.name}.dll" doc="${build.bin.dir}/${project.name}.xml">
       <nowarn>
         <warning number="1591" /> <!-- do not report warnings for missing XML comments
-->
-        <warning number="0618" /> <!-- do not report deprecation warnings -->
       </nowarn>
       <sources failonempty="true">
         <include name="src/main/csharp/**.cs" />
@@ -329,8 +321,7 @@
       define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"  optimize="${csc.optimize}"
       output="${build.bin.dir}/${project.name}.dll" doc="${build.bin.dir}/${project.name}.xml">
       <nowarn>
-    <warning number="1591" /> <!-- do not report warnings for missing XML comments
-->
-    <warning number="0618" /> <!-- do not report deprecation warnings -->
+        <warning number="1591" /> <!-- do not report warnings for missing XML comments
-->
       </nowarn>
       <sources failonempty="true">
         <include name="src/main/csharp/**.cs" />
@@ -366,7 +357,7 @@
       </attributes>
     </asminfo>
 
-    <csc if="${current.build.keysign}" keyfile="${basedir}/activemq-dotnet.snk" target="library"
+    <csc if="${current.build.keysign}" keyfile="${snk.file}" target="library"
       define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"  optimize="${csc.optimize}"
       output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
       <nowarn>

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml?rev=703229&r1=703228&r2=703229&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Thu Oct  9 11:54:17 2008
@@ -110,10 +110,13 @@
   </target>
 
   <target name="release-init" description="Initializes release build properties">
-    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" />
+    <property name="snk.file"  value="${environment::get-variable('ACTIVEMQ_DOTNET_SNK')}"
+            if="${environment::variable-exists('ACTIVEMQ_DOTNET_SNK')}"
+            unless="${property::exists('snk.file')}"/>
+    <property name="snk.file"  value="${basedir}/activemq-dotnet.snk" if="${not property::exists('snk.file')}"/>
     <if test="${not file::exists(snk.file)}">
       <if test="${build.noskip}">
-        <fail message="Release key file not found. You can generate a key file by running
'sn -k ${snk.file}'." />
+        <fail message="Release key file not found. You can generate a key file by running
'sn -k activemq-dotnet.snk'.  Then set the ACTIVEMQ_DOTNET_SNK environment variable to the
full pathname of the file." />
       </if>
       <property name="build.skip.release" value="true" />
     </if>
@@ -303,7 +306,7 @@
       </attributes>
     </asminfo>
 
-    <csc if="${current.build.keysign}" keyfile="${basedir}/activemq-dotnet.snk" target="library"
+    <csc if="${current.build.keysign}" keyfile="${snk.file}" target="library"
       define="${current.build.defines}" warnaserror="false" debug="${csc.debug}" optimize="${csc.optimize}"
       output="${build.bin.dir}/${project.name}.dll" doc="${build.bin.dir}/${project.name}.xml">
       <nowarn>
@@ -354,7 +357,7 @@
       </attributes>
     </asminfo>
 
-    <csc if="${current.build.keysign}" keyfile="${basedir}/activemq-dotnet.snk" target="library"
+    <csc if="${current.build.keysign}" keyfile="${snk.file}" target="library"
       define="${current.build.defines}" warnaserror="false" debug="${csc.debug}"  optimize="${csc.optimize}"
       output="${build.bin.dir}/${project.name}.Test.dll" doc="${build.bin.dir}/${project.name}.Test.xml">
       <nowarn>



Mime
View raw message