Changeset 13739

Timestamp:

2007-01-23T12:27:54+13:00 (17 years ago)

Author:

kjdon

Message:

made new indexers repository work when coll building is enabled - we set indexers.home to be gs2build/indexers, and copy java and jni files from there to gs3 places

File:

• trunk/gsdl3/build.xml (modified) (10 diffs)

trunk/gsdl3/build.xml

@@ -51 +51 @@
   <property name="src.home" value="${basedir}/src/java"/>
   <property name="src.packages.home" value="${basedir}/src/packages"/>
-  <property name="indexers.home" value="${basedir}/src/packages/indexers"/>
   <property name="packages.home" value="${basedir}/packages"/>
   <!-- this may be set in build.properties, eg if you move the web dir to 
@@ -64 +63 @@
   <!-- jni libraries and java wrappers go here -->
   <property name="lib.jni" value="${basedir}/lib/jni"/>
-  
+    
   <property name="javadocs" value="${basedir}/docs/javadoc"/>
 
@@ -131 +130 @@
   </condition>
   
+  <condition property="independent-indexers">
+    <isset property="disable.collection.building"/>
+  </condition>
+    
   <!-- ============= Base dirs for each package and component ============ -->
   <property name="applet.home" value="${src.home}/org/greenstone/applet"/>
@@ -137 +140 @@
   <property name="gs2build.home" value="${basedir}/gs2build"/>
   <property name="gli.home" value="${basedir}/gli"/>
+  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
+
+  <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">-->
+  <condition property="indexers.home" value="${basedir}/src/packages/indexers">
+    <isset property="disable.collection.building"/>
+  </condition>
+  <condition property="indexers.home" value="${gs2build.home}/indexers">
+    <not>
+      <isset property="disable.collection.building"/>
+    </not>
+  </condition>
+
   <property name="mg.home" value="${indexers.home}/mg"/>
   <property name="mgpp.home" value="${indexers.home}/mgpp"/>
-  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
   <property name="lucene.home" value="${indexers.home}/lucene-gs"/>
+
+
 <!--  ==================== Compilation Control Options ==================== -->
 
@@ -237 +253 @@
 
   <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections"
-    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this."/>
-
+    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this.">
+    <!-- make sure .sh files are executable -->
+    <chmod dir="${basedir}" perm="ugo+rx" 
+      includes="*.sh"/>
+    <chmod dir="${basedir}/bin/script" perm="ugo+rx" 
+      includes="*.sh,*.pl"/>
+  </target>
   <target name="install" depends="init,configure,configure-c++,compile,deploy-localsite" 
     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
@@ -821 +842 @@
   </target>
 
-  <target name="checkout-indexers" depends="check-cvsroot,init" unless="nocvs.mode">
+  <target name="checkout-indexers" depends="check-cvsroot,init" if="independent-indexers" unless="nocvs.mode">
     <cvs command="checkout -P" package="indexers" dest="${src.packages.home}"/>
   </target>
   
-  <target name="prepare-indexers" depends="init" unless="indexers.present">
+  <target name="prepare-indexers" depends="init" if="independent-indexers" unless="indexers.present">
     <antcall target="checkout-indexers"/>
   </target>
@@ -836 +857 @@
   </target>
   
-  <target name="configure-packages" description="Configure only the packages.">
+  <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers" 
+    description="Configure only the packages."/>
+  
+  <target name="configure-javagdbm">
     <echo>
       Configuring JavaGDBM
@@ -852 +876 @@
     </exec>    
     
+  </target>
+  <target name="configure-indexers" depends="init" if="independent-indexers">
     <echo>
       Configuring Indexers
@@ -912 +938 @@
     
     <!-- Indexers -->
+    <!-- this may be in gs2build - we will be recompiling, but never mind -->
     <exec executable="make" os="${os.unix}"
       dir="${indexers.home}">
@@ -919 +946 @@
       <arg value="install"/>
     </exec>
-    <!-- install the jar files -->
+    <!-- install the jar and jni files -->
     <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/>
+    <copy file="${mg.home}/jni/libmgjni.so" todir="${lib.jni}"/>
+    <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>
     <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/>
+    <copy file="${mgpp.home}/jni/libmgppjni.so" todir="${lib.jni}"/>
+    <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>
     <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/>
-
+    
     <!-- TODO windows -->
   </target>