Changeset 28115 for main/trunk/greenstone3/build.xml

Timestamp:

2013-08-22T11:42:40+12:00 (11 years ago)

Author:

kjdon

Message:

changed prepare-solr-ext to install-solr-ext and moved it to install instead of prepare. Solr code is now compiled in place, and requires greenstone 3 jar file in classpath.

File:

• main/trunk/greenstone3/build.xml (modified) (3 diffs)

main/trunk/greenstone3/build.xml

@@ -624 +624 @@
   <!-- ==================== Primary and Global Targets ============================= -->
 
-  <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-solr-ext, 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.">
 
@@ -659 +659 @@
 
   <!-- install-common-src and install-collection-building are mutually exclusive and either one or the other will be done depending on whether collection building is enabled or not -->
-  <target name="install" depends="init,install-common-src,install-collection-building,install-runtime,setup-for-eclipse"
+  <target name="install" depends="init,install-common-src,install-collection-building,install-runtime,install-solr-ext,setup-for-eclipse"
     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/>
 
@@ -1067 +1067 @@
 
   
-  <target name="prepare-solr-ext" depends="init" >
+  <target name="install-solr-ext" depends="init" >
     <exec executable="ant.bat" osfamily="windows" dir="${solr-ext.home}" spawn="false">
       <arg value="add-service"/>