perfsonar development work

Author: roman
Date: 2006-11-29 08:28:57 -0500 (Wed, 29 Nov 2006)
New Revision: 1783

Modified:
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml
Log:
64-bit linux supported for building the rrdjtool library. Not tested.

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml  
  2006-11-29 12:50:58 UTC (rev 1782)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdjtool-compile-targets.xml  
  2006-11-29 13:28:57 UTC (rev 1783)
@@ -68,7 +68,7 @@
 
 
 
-        <!-- this target is for LINUX platform -->
+    <!-- this target is for LINUX platform -->
 
     <target name="build-rrdjtool" depends="jar-rrdjtool">
 
@@ -83,18 +83,28 @@
                         -lc -lrrd"/>
         </exec>
 
-        <!--
-        <echo message="" />
-        <echo message="" />
-        <echo message="Now you need to setup LD_LIBRARY_PATH env variable 
which should contain" />
-        <echo message="${rrd_lib_path}:${rrdjdir}/build" />
-        <echo message="" />
-        -->
-
     </target>
 
 
+    <!-- this target is for LINUX 64-bit platform -->
 
+    <target name="build-rrdjtool-64bit" depends="jar-rrdjtool">
+
+        <exec dir="${rrdjdir}/native" executable="/usr/bin/gcc">
+            <arg line="-o ${rrdjdir}/build/${lib_name}
+                -shared -Wl,-soname,${rrdjdir}/build/${lib_name} 
+                -I ${rrd_h_path} 
+                -L${rrd_lib_path} 
+                -I ${jdk_path}/include 
+                -I ${jdk_path}/include/linux/ 
+                ${rrdjdir}/native/Rrd.c 
+                -lc -lrrd
+                -fPIC"/>
+        </exec>
+
+    </target>
+
+
     <!-- this target is for FREEBSD platform -->
 
     <target name="build-rrdjtool-freebsd" depends="jar-rrdjtool">
@@ -110,14 +120,6 @@
                         -lc -lrrd"/>
         </exec>
 
-        <!--
-        <echo message="" />
-        <echo message="" />
-        <echo message="Now you need to setup LD_LIBRARY_PATH env variable 
which should contain" />
-        <echo message="${rrd_lib_path}:${rrdjdir}/build" />
-        <echo message="" />
-        -->
-
     </target>
 
 
@@ -137,14 +139,6 @@
                         -lc -lrrd"/>
         </exec>
 
-        <!--
-        <echo message="" />
-        <echo message="" />
-        <echo message="Now you need to setup LD_LIBRARY_PATH env variable 
which should contain" />
-        <echo message="${rrd_lib_path}:${rrdjdir}/build" />
-        <echo message="" />
-        -->
-
     </target>
 
 

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 12:50:58 UTC (rev 1782)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-pre-install-targets.xml 
  2006-11-29 13:28:57 UTC (rev 1783)
@@ -56,7 +56,7 @@
 
         <input message="Which OS platform do you use: "
             addproperty="_os.platform"
-            validargs="linux,freebsd,solaris"
+            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) [${rrdtool.path}]: "
@@ -83,6 +83,10 @@
             <equals arg1="linux"   arg2="${_os.platform}"/>
         </condition>
 
+        <condition property="linux64.os.platform">
+            <equals arg1="linux-64bit"   arg2="${_os.platform}"/>
+        </condition>
+
         <condition property="freebsd.os.platform">
             <equals arg1="freebsd" arg2="${_os.platform}"/>
         </condition>
@@ -103,6 +107,15 @@
     </target>
 
 
+    <target name="rrdjtool-call-for-linux64"
+        depends="rrdjtool-call"
+        if="linux64.os.platform">
+        
+        <antcall target="build-rrdjtool-64bit" />
+        
+    </target>
+
+
     <target name="rrdjtool-call-for-freebsd"
         depends="rrdjtool-call"
         if="freebsd.os.platform">
@@ -123,6 +136,7 @@
 
     <target name="rrdjtool"
             depends="rrdjtool-call-for-linux,
+                     build-rrdjtool-64bit,
                      rrdjtool-call-for-freebsd,
                      rrdjtool-call-for-solaris">
     </target>