Changeset 32621

Show
Ignore:
Timestamp:
22.11.2018 16:02:13 (3 weeks ago)
Author:
ak19
Message:

Replaced the hardcoded commdev's GS3 path with a placeholder that first requires sourcing gs3-setup.sh in the associated GS3 installation.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/the-macronizer/trunk/build.xml

    r31962 r32621  
    33 
    44  <property environment="env"/> 
    5  
     5  <property name="gsdl3.src.home" value="env.GSDL3HOME"/> 
    66  <property name="dist.dir.exp" location="releases" /> 
    77   
     
    3333   
    3434  <target name="init"> 
     35    <!-- has the gs3-setup script been run?? --> 
     36    <condition property="gs3-setup-not-done"> 
     37      <not> 
     38    <isset property="env.GSDL3HOME"/> 
     39      </not> 
     40    </condition> 
     41    <fail if="gs3-setup-not-done" message="Please run 'gs3-setup' (Windows) or 'source gs3-setup.sh' (Linux/Mac) in the Greenstone3 installation that's associated with this Macronizer installation before this step."/> 
     42 
     43     
    3544    <echo message="${ant.project.name}: ${ant.file}"/> 
    3645    <mkdir dir="${build.dir.exp}/WEB-INF/classes"/> 
     
    5968     or when the destination file does not exist. However, you can explicitly overwrite files 
    6069     with the overwrite attribute.--> 
    61     <copy file="${build.dir.exp}/log4j.properties.in" tofile="/greenstone/greenstone3/web/WEB-INF/classes/log4j.properties"/> 
     70    <copy file="${build.dir.exp}/log4j.properties.in" tofile="${gsdl3.src.home}/web/WEB-INF/classes/log4j.properties"/> 
    6271 
    6372    <!-- mkdir Creates a directory. Also non-existent parent directories are created,