Changeset 19873 for greenstone3

Timestamp:

2009-06-22T13:39:23+12:00 (15 years ago)

Author:

kjdon

Message:

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

File:

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

greenstone3/trunk/build.xml

@@ -321 +321 @@
   <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
 
-  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax"
+  <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"
     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.">
 
@@ -335 +335 @@
     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/>
 
-  <target name="install-common-src" depends="init,configure-common-src,compile-common-src"/>
-  <target name="install-collection-building" depends="init,configure-collection-building,compile-collection-building"/>
+  <target name="install-common-src" depends="init,configure-common-src,compile-common-src,install-auxiliary-jar-files,install-jni-files"/>
+  <target name="install-collection-building" depends="init,configure-collection-building,compile-collection-building,install-auxiliary-jar-files,install-jni-files"/>
   <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core"/>
   
@@ -768 +768 @@
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
       <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}"/>
-      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.installed.path}/lib"/> <!-- for mac os --> <!-- need gdbm here??-->
+      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${gdbm.home}/lib"/> <!-- for mac os --> <!-- need gdbm here??-->
       <env key="WNHOME" path="${wn.home}"/>
     </exec>
@@ -1176 +1176 @@
       <arg value="--prefix=${basedir}"/>
       <arg value="--libdir=${lib.jni}"/>
-      <arg value="--with-gdbm=${gdbm.installed.path}"/>
+      <arg value="--with-gdbm=${gdbm.home}"/>
     </exec>    
   </target>
@@ -1354 +1354 @@
     <echo>checking out common-src</echo>
     <svn>
-      <checkout url="${svn.root}/gsdl/common-src" destPath="common-src" revision="${branch.revision}"/>
+      <checkout url="${svn.root}/gsdl/trunk/common-src" destPath="common-src" revision="${branch.revision}"/>
     </svn>
   </target>
@@ -1490 +1490 @@
       <env key="gsdl3path" path="${basedir}"/>
       <env key="gsdlpath" path="${gs2build.home}"/>
-      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.installed.path}/lib"/>
+      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.home}/lib"/>
     </exec>
     <exec executable="${basedir}/gli/gli.bat" os="${os.windows}" dir="${basedir}/gli" spawn="true">