Changeset 36585


Ignore:
Timestamp:
2022-09-06T18:18:27+12:00 (4 weeks 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:
1 edited

Legend:

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

    r36583 r36585  
    425425
    426426  <if>
    427     <bool><available file="${web.home}/ext/webswing/etc/catalina-opts-extra.args"/></bool>
    428     <loadfile property="webswing.catalina.opts" srcfile="${web.home}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/>
     427    <bool><available file="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args"/></bool>
     428    <loadfile property="webswing.catalina.opts" srcfile="${web.writablehome}/ext/webswing/etc/catalina-opts-extra.args" failonerror="true"/>
    429429    <else>
    430430      <property name="webswing.catalina.opts" value=""/>
     
    13181318  </target>
    13191319
    1320   <target name="start" depends="needs-gs3-setup,init,configure-tomcat,configure-web,configure-solr-ext,start-derby,start-tomcat"
     1320  <target name="start" depends="needs-gs3-setup,init,configure-tomcat,configure-web,configure-solr-ext,configure-webswing-ext,start-derby,start-tomcat"
    13211321    description="Startup the Tomcat server." >
    13221322    <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>
     
    17381738  <target name="install-webswing-ext" depends="init" >
    17391739    <exec executable="ant.bat" osfamily="windows" dir="${webswing-ext.home}" spawn="false" failonerror="true">
     1740      <arg value="-Dweb.home=${web.home}"/>
     1741      <arg value="-Dweb.writablehome=${web.writablehome}"/>
    17401742      <arg value="add-extension"/>
    17411743    </exec>
    17421744    <exec executable="ant" os="${os.unix}" dir="${webswing-ext.home}" spawn="false" failonerror="true">
     1745      <arg value="-Dweb.home=${web.home}"/>
     1746      <arg value="-Dweb.writablehome=${web.writablehome}"/>     
    17431747      <arg value="add-extension"/>
    17441748    </exec>
     
    26452649    </copy>
    26462650  </target>
    2647  
     2651
     2652  <target name="configure-webswing-ext" depends="init" >
     2653    <exec executable="ant.bat" osfamily="windows" dir="${webswing-ext.home}" spawn="false" failonerror="true">
     2654      <arg value="-Dweb.home=${web.home}"/>
     2655      <arg value="-Dweb.writablehome=${web.writablehome}"/>
     2656      <arg value="configure-extension"/>
     2657    </exec>
     2658    <exec executable="ant" os="${os.unix}" dir="${webswing-ext.home}" spawn="false" failonerror="true">
     2659      <arg value="-Dweb.home=${web.home}"/>
     2660      <arg value="-Dweb.writablehome=${web.writablehome}"/>
     2661      <arg value="configure-extension"/>
     2662    </exec>
     2663  </target> 
     2664 
    26482665  <!-- This target runs tomcat's "bin/catalina.bat(.sh) jpda start"
    26492666       to allow debugging the running GS3 server in Eclipse. See the instructions at
Note: See TracChangeset for help on using the changeset viewer.