Skip to content

Commit 0d5ff65

Browse files
gkossakowskiadriaanm
authored andcommitted
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.
1 parent ccd586f commit 0d5ff65

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ TODO:
165165
<property name="build.dir" value="${basedir}/build"/>
166166
<property name="build-deps.dir" value="${build.dir}/deps"/>
167167
<property name="build-libs.dir" value="${build.dir}/libs"/>
168-
<property name="build-asm.dir" value="${build.dir}/asm"/>
168+
<property name="build-asm.dir" value="${build-libs.dir}"/>
169169
<property name="build-forkjoin.dir" value="${build-libs.dir}"/>
170170
<property name="build-locker.dir" value="${build.dir}/locker"/>
171171
<property name="build-quick.dir" value="${build.dir}/quick"/>
@@ -588,8 +588,8 @@ TODO:
588588
</propertyfile>
589589
</then></if>
590590

591-
<path id="forkjoin.classpath" path="${build-libs.dir}/classes/forkjoin"/>
592-
<path id="asm.classpath" path="${build-asm.dir}/classes"/>
591+
<path id="forkjoin.classpath" path="${build-forkjoin.dir}/classes/forkjoin"/>
592+
<path id="asm.classpath" path="${build-asm.dir}/classes/asm"/>
593593
<property name="forkjoin-classes" refid="forkjoin.classpath"/>
594594
<property name="asm-classes" refid="asm.classpath"/>
595595

@@ -1061,7 +1061,7 @@ TODO:
10611061
============================================================================ -->
10621062

10631063
<target name="asm.done" depends="init"> <simple-javac project="asm" jar="no"/> </target>
1064-
<target name="forkjoin.done" depends="init"> <simple-javac project="forkjoin" args="-XDignore.symbol.file"/></target>
1064+
<target name="forkjoin.done" depends="init"> <simple-javac project="forkjoin" args="-XDignore.symbol.file" jar="no"/></target>
10651065

10661066
<!-- For local development only. We only allow released versions of Scala for STARR.
10671067
This builds quick (core only) and publishes it with a generated version number,

0 commit comments

Comments
 (0)