Changeset 29150


Ignore:
Timestamp:
07/17/14 16:34:45 (7 years ago)
Author:
ak19
Message:

There is no ext/solr/web anymore. Moving the if test on this of the add-service target along with related actions to its own target, so that the add-service target still gets executed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/build.xml

    r29139 r29150  
    66  <property name="src.home" value="${basedir}/src/java"/>
    77  <property name="build.home" value="${basedir}/build"/>
     8  <available property="ext.web.exists" file="${basedir}/web" type="dir" />
    89
    910  <!-- greenstone3 paths -->
     
    150151    <unzip dest="${localsite.collectdir}/solr-jdbm-demo" src="${localsite.collectdir}/solr-jdbm-demo/index.zip" />
    151152
    152     <!-- copy the content of the web folder (avoiding the top-level .svn directory) -->
    153     <available property="ext.web.exists" file="${basedir}/web" type="dir" />
    154 
    155   </target>
    156  
    157   <target name="add-service" depends="copy-files,compile"
    158     description="Run this target to setup the Solr extension for Greenstone3"> <!--if="ext.web.exists"-->
    159    
    160     <echo/>
    161     <echo>Copy to gsdl3 web: the content of the ${basedir}/web folder (excluding .svn)</echo>
    162     <copy todir="${web.extdir}">
    163           <dirset dir="${basedir}/web">
    164         <exclude name=".svn"/>
    165       </dirset>
    166     </copy>
    167 
    168   </target>
     153
     154  </target>
     155 
     156
     157  <!-- copy the content of the web folder (avoiding the top-level .svn directory) -->
     158  <target name="copy-solr-web" if="ext.web.exists">
     159    <echo/>
     160    <echo>Copy to gsdl3 web: the content of the ${basedir}/web folder (excluding .svn)</echo>
     161    <copy todir="${web.extdir}">
     162      <dirset dir="${basedir}/web">
     163    <exclude name=".svn"/>
     164      </dirset>
     165    </copy>
     166  </target>
     167
     168  <target name="add-service" depends="copy-solr-web,copy-files,compile" description="Run this target to setup the Solr extension for Greenstone3" />
     169
    169170 
    170171  <target name="del-service"
Note: See TracChangeset for help on using the changeset viewer.