diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-01 11:42:55 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-01 11:42:55 +0200 |
| commit | faa32647ac69305dd2b111ca18b3f7fa2b948a49 (patch) | |
| tree | e17631be330ae74b872e53a979dc83691f4f4796 /build.xml | |
| parent | 00b5adfbf3618639b501d1859f7a023083a4b8c3 (diff) | |
| parent | e596d1a65d81a81a54847d90d2d90be3ffbb3d92 (diff) | |
| download | scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.tar.gz scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.tar.bz2 scala-faa32647ac69305dd2b111ca18b3f7fa2b948a49.zip | |
Merge pull request #4480 from retronym/merge/2.11.x-to-2.12.x-20150501
Merge 2.11.x to 2.12.x [ci: last-only]
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -165,7 +165,7 @@ TODO: <property name="build.dir" value="${basedir}/build"/> <property name="build-deps.dir" value="${build.dir}/deps"/> <property name="build-libs.dir" value="${build.dir}/libs"/> - <property name="build-asm.dir" value="${build.dir}/asm"/> + <property name="build-asm.dir" value="${build-libs.dir}"/> <property name="build-forkjoin.dir" value="${build-libs.dir}"/> <property name="build-locker.dir" value="${build.dir}/locker"/> <property name="build-quick.dir" value="${build.dir}/quick"/> @@ -571,8 +571,8 @@ TODO: </propertyfile> </then></if> - <path id="forkjoin.classpath" path="${build-libs.dir}/classes/forkjoin"/> - <path id="asm.classpath" path="${build-asm.dir}/classes"/> + <path id="forkjoin.classpath" path="${build-forkjoin.dir}/classes/forkjoin"/> + <path id="asm.classpath" path="${build-asm.dir}/classes/asm"/> <property name="forkjoin-classes" refid="forkjoin.classpath"/> <property name="asm-classes" refid="asm.classpath"/> @@ -1015,7 +1015,7 @@ TODO: ============================================================================ --> <target name="asm.done" depends="init"> <simple-javac project="asm" jar="no"/> </target> - <target name="forkjoin.done" depends="init"> <simple-javac project="forkjoin" args="-XDignore.symbol.file"/></target> + <target name="forkjoin.done" depends="init"> <simple-javac project="forkjoin" args="-XDignore.symbol.file" jar="no"/></target> <!-- For local development only. We only allow released versions of Scala for STARR. This builds quick (core only) and publishes it with a generated version number, |