Changeset 18344

Timestamp:

2009-01-11T19:43:06+13:00 (15 years ago)

Author:

davidb

Message:

Order of targets changed to ensure that built-in gdbm is configured and compiled before JavaGDBM is configured

File:

• greenstone3/trunk/build.xml (modified) (7 diffs)

greenstone3/trunk/build.xml

@@ -59 +59 @@
   <property name="gs2build.home" value="${basedir}/gs2build"/>
   <property name="src.packages.home" value="${basedir}/src/packages"/>
-  <property name="gdbm.home" value="${gs2build.home}/common-src/packages/gdbm/gdbm-1.8.3"/>
+  <property name="gdbm.home" value="${gs2build.home}/common-src/packages/gdbm"/>
   <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/>
   <property file="build.properties"/>
@@ -1137 +1137 @@
     description="Configure only the packages."/>
   
-  <target name="configure-javagdbm">
+  <target name="configure-javagdbm" depends="configure-gdbm,compile-gdbm">
     <echo>
       Configuring JavaGDBM
     </echo>
-    <exec executable="${javagdbm.home}/configure" os="${os.linux},${os.solaris}"
-      dir="${javagdbm.home}">
-      <arg value="--prefix=${basedir}"/>
-      <arg value="--libdir=${lib.jni}"/>
-    </exec>    
-    <exec executable="${javagdbm.home}/configure" os="${os.mac}"
+    <exec executable="${javagdbm.home}/configure"
       dir="${javagdbm.home}">
       <arg value="--prefix=${basedir}"/>
@@ -1462 +1457 @@
       dir="${gs2build.home}">
       <arg value="--prefix=${gs2build.home}"/>
+      <arg value="--with-gdbm=${gdbm.installed.path}"/>
     </exec>
     <exec executable="${gs2build.home}/configure" os="${os.mac}"
@@ -1728 +1724 @@
       Configuring GDBM
     </echo>
-    <exec executable="${gdbm.home}/configure" os="${os.mac},${os.unix}"
-      dir="${gdbm.home}">
+    <exec executable="${gdbm.home}/${gdbm.version}/configure" os="${os.mac},${os.unix}"
+      dir="${gdbm.home}/${gdbm.version}">
       <arg value="--prefix=${gdbm.home}"/>
     </exec>    
@@ -1736 +1732 @@
   <target name="clean-gdbm" depends="init"  if="install.gdbm">   
     <echo>clean GDBM</echo>
-    <exec executable="make" os="${os.unix}" dir="${gdbm.home}" >
+    <exec executable="make" os="${os.unix}" dir="${gdbm.home}/${gdbm.version}" >
       <arg value="clean"/>
     </exec>
@@ -1744 +1740 @@
   <target name="distclean-gdbm" depends="init"  if="install.gdbm">   
     <echo>distclean GDBM</echo>
-    <exec executable="make" os="${os.unix}" dir="${gdbm.home}" >
+    <exec executable="make" os="${os.unix}" dir="${gdbm.home}/${gdbm.version}" >
       <arg value="distclean"/>
     </exec>
@@ -1756 +1752 @@
     </exec>
 
-    <exec executable="make" os="${os.unix}" dir="${gdbm.home}"/>
-    <exec executable="make" os="${os.unix}" dir="${gdbm.home}">
+    <exec executable="make" os="${os.unix}" dir="${gdbm.home}/${gdbm.version}"/>
+    <exec executable="make" os="${os.unix}" dir="${gdbm.home}/${gdbm.version}">
       <arg value="BINOWN=${env.USER}"/>
       <arg value="BINGRP=${firstgroup}"/>