@@ -1281,6 +1281,14 @@ TODO:
1281
1281
<target name =" quick.swing" depends =" quick.actors, quick.lib" if =" has.java6" >
1282
1282
<staged-build with =" locker" stage =" quick" project =" swing" /> </target >
1283
1283
1284
+ <target name =" quick.partest-extras"
1285
+ depends =" quick.comp" >
1286
+ <!-- compile compiler-specific parts of partest -->
1287
+ <staged-build with =" starr" stage =" quick" project =" partest-extras" />
1288
+ <staged-build with =" starr" stage =" quick" project =" partest-javaagent" />
1289
+ </target >
1290
+
1291
+
1284
1292
<target name =" quick.plugins" depends =" quick.comp" >
1285
1293
<staged-uptodate stage =" quick" project =" plugins" >
1286
1294
<check ><srcfiles dir =" ${ src.dir } /continuations" /></check >
@@ -1308,7 +1316,7 @@ TODO:
1308
1316
</staged-uptodate >
1309
1317
</target >
1310
1318
1311
- <target name =" quick.bin" depends =" quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalap, quick.interactive, quick.swing, quick.plugins, quick.scaladoc" >
1319
+ <target name =" quick.bin" depends =" quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalap, quick.interactive, quick.swing, quick.plugins, quick.scaladoc, quick.partest-extras " >
1312
1320
<staged-bin stage =" quick" classpathref =" quick.bin.tool.path" />
1313
1321
</target >
1314
1322
@@ -1325,6 +1333,11 @@ TODO:
1325
1333
<target name =" pack.actors" depends =" quick.lib" > <staged-pack project =" actors" /> </target >
1326
1334
<target name =" pack.swing" if =" has.java6" depends =" quick.swing" > <staged-pack project =" swing" /> </target >
1327
1335
<target name =" pack.reflect" depends =" quick.reflect" > <staged-pack project =" reflect" /> </target >
1336
+ <target name =" pack.partest-extras" depends =" quick.partest-extras" >
1337
+ <staged-pack project =" partest-extras" />
1338
+ <staged-pack project =" partest-javaagent"
1339
+ manifest =" ${ src.dir } /partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF" />
1340
+ </target >
1328
1341
1329
1342
<target name =" pack.comp" depends =" quick.comp, quick.scaladoc, quick.interactive, quick.repl, asm.done" >
1330
1343
<staged-pack project =" compiler" manifest =" ${ build-pack.dir } /META-INF/MANIFEST.MF" >
@@ -1357,7 +1370,7 @@ TODO:
1357
1370
1358
1371
<target name =" pack.scalap" depends =" quick.scalap" > <staged-pack project =" scalap" targetjar =" scalap.jar" /> </target >
1359
1372
1360
- <target name =" pack.bin" depends =" pack.comp, pack.lib, pack.actors, pack.plugins, pack.reflect, pack.scalap, pack.swing" >
1373
+ <target name =" pack.bin" depends =" pack.comp, pack.lib, pack.actors, pack.plugins, pack.reflect, pack.scalap, pack.swing, pack.partest-extras " >
1361
1374
<copy todir =" ${ build-pack.dir } /lib" >
1362
1375
<path refid =" external-modules-nocore" />
1363
1376
<mapper type =" flatten" />
@@ -1606,18 +1619,12 @@ TODO:
1606
1619
</target >
1607
1620
1608
1621
<!-- See test/build-partest.xml for the macro(s) being used here. -->
1609
- <target name =" partest.task" depends =" init" >
1622
+ <target name =" partest.task" depends =" init,pack.done " >
1610
1623
<!-- note the classpathref! this is the classpath used to run partest,
1611
1624
so it must have the new compiler.... -->
1612
1625
<taskdef
1613
1626
classpathref =" partest.compilation.path"
1614
1627
resource =" scala/tools/partest/antlib.xml" />
1615
-
1616
- <!-- compile compiler-specific parts of partest -->
1617
- <staged-build with =" starr" stage =" quick" project =" partest-extras" />
1618
- <staged-build with =" starr" stage =" quick" project =" partest-javaagent" />
1619
- <staged-pack project =" partest-extras" />
1620
- <staged-pack project =" partest-javaagent" manifest =" ${ src.dir } /partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF" />
1621
1628
</target >
1622
1629
1623
1630
<target name =" test.suite.init" depends =" pack.done, partest.task" >
0 commit comments