diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2015-02-21 21:44:11 +0100 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-17 14:57:23 -0700 |
| commit | 0d5ff65499a16ed1004bbdf7f204995082ab5dd0 (patch) | |
| tree | a64d06e5a7a89cedd55d2306863e97a6d0793a35 /build.xml | |
| parent | ccd586f68af14ea693c873d38ad8d5210caa48e0 (diff) | |
| download | scala-0d5ff65499a16ed1004bbdf7f204995082ab5dd0.tar.gz scala-0d5ff65499a16ed1004bbdf7f204995082ab5dd0.tar.bz2 scala-0d5ff65499a16ed1004bbdf7f204995082ab5dd0.zip | |
Align how ant builds asm & forkjoin
There were two inconsistencies in building asm & forkjoin:
1. Asm classes lived in `build/asm`, while forkjoin's were in
`build/libs/classes/forkjoin`.
2. Though no jars are needed for these projects, forkjoin was packaged,
but asm was not.
No reason for these inconsistencies could be found in the history.
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"/> @@ -588,8 +588,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"/> @@ -1061,7 +1061,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, |