Changeset 19873

Show
Ignore:
Timestamp:
22.06.2009 13:39:23 (10 years ago)
Author:
kjdon
Message:

added a few missing depends to new-install targets. changed all gdbm.installed.path to gdbm.home

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r19871 r19873  
    321321  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? --> 
    322322 
    323   <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax" 
     323  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax" 
    324324    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this."> 
    325325 
     
    335335    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/> 
    336336 
    337   <target name="install-common-src" depends="init,configure-common-src,compile-common-src"/> 
    338   <target name="install-collection-building" depends="init,configure-collection-building,compile-collection-building"/> 
     337  <target name="install-common-src" depends="init,configure-common-src,compile-common-src,install-auxiliary-jar-files,install-jni-files"/> 
     338  <target name="install-collection-building" depends="init,configure-collection-building,compile-collection-building,install-auxiliary-jar-files,install-jni-files"/> 
    339339  <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core"/> 
    340340   
     
    768768      <env key="CLASSPATH" path="${tomcat.classpath}"/> 
    769769      <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}"/> 
    770       <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.installed.path}/lib"/> <!-- for mac os --> <!-- need gdbm here??--> 
     770      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.home}/lib"/> <!-- for mac os --> <!-- need gdbm here??--> 
    771771      <env key="WNHOME" path="${wn.home}"/> 
    772772    </exec> 
     
    11761176      <arg value="--prefix=${basedir}"/> 
    11771177      <arg value="--libdir=${lib.jni}"/> 
    1178       <arg value="--with-gdbm=${gdbm.installed.path}"/> 
     1178      <arg value="--with-gdbm=${gdbm.home}"/> 
    11791179    </exec>     
    11801180  </target> 
     
    13541354    <echo>checking out common-src</echo> 
    13551355    <svn> 
    1356       <checkout url="${svn.root}/gsdl/common-src" destPath="common-src" revision="${branch.revision}"/> 
     1356      <checkout url="${svn.root}/gsdl/trunk/common-src" destPath="common-src" revision="${branch.revision}"/> 
    13571357    </svn> 
    13581358  </target> 
     
    14901490      <env key="gsdl3path" path="${basedir}"/> 
    14911491      <env key="gsdlpath" path="${gs2build.home}"/> 
    1492       <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.installed.path}/lib"/> 
     1492      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.home}/lib"/> 
    14931493    </exec> 
    14941494    <exec executable="${basedir}/gli/gli.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true">