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 /project/Layers.scala | |
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 'project/Layers.scala')
-rw-r--r-- | project/Layers.scala | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/project/Layers.scala b/project/Layers.scala index 009129efcf..6c939d0ff7 100644 --- a/project/Layers.scala +++ b/project/Layers.scala @@ -93,7 +93,6 @@ trait Layers extends Build { version := layer, scalaSource in Compile <<= (baseDirectory) apply (_ / "src" / "compiler"), resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "compiler"), - unmanagedSourceDirectories in Compile <+= (baseDirectory) apply (_ / "src" / "msil"), defaultExcludes := ("tests"), defaultExcludes in unmanagedResources := "*.scala", resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, skip in Compile, streams) map Versions.generateVersionPropertiesFile("compiler.properties"), |