Changeset 28115

Show
Ignore:
Timestamp:
22.08.2013 11:42:40 (6 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r28044 r28115  
    624624  <!-- ==================== Primary and Global Targets ============================= --> 
    625625 
    626   <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" 
     626  <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" 
    627627    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."> 
    628628 
     
    659659 
    660660  <!-- 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 --> 
    661   <target name="install" depends="init,install-common-src,install-collection-building,install-runtime,setup-for-eclipse" 
     661  <target name="install" depends="init,install-common-src,install-collection-building,install-runtime,install-solr-ext,setup-for-eclipse" 
    662662    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'."/> 
    663663 
     
    10671067 
    10681068   
    1069   <target name="prepare-solr-ext" depends="init" > 
     1069  <target name="install-solr-ext" depends="init" > 
    10701070    <exec executable="ant.bat" osfamily="windows" dir="${solr-ext.home}" spawn="false"> 
    10711071      <arg value="add-service"/>