Changeset 2649

Timestamp:

Sep 19, 2006, 2:27:37 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

Now uses ant task instead of external program to get the subversion revision.
package target now inlcudes the revision in the generated file name.

Location:

trunk

Files:

• build.xml (modified) (7 diffs)
• lib/svn (added)
• lib/svn/JAVAHL-LICENSE (added)
• lib/svn/SVNCLIENTADAPTER-LICENSE (added)
• lib/svn/ganymed.jar (added)
• lib/svn/javasvn.jar (added)
• lib/svn/svnClientAdapter.jar (added)
• lib/svn/svnant.jar (added)
• lib/svn/svnjavahl.jar (added)

trunk/build.xml

@@ -55 +55 @@
   <!-- set global properties for this build -->
   <property name="compilerarg" value="-Xlint:unchecked" />
-  <property name="base.version" value="2.0RC2" />
+  <property name="base.version" value="2.1" />
   <property environment="env" />
   
@@ -134 +134 @@
   </path>
 
+  <path id="subversion.classpath">
+    <fileset dir="${lib}/svn">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+  
   <taskdef
     name="hibernatedoclet"
@@ -141 +147 @@
   />
 
+  <taskdef
+    name="svn"
+    classname="org.tigris.subversion.svnant.SvnTask"
+    classpathref="subversion.classpath"
+    description="Task for doing subversion from ant"
+  />
+  
   <target
     name="all"
@@ -617 +630 @@
     description="Get the current revision number in the subversion and put the value into the base.build property"
     >
+    <!--
     <exec 
       executable="svnversion"
@@ -624 +638 @@
       <arg line="." />
     </exec>
+    -->
+    <svn>
+      <status path="./credits.txt" revisionProperty="base.build" />
+    </svn>
     <echo message="Build #${base.build}" />
   </target>
@@ -722 +740 @@
   <target
     name="package"
-    depends="dist"
+    depends="dist,svn.revision"
     description="Package the distribution"
     >
     <tar
-      destfile="base-${base.version}.tar.gz"
+      destfile="base-${base.version}.${base.build}.tar.gz"
       compression="gzip"
       >
@@ -736 +754 @@
     </tar>
     <checksum
-      file="base-${base.version}.tar.gz"
+      file="base-${base.version}.${base.build}.tar.gz"
     />
   </target>