perfsonar development work

Author: roman
Date: 2007-07-04 09:00:42 -0400 (Wed, 04 Jul 2007)
New Revision: 2510

Modified:
   branches/new-structure/trunk/perfsonar_base/ant/build.xml
   branches/new-structure/trunk/perfsonar_base/ant/const.properties
Log:

use of new version number




Modified: branches/new-structure/trunk/perfsonar_base/ant/build.xml
===================================================================
--- branches/new-structure/trunk/perfsonar_base/ant/build.xml   2007-07-04 
12:54:29 UTC (rev 2509)
+++ branches/new-structure/trunk/perfsonar_base/ant/build.xml   2007-07-04 
13:00:42 UTC (rev 2510)
@@ -25,14 +25,26 @@
   <target name="compile"
           depends="lib-dependencies"
           xmlns:psbase="psbase:/base.perfsonar.org">
-    <psbase:compile srcdir="${src}" dstdir="${build}" libdir="${replib}"/>
+    <psbase:compile srcdir="${src}"
+                    dstdir="${build}"
+                    libdir="${replib}"/>
+  </target>
+
+
+  <target name="ant-jar"
+          xmlns:psbase="psbase:/base.perfsonar.org">
+
+    <delete dir="${basedir}/${build}"/>
     <mkdir dir="${basedir}/${build}/org/perfsonar/base/ant"/>
     <copy 
file="${basedir}/${src}/main/java/org/perfsonar/base/ant/antlib.xml"
           todir="${basedir}/${build}/org/perfsonar/base/ant"/>
+    <psbase:jar jarfile="${jarfilename}-ant-${version}.jar"
+                dstdir="${build}"
+                classdir="${build}/"/>
   </target>
 
 
-  <target name="jar"
+  <target name="class-jar"
           depends="compile"
           xmlns:psbase="psbase:/base.perfsonar.org">
     <psbase:jar jarfile="${jarfilename}-${version}.jar"
@@ -71,7 +83,7 @@
     <psbase:lib-dependencies/>
 
     <artifact:dependencies>
-      <dependency groupId="nmwg" artifactId="nmwg" version="1.0.20070702"/>
+      <dependency groupId="nmwg" artifactId="nmwg" version="1.0.20070704"/>
       <localRepository  refid="local.repository"/>
       <remoteRepository refid="remote.repository"/>
     </artifact:dependencies>

Modified: branches/new-structure/trunk/perfsonar_base/ant/const.properties
===================================================================
--- branches/new-structure/trunk/perfsonar_base/ant/const.properties    
2007-07-04 12:54:29 UTC (rev 2509)
+++ branches/new-structure/trunk/perfsonar_base/ant/const.properties    
2007-07-04 13:00:42 UTC (rev 2510)
@@ -13,4 +13,4 @@
 # name of jar file to be created
 jarfilename=perfsonar-base
 # version of the product (will be included in the final name of jar file)
-version=1.0.20070702
\ No newline at end of file
+version=1.0.20070704
\ No newline at end of file