Changeset 13611


Ignore:
Timestamp:
2007-01-15T10:15:55+13:00 (15 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/build.xml

    r13608 r13611  
    139139  <property name="mgpp.home" value="${src.packages.home}/mgpp"/>
    140140  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
    141 
     141  <property name="lucene.home" value="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap"/>
    142142<!--  ==================== Compilation Control Options ==================== -->
    143143
     
    12531253    </echo>
    12541254  </target>
     1255 
    12551256  <target name="compile-lucene" depends="init">
    12561257    <mkdir dir="${gs2build.home}/bin/java"/>
    1257     <exec executable="make" os="${os.unix}" dir="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap">
    1258       <arg value="compile"/>
    1259     </exec>
    1260     <exec executable="make" os="${os.unix}" dir="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap">
    1261       <arg value="jar"/>
    1262     </exec>
    1263     <exec executable="make" os="${os.unix}" dir="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap">
    1264       <arg value="install"/>
    1265     </exec>
    1266     <copy file="${gs2build.home}/src/java/org/nzdl/gsdl/LuceneWrap/LuceneWrap.jar" tofile="${web.home}/WEB-INF/lib/LuceneWrap.jar"/>
    1267   </target>
    1268 
     1258    <mkdir dir="${lucene.home}/classes"/>
     1259    <javac srcdir="${lucene.home}"
     1260      destdir="${lucene.home}/classes"
     1261      debug="${compile.debug}"
     1262      deprecation="${compile.deprecation}"
     1263      optimize="${compile.optimize}"
     1264      classpath="${lucene.home}:${lucene.home}/lib/lucene-core-2.0.0.jar"/>
     1265    <unjar src="${lucene.home}/lib/lucene-core-2.0.0.jar"
     1266      dest="${lucene.home}/classes"/>
     1267    <jar destfile="${lucene.home}/LuceneWrap.jar"
     1268      basedir="${lucene.home}/classes"/>
     1269    <copy file="${lucene.home}/LuceneWrap.jar" todir="${web.lib}"/>
     1270    <copy file="${lucene.home}/LuceneWrap.jar" todir="${gs2build.home}/bin/java"/>
     1271  </target>
     1272 
     1273  <target name="clean-lucene" depends="init">
     1274    <delete dir="${lucene.home}/classes"/>
     1275    <delete file="${lucene.home}/LuceneWrap.jar"/>
     1276  </target>
     1277 
    12691278</project>
    12701279
Note: See TracChangeset for help on using the changeset viewer.