Changeset 29150 for gs3-extensions/solr/trunk

Timestamp:

2014-07-17T16:34:45+12:00 (10 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:

• gs3-extensions/solr/trunk/src/build.xml (modified) (2 diffs)

gs3-extensions/solr/trunk/src/build.xml

@@ -6 +6 @@
   <property name="src.home" value="${basedir}/src/java"/>
   <property name="build.home" value="${basedir}/build"/>
+  <available property="ext.web.exists" file="${basedir}/web" type="dir" />
 
   <!-- greenstone3 paths -->
@@ -150 +151 @@
     <unzip dest="${localsite.collectdir}/solr-jdbm-demo" src="${localsite.collectdir}/solr-jdbm-demo/index.zip" />
 
-    <!-- copy the content of the web folder (avoiding the top-level .svn directory) -->
-    <available property="ext.web.exists" file="${basedir}/web" type="dir" />
-
-  </target>
-  
-  <target name="add-service" depends="copy-files,compile" 
-    description="Run this target to setup the Solr extension for Greenstone3"> <!--if="ext.web.exists"-->
-    
-    <echo/>
-    <echo>Copy to gsdl3 web: the content of the ${basedir}/web folder (excluding .svn)</echo>
-    <copy todir="${web.extdir}">
-          <dirset dir="${basedir}/web">
-        <exclude name=".svn"/>
-      </dirset> 
-    </copy>
-
-  </target>
+
+  </target>
+  
+
+  <!-- copy the content of the web folder (avoiding the top-level .svn directory) -->
+  <target name="copy-solr-web" if="ext.web.exists">
+    <echo/>
+    <echo>Copy to gsdl3 web: the content of the ${basedir}/web folder (excluding .svn)</echo>
+    <copy todir="${web.extdir}">
+      <dirset dir="${basedir}/web">
+    <exclude name=".svn"/>
+      </dirset> 
+    </copy>
+  </target>
+
+  <target name="add-service" depends="copy-solr-web,copy-files,compile" description="Run this target to setup the Solr extension for Greenstone3" />
+
   
   <target name="del-service"