Changeset 36585 for main/trunk

Timestamp:

2022-09-06T18:18:27+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:

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

main/trunk/greenstone3/build.xml

@@ -425 +425 @@
 
   <if>
-    <bool><available file="${web.home}/ext/webswing/etc/catalina-opts-extra.args"/></bool>
-    <loadfile property="webswing.catalina.opts" srcfile="${web.home}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/>
+    <bool><available file="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args"/></bool>
+    <loadfile property="webswing.catalina.opts" srcfile="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/>
     <else>
       <property name="webswing.catalina.opts" value=""/>
@@ -1318 +1318 @@
   </target>
 
-  <target name="start" depends="needs-gs3-setup,init,configure-tomcat,configure-web,configure-solr-ext,start-derby,start-tomcat"
+  <target name="start" depends="needs-gs3-setup,init,configure-tomcat,configure-web,configure-solr-ext,configure-webswing-ext,start-derby,start-tomcat"
     description="Startup the Tomcat server." >
     <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> 
@@ -1738 +1738 @@
   <target name="install-webswing-ext" depends="init" >
     <exec executable="ant.bat" osfamily="windows" dir="${webswing-ext.home}" spawn="false" failonerror="true">
+      <arg value="-Dweb.home=${web.home}"/>
+      <arg value="-Dweb.writablehome=${web.writablehome}"/>
       <arg value="add-extension"/>
     </exec>
     <exec executable="ant" os="${os.unix}" dir="${webswing-ext.home}" spawn="false" failonerror="true">
+      <arg value="-Dweb.home=${web.home}"/>
+      <arg value="-Dweb.writablehome=${web.writablehome}"/>      
       <arg value="add-extension"/>
     </exec>
@@ -2645 +2649 @@
     </copy>
   </target>
- 
+
+  <target name="configure-webswing-ext" depends="init" >
+    <exec executable="ant.bat" osfamily="windows" dir="${webswing-ext.home}" spawn="false" failonerror="true">
+      <arg value="-Dweb.home=${web.home}"/>
+      <arg value="-Dweb.writablehome=${web.writablehome}"/>
+      <arg value="configure-extension"/>
+    </exec>
+    <exec executable="ant" os="${os.unix}" dir="${webswing-ext.home}" spawn="false" failonerror="true">
+      <arg value="-Dweb.home=${web.home}"/>
+      <arg value="-Dweb.writablehome=${web.writablehome}"/>
+      <arg value="configure-extension"/>
+    </exec>
+  </target>  
+  
   <!-- This target runs tomcat's "bin/catalina.bat(.sh) jpda start" 
        to allow debugging the running GS3 server in Eclipse. See the instructions at