qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r889173 - in /qpid/trunk/qpid: bin/release.sh java/common/build.xml java/management/eclipse-plugin/build.xml java/module.xml
Date Thu, 10 Dec 2009 10:26:40 GMT
Author: robbie
Date: Thu Dec 10 10:26:06 2009
New Revision: 889173

URL: http://svn.apache.org/viewvc?rev=889173&view=rev
Log:
Move generation of qpidversion.properties files to a shared definition in module.xml, update
property name used during generation to prevent circularly defined properties when svnversion
isnt available on the path. Update release.sh script to override the svnversion output property
when using exported files

Modified:
    qpid/trunk/qpid/bin/release.sh
    qpid/trunk/qpid/java/common/build.xml
    qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
    qpid/trunk/qpid/java/module.xml

Modified: qpid/trunk/qpid/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/bin/release.sh?rev=889173&r1=889172&r2=889173&view=diff
==============================================================================
--- qpid/trunk/qpid/bin/release.sh (original)
+++ qpid/trunk/qpid/bin/release.sh Thu Dec 10 10:26:06 2009
@@ -193,7 +193,7 @@
 
 if [ "JAVA" == "$JAVA" ] ; then
   pushd qpid-${VER}/java
-  ant build release release-bin
+  ant build release release-bin -Dsvnversion.output=${REV}
   popd
 
   cp qpid-${VER}/java/release/*.tar.gz  artifacts/qpid-java-${VER}.tar.gz

Modified: qpid/trunk/qpid/java/common/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build.xml?rev=889173&r1=889172&r2=889173&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Thu Dec 10 10:26:06 2009
@@ -77,31 +77,7 @@
     <touch file="${gentools.timestamp}" />
   </target>
 
-  <property name="version.file" location="${module.classes}/qpidversion.properties"/>
-  <property file="${version.file}" prefix="old."/>
-
-  <target name="check-version">
-    <exec executable="svnversion" spawn="false" failifexecutionfails="false"
-          dir="${project.root}" outputproperty="qpid.svnversion">
-      <arg line="."/>
-    </exec>
-    <condition property="version.stale">
-      <not>
-        <equals arg1="${qpid.svnversion}" arg2="${old.qpid.svnversion}"/>
-      </not>
-    </condition>
-  </target>
-
-  <target name="version" depends="check-version" if="version.stale">
-    <!-- Write the version.properties out. -->
-    <echo file="${version.file}" append="true">
-      qpid.svnversion=${qpid.svnversion}
-      qpid.name=${project.name}
-      qpid.version=${project.version}
-    </echo>
-  </target>
-
-  <target name="precompile" depends="gentools,jython,version"/>
+  <target name="precompile" depends="gentools,jython,create-version"/>
 
   <target name="bundle" depends="bundle-tasks"/>
 </project>

Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build.xml?rev=889173&r1=889172&r2=889173&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build.xml Thu Dec 10 10:26:06 2009
@@ -50,22 +50,6 @@
         </copy>
     </target>
 
-    <target name="create-version" description="Create the version file">
-
-        <exec executable="svnversion" spawn="false" failifexecutionfails="false"
-              dir="." outputproperty="svnversion">
-            <arg line="."/>
-        </exec>
-
-        <!-- Write the version.properties out. -->
-        <propertyfile file="${module.classes}/qpidversion.properties">
-            <entry key="qpid.version" value="${project.version}"/>
-            <entry key="qpid.svnversion" value="${svnversion}"/>
-            <entry key="qpid.name" value="${project.name}"/>            
-        </propertyfile>
-
-    </target>
-
     <target name="precompile" depends="copy-plugin-files, create-version" />
 
     <!-- Override imported module.xml release-bin target -->

Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=889173&r1=889172&r2=889173&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Thu Dec 10 10:26:06 2009
@@ -596,4 +596,28 @@
     </cobertura-report>
   </target>
   
+  <property name="version.file" location="${module.classes}/qpidversion.properties"/>
+  <property file="${version.file}" prefix="old."/>
+
+  <target name="check-version">
+    <exec executable="svnversion" spawn="false" failifexecutionfails="false"
+        dir="${project.root}" outputproperty="svnversion.output">
+      <arg line="."/>
+    </exec>
+    <condition property="version.stale">
+      <not>
+        <equals arg1="${svnversion.output}" arg2="${old.qpid.svnversion}"/>
+      </not>
+    </condition>
+  </target>
+
+  <target name="create-version" depends="check-version" if="version.stale">
+    <!-- Write the version.properties out.-->
+    <!-- Echos exactly as shown, so leave no spaces before/after lines -->
+    <echo file="${version.file}" append="false">qpid.version=${project.version}
+qpid.svnversion=${svnversion.output}
+qpid.name=${project.name}
+</echo>
+  </target>
+
 </project>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message