Changeset 23849

Show
Ignore:
Timestamp:
05.04.2011 11:40:25 (8 years ago)
Author:
davidb
Message:

Addition of perl.path to help control where Perl is found.

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.in

    r23808 r23849  
    1919# uncomment if you don't want to have collection building enabled 
    2020#disable.collection.building=true 
     21# 
     22# uncomment (and edit) if you want to control where perl is found 
     23#perl.path=/usr/bin 
    2124 
    2225## Greenstone 3 server program options 
  • main/trunk/greenstone3/build.xml

    r23847 r23849  
    7575  <!-- get properties from the environment --> 
    7676  <property environment="env"/> 
     77 
     78  <!-- uses perl.path if set in build.properties, otherwise try for 
     79       environment variable PERLPATH, and failing that assumes 'perl'  
     80       is on environment PATH --> 
     81  <if><bool><isset property="env.PERLPATH"/></bool> 
     82      <property name="perl.path" value="${env.PERLPATH}"/> 
     83  </if> 
     84 
     85  <!-- full.perl.path is for pretty-printing only, e.g. used in target "start" --> 
     86  <if><bool><isset property="perl.path"/></bool> 
     87      <property name="full.perl.path" value="${perl.path}${file.separator}perl"/> 
     88    <else> 
     89      <property name="full.perl.path" value="perl (will use the enviroment variable PATH to find this executable)"/> 
     90    </else> 
     91  </if> 
    7792 
    7893  <!-- get the filesets defining components and executables --> 
     
    558573    <echo>Tomcat: ${catalina.home}</echo>  
    559574    <echo>Java  : ${java.home}</echo> 
     575    <if><bool><available file="${build.src.home}"/></bool> 
     576      <echo>Perl  : ${full.perl.path}</echo> 
     577    </if> 
    560578    <echo>URL   : http://${tomcat.server}:${tomcat.port}${app.path}/</echo> 
    561579    <!-- assuming that index.html is not needed here -->    
     
    575593    <echo message="  Execute 'ant -projecthelp' for a list of targets."/> 
    576594    <echo message="  Execute 'ant -help' for Ant help."/> 
    577     <echo>To install Greenstone3, run '${install-command}'.  
    578       There are properties defined in build.properties. The install process will ask you if these properties are set correctly. To avoid this prompt, use the '-Dproperties.accepted=yes' option. 
    579       To log the output, use the '-logfile build.log' option. 
    580       The README.txt file has more information about the ant targets and install process. 
     595    <echo> 
     596  To install Greenstone3, run '${install-command}'.  
     597    There are properties defined in build.properties. The install  
     598      process will ask you if these properties are set correctly.  
     599      To avoid this prompt, use the '-Dproperties.accepted=yes'  
     600      option. 
     601    To log the output, use the '-logfile build.log' option. 
     602  The README.txt file has more information about the ant targets 
     603    and install process. 
    581604    </echo> 
    582605  </target> 
     
    961984      <!--<env key="GSDLOS" value="linux"/> do we need this?? --> 
    962985      <env key="GSDL3HOME" value="${basedir}"/> 
     986      <env key="PERLPATH" value="${perl.path}"/> 
    963987      <env key="PATH" path="${tomcat.path}"/> 
    964988      <env key="CATALINA_OPTS" value="${catalina.opts}"/> 
     
    972996      <env key="GSDLOS" value="windows"/> 
    973997      <env key="GSDL3HOME" value="${basedir}"/> 
     998      <env key="PERLPATH" value="${perl.path}"/> 
    974999      <env key="Path" path="${tomcat.path}"/> 
    9751000      <env key="PATH" path="${tomcat.path}"/> 
     
    14361461 
    14371462    <!-- windows: just the java stuff. Calling without the "compile" argument first will run winMake.bat with "all" which will then perform both the compile AND link targets in jni/win32.mak (thereby also generating gdbmjava.dll). Then we run the same command with the "install" argument to copy the gdbmjava.dll into the correct location. --> 
    1438     <echo>Windows: compile javagdbm (java only)</echo> 
     1463    <echo>Windows: compile javagdbm</echo> 
    14391464    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true" /> 
    14401465    <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}" failonerror="true"> 
     1466<!--      <env key="GSDLHOME" path="${gs2build.home}"/> --> 
    14411467      <arg value="install"/> 
    14421468    </exec>