perfsonar development work

Author: roman
Date: 2006-11-30 03:22:48 -0500 (Thu, 30 Nov 2006)
New Revision: 1788

Modified:
   branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
Log:
Discovery of java path and rrdtool path swiched off. Sometimes it didn't work 
and then it was confusing 
how that paths should look like.

Modified: branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml       
2006-11-29 22:25:17 UTC (rev 1787)
+++ branches/romradz-ant4rel-20061017/ant/pre-install-targets.xml       
2006-11-30 08:22:48 UTC (rev 1788)
@@ -31,6 +31,7 @@
     <!-- getting the java path -->
 
 
+    <!--
     <target name="_get-java-path">
 
         <exec executable="which"
@@ -53,8 +54,19 @@
         />
 
     </target>
+    -->
 
 
+    <target name="get-java-path">
+
+        <input message="Enter the home directory where the Java is installed 
(I need the home directory and not the directory where the executable binary 
is present) [/usr/local/jdk1.5.0]:"
+            addproperty="java.path"
+            defaultvalue="/usr/local/jdk1.5.0"
+        />
+
+    </target>
+
+
     <!-- getting the service directory -->
 
 

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-11-29 22:25:17 UTC (rev 1787)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-11-30 08:22:48 UTC (rev 1788)
@@ -24,7 +24,7 @@
 
     <!-- getting the path of RRDTool application -->
 
-
+    <!--
     <target name="_get-rrdtool-path">
 
         <exec executable="which"
@@ -43,14 +43,15 @@
 
         <dirname property="__rrdtool.path" file="${full.rrdtool.path}"/>
         <dirname property="rrdtool.path" file="${__rrdtool.path}"/>
-        <!--<echo message="Accepted RRDTool base path: ${rrdtool.path}"/>-->
 
     </target>
+    -->
 
 
     <!-- building rrdjtool library -->
 
 
+    <!--
     <target name="rrdjtool-question"
         depends="get-rrdtool-path">
 
@@ -64,8 +65,23 @@
             defaultvalue="${rrdtool.path}" />
 
     </target>
+    -->
 
 
+    <target name="rrdjtool-question">
+
+        <input message="Which OS platform do you use: "
+            addproperty="_os.platform"
+            validargs="linux,linux-64bit,freebsd,solaris"
+            defaultvalue="linux" />
+
+        <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" />
+
+    </target>
+
+
     <target name="rrdjtool-call"
         depends="rrdjtool-question, get-java-path">