natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added 'scalac.args' parameter to the build script. 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@15331 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
dragos 2008-06-10 15:07:11 +00:00
parent a9941bc8dd
commit 5f81e6ac67
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build.xml
View File

@ -76,10 +76,12 @@ PROPERTIES
<property name="lib-ant.dir" value="${lib.dir}/ant"/> <property name="lib-ant.dir" value="${lib.dir}/ant"/>
<property name="src.dir" value="${basedir}/src"/> <property name="src.dir" value="${basedir}/src"/>
<property name="test.dir" value="${basedir}/test"/> <property name="test.dir" value="${basedir}/test"/>
<!-- Loads custom properties definitions --> <!-- Loads custom properties definitions -->
<property file="${basedir}/build.properties"/> <property file="${basedir}/build.properties"/>
<!-- Additional command line arguments for scalac. They are added to all build targets -->
<property name="scalac.args" value=""/>
<!-- Sets location of pre-compiled libraries --> <!-- Sets location of pre-compiled libraries -->
<property name="lib.starr.jar" value="${lib.dir}/scala-library.jar"/> <property name="lib.starr.jar" value="${lib.dir}/scala-library.jar"/>
<property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/> <property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/>
@ -176,7 +178,8 @@ LOCAL REFERENCE BUILD (LOCKER)
destdir="${build-locker.dir}/classes/library" destdir="${build-locker.dir}/classes/library"
compilerpathref="starr.classpath" compilerpathref="starr.classpath"
srcpath="${src.dir}/library" srcpath="${src.dir}/library"
target="jvm-1.5"> target="jvm-1.5"
params="${scalac.args}">
<compilationpath> <compilationpath>
<pathelement location="${build-locker.dir}/classes/library"/> <pathelement location="${build-locker.dir}/classes/library"/>
</compilationpath> </compilationpath>
@ -220,7 +223,8 @@ LOCAL REFERENCE BUILD (LOCKER)
destdir="${build-locker.dir}/classes/compiler" destdir="${build-locker.dir}/classes/compiler"
compilerpathref="starr.classpath" compilerpathref="starr.classpath"
srcpath="${src.dir}/compiler" srcpath="${src.dir}/compiler"
target="jvm-1.5"> target="jvm-1.5"
params="${scalac.args}">
<compilationpath> <compilationpath>
<pathelement location="${build-locker.dir}/classes/library"/> <pathelement location="${build-locker.dir}/classes/library"/>
<pathelement location="${build-locker.dir}/classes/compiler"/> <pathelement location="${build-locker.dir}/classes/compiler"/>
@ -304,7 +308,8 @@ QUICK BUILD (QUICK)
destdir="${build-quick.dir}/classes/library" destdir="${build-quick.dir}/classes/library"
compilerpathref="locker.classpath" compilerpathref="locker.classpath"
srcpath="${src.dir}/library" srcpath="${src.dir}/library"
target="jvm-1.5"> target="jvm-1.5"
params="${scalac.args}">
<compilationpath> <compilationpath>
<pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/library"/>
</compilationpath> </compilationpath>
@ -318,7 +323,8 @@ QUICK BUILD (QUICK)
destdir="${build-quick.dir}/classes/library" destdir="${build-quick.dir}/classes/library"
compilerpathref="locker.classpath" compilerpathref="locker.classpath"
srcpath="${src.dir}/library" srcpath="${src.dir}/library"
target="jvm-1.5"> target="jvm-1.5"
params="${scalac.args}">
<compilationpath> <compilationpath>
<pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/library"/>
</compilationpath> </compilationpath>
@ -363,7 +369,8 @@ QUICK BUILD (QUICK)
destdir="${build-quick.dir}/classes/compiler" destdir="${build-quick.dir}/classes/compiler"
compilerpathref="locker.classpath" compilerpathref="locker.classpath"
srcpath="${src.dir}/compiler" srcpath="${src.dir}/compiler"
target="jvm-1.5"> target="jvm-1.5"
params="${scalac.args}">
<compilationpath> <compilationpath>
<pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/library"/>
<pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/compiler"/>
@ -417,7 +424,8 @@ QUICK BUILD (QUICK)
destdir="${build-quick.dir}/classes/partest" destdir="${build-quick.dir}/classes/partest"
compilerpathref="locker.classpath" compilerpathref="locker.classpath"
srcpath="${src.dir}/partest" srcpath="${src.dir}/partest"
target="jvm-1.5"> target="jvm-1.5"
params="${scalac.args}">
<compilationpath> <compilationpath>
<pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/library"/>
<pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/compiler"/>
@ -638,14 +646,16 @@ BOOTSTRAPPING BUILD (STRAP)
destdir="${build-strap.dir}/classes/library" destdir="${build-strap.dir}/classes/library"
classpath="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library"
sourcepath="${src.dir}/library" sourcepath="${src.dir}/library"
target="jvm-1.5"> target="jvm-1.5"
addparams="${scalac.args}">
<include name="scala/Predef.scala"/> <include name="scala/Predef.scala"/>
</scalac> </scalac>
<scalac <scalac
srcdir="${src.dir}/library" srcdir="${src.dir}/library"
destdir="${build-strap.dir}/classes/library" destdir="${build-strap.dir}/classes/library"
classpath="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library"
target="jvm-1.5"> target="jvm-1.5"
addparams="${scalac.args}">
<include name="**/*.scala"/> <include name="**/*.scala"/>
<exclude name="scala/Predef.scala"/> <exclude name="scala/Predef.scala"/>
</scalac> </scalac>
@ -653,14 +663,16 @@ BOOTSTRAPPING BUILD (STRAP)
srcdir="${src.dir}/actors" srcdir="${src.dir}/actors"
destdir="${build-strap.dir}/classes/library" destdir="${build-strap.dir}/classes/library"
classpath="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library"
target="jvm-1.5"> target="jvm-1.5"
addparams="${scalac.args}">
<include name="**/*.scala"/> <include name="**/*.scala"/>
</scalac> </scalac>
<scalac <scalac
srcdir="${src.dir}/dbc" srcdir="${src.dir}/dbc"
destdir="${build-strap.dir}/classes/library" destdir="${build-strap.dir}/classes/library"
classpath="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library"
target="jvm-1.5"> target="jvm-1.5"
addparams="${scalac.args}">
<include name="**/*.scala"/> <include name="**/*.scala"/>
</scalac> </scalac>
<propertyfile file="${build-strap.dir}/classes/library/library.properties"> <propertyfile file="${build-strap.dir}/classes/library/library.properties">
@ -691,7 +703,8 @@ BOOTSTRAPPING BUILD (STRAP)
<scalac <scalac
srcdir="${src.dir}/compiler" srcdir="${src.dir}/compiler"
destdir="${build-strap.dir}/classes/compiler" destdir="${build-strap.dir}/classes/compiler"
target="jvm-1.5"> target="jvm-1.5"
addparams="${scalac.args}">
<include name="**/*.scala"/> <include name="**/*.scala"/>
<classpath> <classpath>
<pathelement location="${build-strap.dir}/classes/library"/> <pathelement location="${build-strap.dir}/classes/library"/>
@ -741,7 +754,8 @@ BOOTSTRAPPING BUILD (STRAP)
<scalac <scalac
srcdir="${src.dir}/partest" srcdir="${src.dir}/partest"
destdir="${build-strap.dir}/classes/partest" destdir="${build-strap.dir}/classes/partest"
target="jvm-1.5"> target="jvm-1.5"
addparams="${scalac.args}">
<include name="**/*.scala"/> <include name="**/*.scala"/>
<classpath> <classpath>
<pathelement location="${build-strap.dir}/classes/library"/> <pathelement location="${build-strap.dir}/classes/library"/>