diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2009-05-21 13:03:27 +0000 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2009-05-21 13:03:27 +0000 |
commit | a4a89f7a2acea2e5d215ae8517c590ea7a02c813 (patch) | |
tree | 3df4350a398f4052a8b38ccd3f3b536559e78070 | |
parent | 5326d9a204764172aebabacbfaefea3da6f13b46 (diff) | |
download | scala-a4a89f7a2acea2e5d215ae8517c590ea7a02c813.tar.gz scala-a4a89f7a2acea2e5d215ae8517c590ea7a02c813.tar.bz2 scala-a4a89f7a2acea2e5d215ae8517c590ea7a02c813.zip |
sabbus fix to only use scalac ant task
-rw-r--r-- | build.xml | 297 |
1 files changed, 160 insertions, 137 deletions
@@ -191,6 +191,7 @@ INITIALISATION <pathelement location="${ant.jar}"/> </path> <taskdef resource="scala/tools/ant/sabbus/antlib.xml" classpathref="starr.classpath"/> + <taskdef resource="scala/tools/ant/antlib.xml" classpathref="starr.classpath"/> </target> <!-- =========================================================================== @@ -223,31 +224,33 @@ LOCAL REFERENCE BUILD (LOCKER) <!-- NOTE: Potential problem with maximal command line length on Windows (32768 characters for XP, since executed with Java's "exec"). See src/build/msil.xml for more details. --> - <scalacfork + <scalac + fork="true" destdir="${build-locker.dir}/classes/library" compilerpathref="starr.classpath" - srcpath="${src.dir}/library" - params="${scalac.args}" + sourcepath="${src.dir}/library" + addParams="${scalac.args}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="scala/Predef.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-locker.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-locker.dir}/classes/library" compilerpathref="starr.classpath" - srcpath="${src.dir}/library" - params="${scalac.args}" + sourcepath="${src.dir}/library" + addParams="${scalac.args}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <exclude name="scala/Predef.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-locker.dir}/classes/library"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <propertyfile file="${build-locker.dir}/classes/library/library.properties"> <entry key="version.number" value="${version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -273,23 +276,24 @@ LOCAL REFERENCE BUILD (LOCKER) <target name="locker.comp" depends="locker.pre-comp" if="locker.comp.needed"> <stopwatch name="locker.comp.timer"/> <mkdir dir="${build-locker.dir}/classes/compiler"/> - <scalacfork + <scalac + fork="true" destdir="${build-locker.dir}/classes/compiler" compilerpathref="starr.classpath" - srcpath="${src.dir}/compiler" - params="${scalac.args}" + sourcepath="${src.dir}/compiler" + addParams="${scalac.args}" srcdir="${src.dir}/compiler" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-locker.dir}/classes/library"/> <pathelement location="${build-locker.dir}/classes/compiler"/> <pathelement location="${lib.dir}/fjbg.jar"/> <pathelement location="${lib.dir}/msil.jar"/> <pathelement location="${jline.jar}"/> <pathelement location="${ant.jar}"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <propertyfile file="${build-locker.dir}/classes/compiler/compiler.properties"> <entry key="version.number" value="${version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -362,67 +366,72 @@ QUICK BUILD (QUICK) target="1.5" source="1.5"> <compilerarg line="${javac.args}"/> </javac> - <scalacfork + <scalac + fork="true" destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - srcpath="${src.dir}/library" - params="${scalac.args}" + sourcepath="${src.dir}/library" + addParams="${scalac.args}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="scala/Predef.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - srcpath="${src.dir}/library" - params="${scalac.args}" + sourcepath="${src.dir}/library" + addParams="${scalac.args}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <exclude name="scala/Predef.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - srcpath="${src.dir}/library" - params="${scalac.args}" + sourcepath="${src.dir}/library" + addParams="${scalac.args}" srcdir="${src.dir}/actors" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - srcpath="${src.dir}/library" - params="${scalac.args}" + sourcepath="${src.dir}/library" + addParams="${scalac.args}" srcdir="${src.dir}/dbc" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" - srcpath="${src.dir}/library" - params="${scalac.args}" + sourcepath="${src.dir}/library" + addParams="${scalac.args}" srcdir="${src.dir}/swing" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <propertyfile file="${build-quick.dir}/classes/library/library.properties"> <entry key="version.number" value="${version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -459,23 +468,24 @@ QUICK BUILD (QUICK) <target name="quick.comp" depends="quick.pre-comp" unless="quick.comp.available"> <stopwatch name="quick.comp.timer"/> <mkdir dir="${build-quick.dir}/classes/compiler"/> - <scalacfork + <scalac + fork="true" destdir="${build-quick.dir}/classes/compiler" compilerpathref="locker.classpath" - srcpath="${src.dir}/compiler" - params="${scalac.args}" + sourcepath="${src.dir}/compiler" + addParams="${scalac.args}" srcdir="${src.dir}/compiler" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${fjbg.jar}"/> <pathelement location="${msil.jar}"/> <pathelement location="${jline.jar}"/> <pathelement location="${ant.jar}"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <propertyfile file="${build-quick.dir}/classes/compiler/compiler.properties"> <entry key="version.number" value="${version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -501,22 +511,23 @@ QUICK BUILD (QUICK) <target name="quick.scalap" depends="quick.pre-scalap" unless="quick.scalap.available"> <stopwatch name="quick.scalap.timer"/> <mkdir dir="${build-quick.dir}/classes/scalap"/> - <scalacfork + <scalac + fork="true" destdir="${build-quick.dir}/classes/scalap" compilerpathref="locker.classpath" - srcpath="${src.dir}/scalap" - params="${scalac.args}" + sourcepath="${src.dir}/scalap" + addParams="${scalac.args}" srcdir="${src.dir}/scalap" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/partest"/> <pathelement location="${build-quick.dir}/classes/scalap"/> <pathelement location="${ant.jar}"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <touch file="${build-quick.dir}/scalap.complete" verbose="no"/> <stopwatch name="quick.scalap.timer" action="total"/> </target> @@ -543,22 +554,23 @@ QUICK BUILD (QUICK) <include name="**/*.java"/> <compilerarg line="${javac.args}"/> </javac> - <scalacfork + <scalac + fork="true" destdir="${build-quick.dir}/classes/partest" compilerpathref="locker.classpath" - srcpath="${src.dir}/partest" - params="${scalac.args}" + sourcepath="${src.dir}/partest" + addParams="${scalac.args}" srcdir="${src.dir}/partest" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <pathelement location="${build-quick.dir}/classes/scalap"/> <pathelement location="${build-quick.dir}/classes/partest"/> <pathelement location="${ant.jar}"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <propertyfile file="${build-quick.dir}/classes/partest/partest.properties"> <entry key="version.number" value="${partest.version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -773,7 +785,9 @@ PACKED QUICK BUILD (PACK) <pathelement location="${build-pack.dir}/lib/scalap.jar"/> <pathelement location="${ant.jar}"/> </path> - <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.classpath"/> + <!-- TODO - either import to new namespace, or use pack.classpath and fork old scalac calls --> + <!--<taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.classpath"/> --> + <taskdef name="pack-scalac" classname="scala.tools.ant.Scalac" classpathref="pack.classpath"/> <taskdef resource="scala/tools/partest/antlib.xml" classpathref="pack.classpath"/> </target> @@ -817,7 +831,7 @@ BOOTSTRAPPING BUILD (STRAP) target="1.5" source="1.5"> <compilerarg line="${javac.args}"/> </javac> - <scalac + <pack-scalac srcdir="${src.dir}/library" destdir="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library" @@ -825,8 +839,8 @@ BOOTSTRAPPING BUILD (STRAP) target="jvm-1.5" addparams="${scalac.args}"> <include name="scala/Predef.scala"/> - </scalac> - <scalac + </pack-scalac> + <pack-scalac srcdir="${src.dir}/library" destdir="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library" @@ -834,31 +848,31 @@ BOOTSTRAPPING BUILD (STRAP) addparams="${scalac.args}"> <include name="**/*.scala"/> <exclude name="scala/Predef.scala"/> - </scalac> - <scalac + </pack-scalac> + <pack-scalac srcdir="${src.dir}/actors" destdir="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library" target="jvm-1.5" addparams="${scalac.args}"> <include name="**/*.scala"/> - </scalac> - <scalac + </pack-scalac> + <pack-scalac srcdir="${src.dir}/dbc" destdir="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library" target="jvm-1.5" addparams="${scalac.args}"> <include name="**/*.scala"/> - </scalac> - <scalac + </pack-scalac> + <pack-scalac srcdir="${src.dir}/swing" destdir="${build-strap.dir}/classes/library" classpath="${build-strap.dir}/classes/library" target="jvm-1.5" addparams="${scalac.args}"> <include name="**/*.scala"/> - </scalac> + </pack-scalac> <propertyfile file="${build-strap.dir}/classes/library/library.properties"> <entry key="version.number" value="${version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -884,7 +898,7 @@ BOOTSTRAPPING BUILD (STRAP) <target name="strap.comp" depends="strap.pre-comp" unless="strap.comp.available"> <stopwatch name="strap.comp.timer"/> <mkdir dir="${build-strap.dir}/classes/compiler"/> - <scalac + <pack-scalac srcdir="${src.dir}/compiler" destdir="${build-strap.dir}/classes/compiler" target="jvm-1.5" @@ -898,7 +912,7 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${jline.jar}"/> <pathelement location="${ant.jar}"/> </classpath> - </scalac> + </pack-scalac> <propertyfile file="${build-strap.dir}/classes/compiler/compiler.properties"> <entry key="version.number" value="${version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -937,7 +951,7 @@ BOOTSTRAPPING BUILD (STRAP) <include name="**/*.java"/> <compilerarg line="${javac.args}"/> </javac> - <scalac + <pack-scalac srcdir="${src.dir}/partest" destdir="${build-strap.dir}/classes/partest" target="jvm-1.5" @@ -950,7 +964,7 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/partest"/> <pathelement location="${ant.jar}"/> </classpath> - </scalac> + </pack-scalac> <copy todir="${build-strap.dir}/classes/partest"> <fileset dir="${src.dir}/partest"> <include name="**/*.xml"/> @@ -969,7 +983,7 @@ BOOTSTRAPPING BUILD (STRAP) <target name="strap.scalap" depends="strap.pre-scalap" unless="strap.scalap.available"> <stopwatch name="strap.scalap.timer"/> <mkdir dir="${build-strap.dir}/classes/scalap"/> - <scalac + <pack-scalac srcdir="${src.dir}/scalap" destdir="${build-strap.dir}/classes/scalap" target="jvm-1.5" @@ -982,7 +996,7 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/scalap"/> <pathelement location="${ant.jar}"/> </classpath> - </scalac> + </pack-scalac> <touch file="${build-strap.dir}/scalap.complete" verbose="no"/> <stopwatch name="strap.scalap.timer" action="total"/> </target> @@ -1029,67 +1043,72 @@ OPTIMISED COMPILER target="1.5" source="1.5"> <compilerarg line="${javac.args}"/> </javac> - <scalacfork + <scalac + fork="true" destdir="${build-optimised.dir}/classes/library" compilerpathref="quick.classpath" - srcpath="${src.dir}/library" - params="-optimise ${scalac.args}" + sourcepath="${src.dir}/library" + addParams="-optimise ${scalac.args}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="scala/Predef.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-optimised.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-optimised.dir}/classes/library" compilerpathref="quick.classpath" - srcpath="${src.dir}/library" - params="-optimise ${scalac.args}" + sourcepath="${src.dir}/library" + addParams="-optimise ${scalac.args}" srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <exclude name="scala/Predef.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-optimised.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-optimised.dir}/classes/library" compilerpathref="quick.classpath" - srcpath="${src.dir}/library" - params="-optimise ${scalac.args}" + sourcepath="${src.dir}/library" + addParams="-optimise ${scalac.args}" srcdir="${src.dir}/actors" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-optimised.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-optimised.dir}/classes/library" compilerpathref="quick.classpath" - srcpath="${src.dir}/library" - params="-optimise ${scalac.args}" + sourcepath="${src.dir}/library" + addParams="-optimise ${scalac.args}" srcdir="${src.dir}/dbc" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-optimised.dir}/classes/library"/> - </compilationpath> - </scalacfork> - <scalacfork + </classpath> + </scalac> + <scalac + fork="true" destdir="${build-optimised.dir}/classes/library" compilerpathref="quick.classpath" - srcpath="${src.dir}/library" - params="-optimise ${scalac.args}" + sourcepath="${src.dir}/library" + addParams="-optimise ${scalac.args}" srcdir="${src.dir}/swing" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-optimised.dir}/classes/library"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <propertyfile file="${build-optimised.dir}/classes/library/library.properties"> <entry key="version.number" value="${version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -1115,23 +1134,24 @@ OPTIMISED COMPILER <target name="optimised.comp" depends="optimised.pre-comp" unless="optimised.comp.available"> <stopwatch name="optimised.comp.timer"/> <mkdir dir="${build-optimised.dir}/classes/compiler"/> - <scalacfork + <scalac + fork="true" destdir="${build-optimised.dir}/classes/compiler" compilerpathref="quick.classpath" - srcpath="${src.dir}/compiler" - params="-optimise ${scalac.args}" + sourcepath="${src.dir}/compiler" + addParams="-optimise ${scalac.args}" srcdir="${src.dir}/compiler" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-optimised.dir}/classes/library"/> <pathelement location="${build-optimised.dir}/classes/compiler"/> <pathelement location="${fjbg.jar}"/> <pathelement location="${msil.jar}"/> <pathelement location="${jline.jar}"/> <pathelement location="${ant.jar}"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <propertyfile file="${build-optimised.dir}/classes/compiler/compiler.properties"> <entry key="version.number" value="${version.number}"/> <entry key="copyright.string" value="${copyright.string}"/> @@ -1170,22 +1190,23 @@ OPTIMISED COMPILER <include name="**/*.java"/> <compilerarg line="${javac.args}"/> </javac> - <scalacfork + <scalac + fork="true" destdir="${build-optimised.dir}/classes/partest" compilerpathref="locker.classpath" - srcpath="${src.dir}/partest" - params="${scalac.args}" + sourcepath="${src.dir}/partest" + addParams="${scalac.args}" srcdir="${src.dir}/partest" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-optimised.dir}/classes/library"/> <pathelement location="${build-optimised.dir}/classes/compiler"/> <pathelement location="${build-optimised.dir}/classes/scalap"/> <pathelement location="${build-optimised.dir}/classes/partest"/> <pathelement location="${ant.jar}"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <copy todir="${build-optimised.dir}/classes/partest"> <fileset dir="${src.dir}/partest"> <include name="**/*.xml"/> @@ -1204,22 +1225,23 @@ OPTIMISED COMPILER <target name="optimised.scalap" depends="optimised.pre-scalap" unless="optimised.scalap.available"> <stopwatch name="optimised.scalap.timer"/> <mkdir dir="${build-optimised.dir}/classes/scalap"/> - <scalacfork + <scalac + fork="true" destdir="${build-optimised.dir}/classes/scalap" compilerpathref="locker.classpath" - srcpath="${src.dir}/scalap" - params="${scalac.args}" + sourcepath="${src.dir}/scalap" + addParams="${scalac.args}" srcdir="${src.dir}/scalap" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-optimised.dir}/classes/library"/> <pathelement location="${build-optimised.dir}/classes/compiler"/> <pathelement location="${build-optimised.dir}/classes/partest"/> <pathelement location="${build-optimised.dir}/classes/scalap"/> <pathelement location="${ant.jar}"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <touch file="${build-optimised.dir}/scalap.complete" verbose="no"/> <stopwatch name="optimised.scalap.timer" action="total"/> </target> @@ -1314,19 +1336,20 @@ LIBRARIES (MSIL, FJBG maybe later) target="1.5" source="1.4"> <compilerarg line="${javac.args}"/> </javac> - <scalacfork + <scalac + fork="true" destdir="${build-libs.dir}/classes/msil" compilerpathref="locker.classpath" - srcpath="${src.dir}/msil" - params="${scalac.args}" + sourcepath="${src.dir}/msil" + addParams="${scalac.args}" srcdir="${src.dir}/msil" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> + <classpath> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-libs.dir}/classes/msil"/> - </compilationpath> - </scalacfork> + </classpath> + </scalac> <touch file="${build-libs.dir}/msil.complete" verbose="no"/> </target> |