Changeset 36584


Ignore:
Timestamp:
2022-09-06T18:18:21+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
  • gs3-extensions/webswing/trunk/build.xml

    r36537 r36584  
    3838
    3939  <!-- greenstone3 paths -->
    40   <property name="gsdl3srchome" location="${basedir}/../.."/> <!-- location property creates an absolute path -->
    41   <property name="web.home" location="${basedir}/../../web"/> <!-- location property creates an absolute path -->
    42   <property name="web.extdir" value="${web.home}/ext/webswing"/>
     40  <property name="gsdl3srchome"     location="${basedir}/../.."/>     <!-- location property creates an absolute path -->
     41  <property name="web.home"         location="${basedir}/../../web"/> <!-- location property creates an absolute path, default if not set with -D argument -->
     42  <property name="web.writablehome" location="${basedir}/../../web"/> <!-- location property creates an absolute path, default if not set with -D argument -->
     43  <property name="web.extdir" value="${web.writablehome}/ext/webswing"/>
    4344 
    4445  <!-- local ext paths -->
     
    111112    <for param="configFile" list="${etc-config-files}">
    112113      <sequential>
    113     <echo message="Processing ${basedir}/web/etc/@{configFile}.in"/>
    114     <copy file="${basedir}/web/etc/@{configFile}.in" tofile="${web.extdir}/etc/@{configFile}" filtering="true" overwrite="true">
    115       <filterset>
    116         <filter token="gsdl3srchome" value="${gsdl3srchome}"/>
    117       </filterset>
    118     </copy>
     114    <echo message="Installing ${basedir}/web/etc/@{configFile}.in"/>
     115    <copy file="${basedir}/web/etc/@{configFile}.in" tofile="${web.extdir}/etc/@{configFile}.in" overwrite="true" />
    119116      </sequential>
    120117    </for>
     
    123120      <sequential>     
    124121    <echo/>
    125     <echo>Installing ${basedir}/web/@{configDir}/ (excluding .svn)</echo>
     122    <echo>Installing directory ${basedir}/web/@{configDir}/ (excluding .svn)</echo>
    126123    <copy todir="${web.extdir}">
    127124      <fileset dir="${basedir}/web">
     
    144141
    145142
     143  <target name="configure-extension">   
     144    <for param="configFile" list="${etc-config-files}">
     145      <sequential>
     146    <echo message="Configuring ${web.extdir}/etc/@{configFile}"/> 
     147    <copy file="${web.extdir}/etc/@{configFile}.in" tofile="${web.extdir}/etc/@{configFile}" filtering="true" overwrite="true">
     148      <filterset>
     149        <filter token="gsdl3srchome" value="${gsdl3srchome}"/>
     150      </filterset>
     151    </copy>
     152      </sequential>
     153    </for>
     154  </target>
     155   
    146156  <target name="accept-del-extension" unless="delextension.accepted">
    147157    <input addproperty="delextension.ok" validargs="y,n">This will recursively delete all the files in:
Note: See TracChangeset for help on using the changeset viewer.