Changeset 28137

Show
Ignore:
Timestamp:
26.08.2013 17:38:56 (6 years ago)
Author:
davidb
Message:

Additional property set (and used in 'javac' task) to remove annoying warning about 'includeantruntime'. Leaving this to a system-dependant default could lead to java compiling working in some peoples environments, and not in others, but the reason for the failure/success would not be terribly obvious

Files:
1 modified

Legend:

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

    r28136 r28137  
    512512  <property name="compile.deprecation" value="true"/> 
    513513  <property name="compile.optimize"    value="true"/> 
     514  <property name="compile.includeantruntime" value="false"/> <!-- to get rid of annoying 'ant' warning --> 
    514515 
    515516  <!-- 
     
    11601161    <javac srcdir="${web.classes}" 
    11611162      destdir="${web.classes}" 
     1163      includeantruntime="${compile.includeantruntime}" 
    11621164      debug="${compile.debug}" 
    11631165      deprecation="${compile.deprecation}" 
     
    18211823    <javac srcdir="${src.home}" 
    18221824      destdir="${build.home}"  
     1825      includeantruntime="${compile.includeantruntime}" 
    18231826      debug="${compile.debug}" 
    18241827      deprecation="${compile.deprecation}" 
     
    18651868    <javac srcdir="${src.home}" 
    18661869           destdir="${build.home}" 
     1870           includeantruntime="${compile.includeantruntime}" 
    18671871           debug="${compile.debug}" 
    18681872           deprecation="${compile.deprecation}" 
     
    18751879      <property name="gsprefix" value=""/>     
    18761880      <javac srcdir="${src.home}" 
    1877            destdir="${build.home}" 
    1878            debug="${compile.debug}" 
    1879            deprecation="${compile.deprecation}" 
    1880            optimize="${compile.optimize}"> 
     1881         destdir="${build.home}" 
     1882         includeantruntime="${compile.includeantruntime}" 
     1883         debug="${compile.debug}" 
     1884         deprecation="${compile.deprecation}" 
     1885         optimize="${compile.optimize}"> 
    18811886        <classpath> 
    18821887              <path refid="compile.classpath"/> 
     
    30013006                    srcdir="@{compiledir}"  
    30023007                    destdir="@{compiledir}/../build"  
     3008                        includeantruntime="${compile.includeantruntime}" 
    30033009                    debug="${compile.debug}"  
    30043010                    deprecation="${compile.deprecation}"