Changeset 18344 for greenstone3

Show
Ignore:
Timestamp:
11.01.2009 19:43:06 (11 years ago)
Author:
davidb
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r18324 r18344  
    5959  <property name="gs2build.home" value="${basedir}/gs2build"/> 
    6060  <property name="src.packages.home" value="${basedir}/src/packages"/> 
    61   <property name="gdbm.home" value="${gs2build.home}/common-src/packages/gdbm/gdbm-1.8.3"/> 
     61  <property name="gdbm.home" value="${gs2build.home}/common-src/packages/gdbm"/> 
    6262  <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/> 
    6363  <property file="build.properties"/> 
     
    11371137    description="Configure only the packages."/> 
    11381138   
    1139   <target name="configure-javagdbm"> 
     1139  <target name="configure-javagdbm" depends="configure-gdbm,compile-gdbm"> 
    11401140    <echo> 
    11411141      Configuring JavaGDBM 
    11421142    </echo> 
    1143     <exec executable="${javagdbm.home}/configure" os="${os.linux},${os.solaris}" 
    1144       dir="${javagdbm.home}"> 
    1145       <arg value="--prefix=${basedir}"/> 
    1146       <arg value="--libdir=${lib.jni}"/> 
    1147     </exec>     
    1148     <exec executable="${javagdbm.home}/configure" os="${os.mac}" 
     1143    <exec executable="${javagdbm.home}/configure" 
    11491144      dir="${javagdbm.home}"> 
    11501145      <arg value="--prefix=${basedir}"/> 
     
    14621457      dir="${gs2build.home}"> 
    14631458      <arg value="--prefix=${gs2build.home}"/> 
     1459      <arg value="--with-gdbm=${gdbm.installed.path}"/> 
    14641460    </exec> 
    14651461    <exec executable="${gs2build.home}/configure" os="${os.mac}" 
     
    17281724      Configuring GDBM 
    17291725    </echo> 
    1730     <exec executable="${gdbm.home}/configure" os="${os.mac},${os.unix}" 
    1731       dir="${gdbm.home}"> 
     1726    <exec executable="${gdbm.home}/${gdbm.version}/configure" os="${os.mac},${os.unix}" 
     1727      dir="${gdbm.home}/${gdbm.version}"> 
    17321728      <arg value="--prefix=${gdbm.home}"/> 
    17331729    </exec>     
     
    17361732  <target name="clean-gdbm" depends="init"  if="install.gdbm">    
    17371733    <echo>clean GDBM</echo> 
    1738     <exec executable="make" os="${os.unix}" dir="${gdbm.home}" > 
     1734    <exec executable="make" os="${os.unix}" dir="${gdbm.home}/${gdbm.version}" > 
    17391735      <arg value="clean"/> 
    17401736    </exec> 
     
    17441740  <target name="distclean-gdbm" depends="init"  if="install.gdbm">    
    17451741    <echo>distclean GDBM</echo> 
    1746     <exec executable="make" os="${os.unix}" dir="${gdbm.home}" > 
     1742    <exec executable="make" os="${os.unix}" dir="${gdbm.home}/${gdbm.version}" > 
    17471743      <arg value="distclean"/> 
    17481744    </exec> 
     
    17561752    </exec> 
    17571753 
    1758     <exec executable="make" os="${os.unix}" dir="${gdbm.home}"/> 
    1759     <exec executable="make" os="${os.unix}" dir="${gdbm.home}"> 
     1754    <exec executable="make" os="${os.unix}" dir="${gdbm.home}/${gdbm.version}"/> 
     1755    <exec executable="make" os="${os.unix}" dir="${gdbm.home}/${gdbm.version}"> 
    17601756      <arg value="BINOWN=${env.USER}"/> 
    17611757      <arg value="BINGRP=${firstgroup}"/>