diff options
author | Paul Phillips <paulp@improving.org> | 2010-07-01 20:43:32 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-07-01 20:43:32 +0000 |
commit | 74eb6b70d58f7f2c3839fb69bc57ffcd00361839 (patch) | |
tree | 55220db9adb940bead82c05c0fc289b54d32f23f | |
parent | c2a3d50262a3e411f67297c5db5ad7e596b4c4f6 (diff) | |
download | scala-74eb6b70d58f7f2c3839fb69bc57ffcd00361839.tar.gz scala-74eb6b70d58f7f2c3839fb69bc57ffcd00361839.tar.bz2 scala-74eb6b70d58f7f2c3839fb69bc57ffcd00361839.zip |
Since the buildbots won't meet me in the middle...
Since the buildbots won't meet me in the middle, am putting the
forkjoin.jar everywhere with the hope/expectation we will see a restoral
of order. Someone should definitely figure out how it is we developed
this non-deterministic dependency. Review by phaller.
-rw-r--r-- | build.xml | 56 |
1 files changed, 21 insertions, 35 deletions
@@ -261,6 +261,15 @@ INITIALISATION <pathelement location="${lib.dir}/forkjoin.jar"/> <pathelement location="${ant.jar}"/> </path> + <!-- What to have on the compilation path when compiling during certain phases --> + <path id="quick.compilation.path"> + <pathelement location="${build-quick.dir}/classes/library"/> + <pathelement location="${lib.dir}/forkjoin.jar"/> + </path> + <path id="strap.compilation.path"> + <pathelement location="${build-strap.dir}/classes/library"/> + <pathelement location="${lib.dir}/forkjoin.jar"/> + </path> <taskdef resource="scala/tools/ant/sabbus/antlib.xml" classpathref="starr.classpath"/> </target> @@ -438,7 +447,7 @@ QUICK BUILD (QUICK) ============================================================================ --> <target name="quick.start" depends="locker.done"/> - + <target name="quick.pre-lib" depends="quick.start"> <uptodate property="quick.lib.available" targetfile="${build-quick.dir}/library.complete"> <srcfiles dir="${src.dir}"> @@ -479,10 +488,7 @@ QUICK BUILD (QUICK) srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-quick.dir}/classes/library"/> - <pathelement location="${lib.dir}/forkjoin.jar"/> - </compilationpath> + <compilationpath refid="quick.compilation.path"/> </scalacfork> <scalacfork destdir="${build-quick.dir}/classes/library" @@ -491,10 +497,7 @@ QUICK BUILD (QUICK) srcdir="${src.dir}/actors" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-quick.dir}/classes/library"/> - <pathelement location="${lib.dir}/forkjoin.jar"/> - </compilationpath> + <compilationpath refid="quick.compilation.path"/> </scalacfork> <!--<scalacfork destdir="${build-quick.dir}/classes/library" @@ -515,10 +518,7 @@ QUICK BUILD (QUICK) srcdir="${src.dir}/dbc" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-quick.dir}/classes/library"/> - <pathelement location="${lib.dir}/forkjoin.jar"/> - </compilationpath> + <compilationpath refid="quick.compilation.path"/> </scalacfork> <scalacfork destdir="${build-quick.dir}/classes/library" @@ -527,9 +527,7 @@ QUICK BUILD (QUICK) srcdir="${src.dir}/swing" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-quick.dir}/classes/library"/> - </compilationpath> + <compilationpath refid="quick.compilation.path"/> </scalacfork> <propertyfile file="${build-quick.dir}/classes/library/library.properties"> <entry key="version.number" value="${version.number}"/> @@ -650,10 +648,7 @@ QUICK BUILD (QUICK) srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-quick.dir}/classes/library"/> - <pathelement location="${lib.dir}/forkjoin.jar"/> - </compilationpath> + <compilationpath refid="quick.compilation.path"/> </scalacfork> <touch file="${build-quick.dir}/plugins.complete" verbose="no"/> <stopwatch name="quick.plugins.timer" action="total"/> @@ -1013,10 +1008,7 @@ BOOTSTRAPPING BUILD (STRAP) srcdir="${src.dir}/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-strap.dir}/classes/library"/> - <pathelement location="${forkjoin.jar}"/> - </compilationpath> + <compilationpath refid="strap.compilation.path"/> </scalacfork> <scalacfork destdir="${build-strap.dir}/classes/library" @@ -1025,10 +1017,7 @@ BOOTSTRAPPING BUILD (STRAP) srcdir="${src.dir}/actors" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-strap.dir}/classes/library"/> - <pathelement location="${forkjoin.jar}"/> - </compilationpath> + <compilationpath refid="strap.compilation.path"/> </scalacfork> <!--<scalacfork destdir="${build-strap.dir}/classes/library" @@ -1049,9 +1038,7 @@ BOOTSTRAPPING BUILD (STRAP) srcdir="${src.dir}/dbc" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-strap.dir}/classes/library"/> - </compilationpath> + <compilationpath refid="strap.compilation.path"/> </scalacfork> <scalacfork destdir="${build-strap.dir}/classes/library" @@ -1060,9 +1047,7 @@ BOOTSTRAPPING BUILD (STRAP) srcdir="${src.dir}/swing" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> - <compilationpath> - <pathelement location="${build-strap.dir}/classes/library"/> - </compilationpath> + <compilationpath refid="strap.compilation.path"/> </scalacfork> <propertyfile file="${build-strap.dir}/classes/library/library.properties"> <entry key="version.number" value="${version.number}"/> @@ -1234,8 +1219,9 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/compiler"/> <pathelement location="${build-strap.dir}/classes/scalap"/> <pathelement location="${build-strap.dir}/classes/partest"/> - <pathelement location="${scalacheck.jar}"/> <pathelement location="${ant.jar}"/> + <pathelement location="${lib.dir}/forkjoin.jar"/> + <pathelement location="${scalacheck.jar}"/> </compilationpath> </scalacfork> <copy todir="${build-strap.dir}/classes/partest"> |