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.examples.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.examples.xml')
| -rw-r--r-- | build.examples.xml | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/build.examples.xml b/build.examples.xml index b105604afc..82432121ca 100644 --- a/build.examples.xml +++ b/build.examples.xml @@ -28,8 +28,6 @@ PROPERTIES <!-- Location of pre-compiled libraries properties --> <property name="scala.lib.jar" value="${lib.dir}/scala-library.jar"/> <property name="scala.comp.jar" value="${lib.dir}/scala-compiler.jar"/> - <property name="msil.name" value="msil.jar"/> - <property name="msil.jar" value="${lib.dir}/${msil.name}"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> <property name="ant-contrib.jar" value="${lib.dir}/ant/ant-contrib.jar"/> <!-- --> @@ -57,7 +55,7 @@ INITIALISATION <fail message="Scala library in '${lib.dir}/' is not available"> <condition><not><and> <available - classname="scala.Predef" + classname="scala.Predef" classpath="${scala.lib.jar}" /> <available @@ -79,15 +77,6 @@ INITIALISATION /> </not></condition> </fail> - <echo level="verbose" message="msil.jar=${msil.jar}"/> - <fail message="MSIL library in '${lib.dir}/' is not available"> - <condition><not> - <available - classname="ch.epfl.lamp.compiler.msil.MemberInfo" - classpath="${msil.jar}" - /> - </not></condition> - </fail> <echo level="verbose" message="ant.jar=${ant.jar}"/> <echo level="verbose" message="ant-contrib.jar=${ant-contrib.jar}"/> <fail message="Additional Ant tasks in '${lib.dir}/' is not available"> @@ -99,13 +88,9 @@ INITIALISATION </not></condition> </fail> <!-- Creating class-pathes --> - <path id="common.classpath"> - <pathelement location="${msil.jar}"/> - </path> <path id="scala.classpath"> <pathelement location="${scala.lib.jar}"/> <pathelement location="${scala.comp.jar}"/> - <path refid="common.classpath"/> </path> <!-- Creating boot-level tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml"> |