From 86d6fb22d0460739428fdc25085761180aa10fc2 Mon Sep 17 00:00:00 2001
From: Iulian Dragos <jaguarul@gmail.com>
Date: Tue, 10 Jun 2008 15:18:56 +0000
Subject: Added javac.args to the build script.

---
 build.xml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index f14bbba68a..7784682769 100644
--- a/build.xml
+++ b/build.xml
@@ -82,6 +82,7 @@ PROPERTIES
 
   <!-- Additional command line arguments for scalac. They are added to all build targets -->
   <property name="scalac.args" value=""/>
+  <property name="javac.args" value=""/>
   <!-- Sets location of pre-compiled libraries -->
   <property name="lib.starr.jar" value="${lib.dir}/scala-library.jar"/>
   <property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/>
@@ -173,7 +174,9 @@ LOCAL REFERENCE BUILD (LOCKER)
       destdir="${build-locker.dir}/classes/library"
       classpath="${build-locker.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5"/>
+      target="1.5" source="1.5">
+    	<compilerarg line="${javac.args}"/>
+  	</javac>
     <sabmake id="starr.lib.scalac"
       destdir="${build-locker.dir}/classes/library"
       compilerpathref="starr.classpath"
@@ -297,13 +300,17 @@ QUICK BUILD (QUICK)
       destdir="${build-quick.dir}/classes/library"
       classpath="${build-quick.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5"/>
+      target="1.5" source="1.5">
+      <compilerarg line="${javac.args}"/> 
+    </javac>
     <javac
       srcdir="${src.dir}/actors"
       destdir="${build-quick.dir}/classes/library"
       classpath="${build-quick.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5"/>
+      target="1.5" source="1.5">
+      <compilerarg line="${javac.args}"/>
+    </javac>
     <sabmake id="locker.lib.scalac"
       destdir="${build-quick.dir}/classes/library"
       compilerpathref="locker.classpath"
@@ -419,6 +426,7 @@ QUICK BUILD (QUICK)
       	<pathelement location="${build-quick.dir}/classes/partest"/>
       </classpath>
       <include name="**/*.java"/>
+      <compilerarg line="${javac.args}"/>
     </javac>
     <sabmake id="locker.partest.scalac"
       destdir="${build-quick.dir}/classes/partest"
@@ -634,13 +642,17 @@ BOOTSTRAPPING BUILD (STRAP)
       destdir="${build-strap.dir}/classes/library"
       classpath="${build-strap.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5"/>
+      target="1.5" source="1.5">
+      <compilerarg line="${javac.args}"/>
+     </javac>
     <javac
       srcdir="${src.dir}/actors"
       destdir="${build-strap.dir}/classes/library"
       classpath="${build-strap.dir}/classes/library"
       includes="**/*.java"
-      target="1.5" source="1.5"/>
+      target="1.5" source="1.5">
+      <compilerarg line="${javac.args}"/>
+     </javac>
     <scalac
       srcdir="${src.dir}/library"
       destdir="${build-strap.dir}/classes/library"
@@ -750,6 +762,7 @@ BOOTSTRAPPING BUILD (STRAP)
       	<pathelement location="${build-strap.dir}/classes/partest"/>
       </classpath>
       <include name="**/*.java"/>
+      <compilerarg line="${javac.args}"/>
     </javac>
     <scalac
       srcdir="${src.dir}/partest"
-- 
cgit v1.2.3