perfsonar development work

Author: roman
Date: 2006-12-18 06:20:12 -0500 (Mon, 18 Dec 2006)
New Revision: 1835

Modified:
   trunk/perfsonar/ant/rrdma/rrdjtool-compile-targets.xml
   trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml
   trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml
Log:
- building the rrdjtool in pre-install step improved (new simpler questions)
- new test (echo request) in test target

Modified: trunk/perfsonar/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdjtool-compile-targets.xml      2006-12-15 
10:15:24 UTC (rev 1834)
+++ trunk/perfsonar/ant/rrdma/rrdjtool-compile-targets.xml      2006-12-18 
11:20:12 UTC (rev 1835)
@@ -35,8 +35,10 @@
     <target name="init-rrdjtool" depends="init">
 
         <property file="ant/const.properties" />
+        <!--
         <property name="rrd_h_path" value="${rrdtool_path}/include" />
         <property name="rrd_lib_path" value="${rrdtool_path}/lib" />
+        -->
 
     </target>
 

Modified: trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml     2006-12-15 
10:15:24 UTC (rev 1834)
+++ trunk/perfsonar/ant/rrdma/rrdma-pre-install-targets.xml     2006-12-18 
11:20:12 UTC (rev 1835)
@@ -33,6 +33,7 @@
 
     <target name="get-rrdjtool-home">
 
+<!--
         <input message="Enter the home directory where the rrdtool is 
installed (I need the home directory and not the directory where the 
executable binary is present) [/usr/local/rrdtool]: "
             addproperty="_rrdtool_path"
             defaultvalue="/usr/local/rrdtool" />
@@ -44,7 +45,25 @@
             <entry  key="rrdtool_path" value="${_rrdtool_path}"/>
 
         </propertyfile>
+-->
 
+        <input message="Enter the directory path where header file of the 
rrdtool (rrd.h) can be found [/usr/local/rrdtool/include]: "
+            addproperty="_rrd_h_path"
+            defaultvalue="/usr/local/rrdtool/include" />
+
+        <input message="Enter the directory path where library files of the 
rrdtool (librrd*) can be found [/usr/local/rrdtool/lib]: "
+            addproperty="_rrd_lib_path"
+            defaultvalue="/usr/local/rrdtool/lib" />
+
+        <propertyfile file="ant/const.properties" 
+            comment="This file was created by the Ant configuration script.">
+
+            <entry  key="rrdjdir"      value="${basedir}/contrib/rrdjtool"/>
+            <entry  key="rrd_h_path"   value="${_rrd_h_path}"/>
+            <entry  key="rrd_lib_path" value="${_rrd_lib_path}"/>
+
+        </propertyfile>
+
     </target>
 
 
@@ -61,7 +80,7 @@
     </target>
 
 
-    <target name="rrdjtool-question">
+    <target name="rrdjtool-platform-question">
 
         <input message="Which OS platform do you use: "
             addproperty="_os.platform"
@@ -72,7 +91,7 @@
 
 
     <target name="rrdjtool-call"
-        depends="rrdjtool-question">
+        depends="rrdjtool-platform-question">
 
         <condition property="linux.os.platform">
             <equals arg1="linux" arg2="${_os.platform}"/>
@@ -163,12 +182,35 @@
     </target>
 
 
+    <target name="rrdjtool-build-question">
+
+        <input message="Do you want me to compile rrdjtool library for you 
(if not you will have to do it manually in ${basedir}/contrib/rrdjtool after 
pre-install step)? "
+            addproperty="_rrdjtool.build.decision"
+            validargs="y,n"
+            defaultvalue="n" />
+
+        <condition property="rrdjtool.build.decision">
+            <equals arg1="y" arg2="${_rrdjtool.build.decision}"/>
+        </condition>
+
+    </target>
+
+
+    <target name="_rrdjtool"
+        depends="rrdjtool-call-for-linux,
+            rrdjtool-call-for-linux64,
+            rrdjtool-call-for-freebsd,
+            rrdjtool-call-for-solaris,
+            rrdjtool-call-for-other">
+    </target>
+
+
     <target name="rrdjtool"
-            depends="rrdjtool-call-for-linux,
-                     rrdjtool-call-for-linux64,
-                     rrdjtool-call-for-freebsd,
-                     rrdjtool-call-for-solaris,
-                     rrdjtool-call-for-other">
+        depends="rrdjtool-build-question"
+        if="rrdjtool.build.decision">
+
+        <antcall target="_rrdjtool"/>
+
     </target>
 
 
@@ -566,7 +608,6 @@
         <antcall target="get-server-address"/>
         <antcall target="get-server-port"/>
 
-        <echo>${line.separator}Building the rrdjtool library...</echo>
         <antcall target="rrdjtool"/>
 
         <echo></echo>

Modified: trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml
===================================================================
--- trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml        2006-12-15 
10:15:24 UTC (rev 1834)
+++ trunk/perfsonar/ant/rrdma/rrdma-test-run-targets.xml        2006-12-18 
11:20:12 UTC (rev 1835)
@@ -19,6 +19,8 @@
 
     <target name="test">
 
+        <antcall target="run-echo"/>
+
         <antcall target="run-rrdma-client-1"/>
         <antcall target="run-rrdma-client-2"/>
         <antcall target="run-rrdma-client-3"/>