Changeset 13611

Timestamp:

2007-01-15T10:15:55+13:00 (17 years ago)

Author:

kjdon

Message:

changed the compile-lucene target to use java directly rather than the Makefile - so it will work on all platforms

File:

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

trunk/gsdl3/build.xml

@@ -139 +139 @@
   <property name="mgpp.home" value="${src.packages.home}/mgpp"/>
   <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
-
+  <property name="lucene.home" value="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap"/>
 <!--  ==================== Compilation Control Options ==================== -->
 
@@ -1253 +1253 @@
     </echo>
   </target>
+  
   <target name="compile-lucene" depends="init">
     <mkdir dir="${gs2build.home}/bin/java"/>
-    <exec executable="make" os="${os.unix}" dir="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap">
-      <arg value="compile"/>
-    </exec>
-    <exec executable="make" os="${os.unix}" dir="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap">
-      <arg value="jar"/>
-    </exec>
-    <exec executable="make" os="${os.unix}" dir="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap">
-      <arg value="install"/>
-    </exec>
-    <copy file="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap/LuceneWrap.jar" tofile="${web.home}/WEB-INF/lib/LuceneWrap.jar"/>
-  </target>
-
+    <mkdir dir="${lucene.home}/classes"/>
+    <javac srcdir="${lucene.home}"
+      destdir="${lucene.home}/classes"
+      debug="${compile.debug}"
+      deprecation="${compile.deprecation}"
+      optimize="${compile.optimize}"
+      classpath="${lucene.home}:${lucene.home}/lib/lucene-core-2.0.0.jar"/>
+    <unjar src="${lucene.home}/lib/lucene-core-2.0.0.jar"
+      dest="${lucene.home}/classes"/>
+    <jar destfile="${lucene.home}/LuceneWrap.jar"
+      basedir="${lucene.home}/classes"/>
+    <copy file="${lucene.home}/LuceneWrap.jar" todir="${web.lib}"/>
+    <copy file="${lucene.home}/LuceneWrap.jar" todir="${gs2build.home}/bin/java"/>
+  </target>
+  
+  <target name="clean-lucene" depends="init">
+    <delete dir="${lucene.home}/classes"/>
+    <delete file="${lucene.home}/LuceneWrap.jar"/>
+  </target>
+  
 </project>