Changeset 36584 for gs3-extensions/webswing/trunk/build.xml

Timestamp:

2022-09-06T18:18:21+12:00 (20 months ago)

Author:

davidb

Message:

More nuanced install/configure targets, so when top-level build.xml does an 'ant start' it now reconfigures the necessary webswing config files

File:

• gs3-extensions/webswing/trunk/build.xml (modified) (4 diffs)

gs3-extensions/webswing/trunk/build.xml

@@ -38 +38 @@
 
   <!-- greenstone3 paths -->
-  <property name="gsdl3srchome" location="${basedir}/../.."/> <!-- location property creates an absolute path -->
-  <property name="web.home" location="${basedir}/../../web"/> <!-- location property creates an absolute path -->
-  <property name="web.extdir" value="${web.home}/ext/webswing"/>
+  <property name="gsdl3srchome"     location="${basedir}/../.."/>     <!-- location property creates an absolute path -->
+  <property name="web.home"         location="${basedir}/../../web"/> <!-- location property creates an absolute path, default if not set with -D argument -->
+  <property name="web.writablehome" location="${basedir}/../../web"/> <!-- location property creates an absolute path, default if not set with -D argument -->
+  <property name="web.extdir" value="${web.writablehome}/ext/webswing"/>
   
   <!-- local ext paths -->
@@ -111 +112 @@
     <for param="configFile" list="${etc-config-files}">
       <sequential>
-    <echo message="Processing ${basedir}/web/etc/@{configFile}.in"/>
-    <copy file="${basedir}/web/etc/@{configFile}.in" tofile="${web.extdir}/etc/@{configFile}" filtering="true" overwrite="true">
-      <filterset>
-        <filter token="gsdl3srchome" value="${gsdl3srchome}"/>
-      </filterset>
-    </copy>
+    <echo message="Installing ${basedir}/web/etc/@{configFile}.in"/>
+    <copy file="${basedir}/web/etc/@{configFile}.in" tofile="${web.extdir}/etc/@{configFile}.in" overwrite="true" />
       </sequential>
     </for>
@@ -123 +120 @@
       <sequential>      
     <echo/>
-    <echo>Installing ${basedir}/web/@{configDir}/ (excluding .svn)</echo>
+    <echo>Installing directory ${basedir}/web/@{configDir}/ (excluding .svn)</echo>
     <copy todir="${web.extdir}">
       <fileset dir="${basedir}/web">
@@ -144 +141 @@
 
 
+  <target name="configure-extension">   
+    <for param="configFile" list="${etc-config-files}">
+      <sequential>
+    <echo message="Configuring ${web.extdir}/etc/@{configFile}"/>  
+    <copy file="${web.extdir}/etc/@{configFile}.in" tofile="${web.extdir}/etc/@{configFile}" filtering="true" overwrite="true">
+      <filterset>
+        <filter token="gsdl3srchome" value="${gsdl3srchome}"/>
+      </filterset>
+    </copy>
+      </sequential>
+    </for>
+  </target>
+    
   <target name="accept-del-extension" unless="delextension.accepted">
     <input addproperty="delextension.ok" validargs="y,n">This will recursively delete all the files in: