Changeset 28137

Timestamp:

2013-08-26T17:38:56+12:00 (11 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

File:

• main/trunk/greenstone3/build.xml (modified) (6 diffs)

main/trunk/greenstone3/build.xml

@@ -512 +512 @@
   <property name="compile.deprecation" value="true"/>
   <property name="compile.optimize"    value="true"/>
+  <property name="compile.includeantruntime" value="false"/> <!-- to get rid of annoying 'ant' warning -->
 
   <!--
@@ -1160 +1161 @@
     <javac srcdir="${web.classes}"
       destdir="${web.classes}"
+      includeantruntime="${compile.includeantruntime}"
       debug="${compile.debug}"
       deprecation="${compile.deprecation}"
@@ -1821 +1823 @@
     <javac srcdir="${src.home}"
       destdir="${build.home}" 
+      includeantruntime="${compile.includeantruntime}"
       debug="${compile.debug}"
       deprecation="${compile.deprecation}"
@@ -1865 +1868 @@
     <javac srcdir="${src.home}"
            destdir="${build.home}"
+           includeantruntime="${compile.includeantruntime}"
            debug="${compile.debug}"
            deprecation="${compile.deprecation}"
@@ -1875 +1879 @@
       <property name="gsprefix" value=""/>    
       <javac srcdir="${src.home}"
-           destdir="${build.home}"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           optimize="${compile.optimize}">
+         destdir="${build.home}"
+         includeantruntime="${compile.includeantruntime}"
+         debug="${compile.debug}"
+         deprecation="${compile.deprecation}"
+         optimize="${compile.optimize}">
         <classpath>
               <path refid="compile.classpath"/>
@@ -3001 +3006 @@
                     srcdir="@{compiledir}" 
                     destdir="@{compiledir}/../build" 
+                        includeantruntime="${compile.includeantruntime}"
                     debug="${compile.debug}" 
                     deprecation="${compile.deprecation}"