diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2008-06-10 15:18:56 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2008-06-10 15:18:56 +0000 |
| commit | 86d6fb22d0460739428fdc25085761180aa10fc2 (patch) | |
| tree | b1b6557fb9232a7042e14362680005f3df0a08e8 /build.xml | |
| parent | fa99ddba14019a3f557cb55081bd69daac1e7f19 (diff) | |
| download | scala-86d6fb22d0460739428fdc25085761180aa10fc2.tar.gz scala-86d6fb22d0460739428fdc25085761180aa10fc2.tar.bz2 scala-86d6fb22d0460739428fdc25085761180aa10fc2.zip | |
Added javac.args to the build script.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 23 |
1 files changed, 18 insertions, 5 deletions
@@ -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" |