diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-13 15:49:53 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-13 15:49:53 -0800 |
| commit | 96df73d994097e3318d003ddef00194b711289a3 (patch) | |
| tree | f01e3bcb4044a427191ba095122726e9bfb5f9b0 /build.xml | |
| parent | 946b76ad8b31b1fd74e2f8e1972c4a9159ac690a (diff) | |
| parent | f83296552aa80faf8a9350131c0448bc05b34c96 (diff) | |
| download | scala-96df73d994097e3318d003ddef00194b711289a3.tar.gz scala-96df73d994097e3318d003ddef00194b711289a3.tar.bz2 scala-96df73d994097e3318d003ddef00194b711289a3.zip | |
Merge pull request #3129 from adriaanm/pr-rebase-3001
[rebase] blackbox and whitebox macros
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 19 |
1 files changed, 8 insertions, 11 deletions
@@ -1445,13 +1445,6 @@ TODO: <target name="quick.swing" depends="quick.actors, quick.lib" if="has.java6"> <staged-build with="locker" stage="quick" project="swing"/> </target> - <target name="quick.partest-extras" - depends="quick.comp"> - <!-- compile compiler-specific parts of partest --> - <staged-build with="starr" stage="quick" project="partest-extras" /> - <staged-build with="starr" stage="quick" project="partest-javaagent" /> - </target> - <target name="quick.plugins" depends="quick.comp"> <staged-uptodate stage="quick" project="continuations-plugin"> @@ -1551,10 +1544,14 @@ TODO: <taskdef resource="scala/tools/ant/antlib.xml" classpathref="scaladoc.classpath"/> </target> - <target name="pack.partest-extras" depends="quick.partest-extras"> - <staged-pack project="partest-extras"/> - <staged-pack project="partest-javaagent" - manifest="${src.dir}/partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF"/> + <target name="pack.partest-extras" depends="quick.comp"> + <!-- compile compiler-specific parts of partest --> + <staged-build with="quick" stage="quick" project="partest-extras" /> + <staged-build with="quick" stage="quick" project="partest-javaagent" /> + + <staged-pack project="partest-extras"/> + <staged-pack project="partest-javaagent" + manifest="${src.dir}/partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF"/> </target> <target name="pack.bin" depends="pack.core, pack.modules, pack.partest-extras"> |