diff options
author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:20:31 -0800 |
commit | 6ee2ce50a56237eed07bcc6b6198f97779208a02 (patch) | |
tree | df7a9386e892beafff42bddcc0347f9337cfd3df /build.detach.xml | |
parent | 330c77b097782ed389a83175302379ea72d22c41 (diff) | |
parent | 96fa31d0a3cf7ff401f9197cd0e12acd296e55b1 (diff) | |
download | scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.gz scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.tar.bz2 scala-6ee2ce50a56237eed07bcc6b6198f97779208a02.zip |
Merge commit 'refs/pull/1718/head' into merge-msil-genjvm-delete
* commit 'refs/pull/1718/head':
Expunged the .net backend.
Conflicts:
build.detach.xml
build.examples.xml
build.xml
project/Build.scala
src/compiler/scala/tools/ant/Scalac.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
src/compiler/scala/tools/nsc/transform/Mixin.scala
src/intellij/compiler.iml.SAMPLE
tools/buildcp
Diffstat (limited to 'build.detach.xml')
-rw-r--r-- | build.detach.xml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build.detach.xml b/build.detach.xml index 7845d59e1e..03360e36d5 100644 --- a/build.detach.xml +++ b/build.detach.xml @@ -11,7 +11,7 @@ SuperSabbus for Scala detach plugin. <!-- =========================================================================== END-USER TARGETS ============================================================================ --> - + <target name="build" depends="pack.done" description="Builds the Scala detach plugin."/> @@ -72,7 +72,6 @@ QUICK BUILD (QUICK) <path id="quick.classpath"> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> - <pathelement location="${lib.dir}/msil.jar"/> <pathelement location="${lib.dir}/forkjoin.jar"/> <pathelement location="${ant.home}/lib/ant.jar"/> </path> @@ -119,9 +118,9 @@ QUICK BUILD (QUICK) <!-- =========================================================================== PACKED QUICK BUILD (PACK) ============================================================================ --> - + <target name="pack.start" depends="quick.done"/> - + <target name="pack.pre-lib" depends="pack.start"> <uptodate property="pack.lib.available" |