perfsonar development work

Author: uros
Date: 2006-08-21 09:21:24 -0400 (Mon, 21 Aug 2006)
New Revision: 1554

Added:
   trunk/perfsonar/ant/tcmp/tcmp-libs-download-targets.xml
Modified:
   trunk/perfsonar/ant/build-tcmp.xml
   trunk/perfsonar/ant/tcmp/mapijni-compile-targets.xml
Log:
Lib download targets added according to Roman request using maven artifact 
library. Fixed the mapi-jni jar build accordingly.

Modified: trunk/perfsonar/ant/build-tcmp.xml
===================================================================
--- trunk/perfsonar/ant/build-tcmp.xml  2006-08-21 11:02:22 UTC (rev 1553)
+++ trunk/perfsonar/ant/build-tcmp.xml  2006-08-21 13:21:24 UTC (rev 1554)
@@ -23,7 +23,7 @@
 
 
         <path id="classpath">
-            <fileset dir="./lib">
+            <fileset dir="./lib/repository">
                 <include name="**/*.jar"/>
             </fileset>
             <pathelement location="build"/>
@@ -42,7 +42,8 @@
         <import file="javadoc-targets.xml"/>
         <import file="webservice-env-targets.xml"/>
         <import file="java-compile-targets.xml"/>
-        <import file="axis-deploy-targets.xml"/>
+        <import file="axis-deploy-targets-2.xml"/>
+        <import file="libs-download-targets.xml"/>
 
 
 
@@ -53,6 +54,7 @@
         <import file="tcmp/tcmp-java-compile-targets.xml"/>
         <import file="tcmp/tcmp-client-run-targets.xml"/>
         <import file="tcmp/tcmp-configure-targets.xml"/>
+        <import file="tcmp/tcmp-libs-download-targets.xml"/>
 
 
 </project>

Modified: trunk/perfsonar/ant/tcmp/mapijni-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/tcmp/mapijni-compile-targets.xml        2006-08-21 
11:02:22 UTC (rev 1553)
+++ trunk/perfsonar/ant/tcmp/mapijni-compile-targets.xml        2006-08-21 
13:21:24 UTC (rev 1554)
@@ -53,7 +53,8 @@
 
         <echo message="Creating mapi-jni JAR file." />
         <ant inheritAll="false" dir="contrib/mapi-jni/java" 
antfile="ant/build.xml" target="dist" />
-        <copy file="contrib/mapi-jni/java/dist/mapi-jni.jar" 
todir="lib/mapi-jni" />
+        <mkdir dir="lib/repository/mapi-jni" />
+        <copy file="contrib/mapi-jni/java/dist/mapi-jni.jar" 
todir="lib/repository/mapi-jni" />
 
     </target>
 
@@ -61,7 +62,7 @@
 
     <!-- this target is for LINUX platform -->
 
-    <target name="build-mapijni" depends="jar-mapijni">
+    <target name="build-native-mapijni" depends="init">
 
         <exec dir="contrib/mapi-jni/native/src" executable="/usr/bin/make">
             <arg line="clean" />
@@ -84,6 +85,7 @@
 
     </target>
 
+    <target name="build-mapijni" depends="jar-mapijni, build-native-mapijni" 
/>
 
 </project>
 

Added: trunk/perfsonar/ant/tcmp/tcmp-libs-download-targets.xml


Property changes on: trunk/perfsonar/ant/tcmp/tcmp-libs-download-targets.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native