Skip to content

Commit 6ee2ce5

Browse files
paulppaulp
committed
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
2 parents 330c77b + 96fa31d commit 6ee2ce5

File tree

111 files changed

+78
-19508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+78
-19508
lines changed

‎build.detach.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SuperSabbus for Scala detach plugin.
1111
<!-- ===========================================================================
1212
END-USER TARGETS
1313
============================================================================ -->
14-
14+
1515
<target name="build" depends="pack.done"
1616
description="Builds the Scala detach plugin."/>
1717

@@ -72,7 +72,6 @@ QUICK BUILD (QUICK)
7272
<path id="quick.classpath">
7373
<pathelement location="${build-quick.dir}/classes/library"/>
7474
<pathelement location="${build-quick.dir}/classes/compiler"/>
75-
<pathelement location="${lib.dir}/msil.jar"/>
7675
<pathelement location="${lib.dir}/forkjoin.jar"/>
7776
<pathelement location="${ant.home}/lib/ant.jar"/>
7877
</path>
@@ -119,9 +118,9 @@ QUICK BUILD (QUICK)
119118
<!-- ===========================================================================
120119
PACKED QUICK BUILD (PACK)
121120
============================================================================ -->
122-
121+
123122
<target name="pack.start" depends="quick.done"/>
124-
123+
125124
<target name="pack.pre-lib" depends="pack.start">
126125
<uptodate
127126
property="pack.lib.available"

‎build.examples.xml

+1-16
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ PROPERTIES
2828
<!-- Location of pre-compiled libraries properties -->
2929
<property name="scala.lib.jar" value="${lib.dir}/scala-library.jar"/>
3030
<property name="scala.comp.jar" value="${lib.dir}/scala-compiler.jar"/>
31-
<property name="msil.name" value="msil.jar"/>
32-
<property name="msil.jar" value="${lib.dir}/${msil.name}"/>
3331
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
3432
<property name="ant-contrib.jar" value="${lib.dir}/ant/ant-contrib.jar"/>
3533
<!-- -->
@@ -57,7 +55,7 @@ INITIALISATION
5755
<fail message="Scala library in '${lib.dir}/' is not available">
5856
<condition><not><and>
5957
<available
60-
classname="scala.Predef"
58+
classname="scala.Predef"
6159
classpath="${scala.lib.jar}"
6260
/>
6361
<available
@@ -79,15 +77,6 @@ INITIALISATION
7977
/>
8078
</not></condition>
8179
</fail>
82-
<echo level="verbose" message="msil.jar=${msil.jar}"/>
83-
<fail message="MSIL library in '${lib.dir}/' is not available">
84-
<condition><not>
85-
<available
86-
classname="ch.epfl.lamp.compiler.msil.MemberInfo"
87-
classpath="${msil.jar}"
88-
/>
89-
</not></condition>
90-
</fail>
9180
<echo level="verbose" message="ant.jar=${ant.jar}"/>
9281
<echo level="verbose" message="ant-contrib.jar=${ant-contrib.jar}"/>
9382
<fail message="Additional Ant tasks in '${lib.dir}/' is not available">
@@ -99,13 +88,9 @@ INITIALISATION
9988
</not></condition>
10089
</fail>
10190
<!-- Creating class-pathes -->
102-
<path id="common.classpath">
103-
<pathelement location="${msil.jar}"/>
104-
</path>
10591
<path id="scala.classpath">
10692
<pathelement location="${scala.lib.jar}"/>
10793
<pathelement location="${scala.comp.jar}"/>
108-
<path refid="common.classpath"/>
10994
</path>
11095
<!-- Creating boot-level tasks -->
11196
<taskdef resource="net/sf/antcontrib/antlib.xml">

‎build.xml

-95
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ PROPERTIES
203203

204204
<!-- Sets location of pre-compiled libraries -->
205205
<property name="lib.starr.jar" value="${lib.dir}/scala-library.jar"/>
206-
<property name="msil.starr.jar" value="${lib.dir}/msil.jar"/>
207206
<property name="reflect.starr.jar" value="${lib.dir}/scala-reflect.jar"/>
208207
<property name="comp.starr.jar" value="${lib.dir}/scala-compiler.jar"/>
209208
<property name="jline.jar" value="${lib.dir}/jline.jar"/>
@@ -462,7 +461,6 @@ INITIALISATION
462461
<path id="starr.dep.libs">
463462
<fileset dir="${lib.dir}">
464463
<include name="forkjoin.jar"/>
465-
<include name="msil.jar"/>
466464
</fileset>
467465
</path>
468466
<!-- Auxiliary libs placed on every classpath. -->
@@ -621,9 +619,6 @@ LOCAL REFERENCE BUILD (LOCKER)
621619
<pathelement location="${build-locker.dir}/classes/library"/>
622620
</classpath>
623621
</javac>
624-
<!-- NOTE: Potential problem with maximal command line length on Windows
625-
(32768 characters for XP, since executed with Java's "exec"). See
626-
src/build/msil.xml in msil branch for more details. -->
627622
<scalacfork
628623
destdir="${build-locker.dir}/classes/library"
629624
compilerpathref="starr.classpath"
@@ -713,42 +708,6 @@ LOCAL REFERENCE BUILD (LOCKER)
713708
<target name="locker.comp" depends="locker.pre-comp" if="locker.comp.needed">
714709
<stopwatch name="locker.comp.timer"/>
715710
<mkdir dir="${build-locker.dir}/classes/compiler"/>
716-
<if>
717-
<equals arg1="${fastlocker}" arg2="true" />
718-
<then>
719-
<!-- Fastlocker build: don't compile MSIL, use its starr version.... -->
720-
<property name="locker.comp.msil" value="${msil.starr.jar}"/>
721-
</then>
722-
<else>
723-
<!-- Regular build: Compile MSIL inside of locker.... -->
724-
<javac
725-
srcdir="${src.dir}/msil"
726-
destdir="${build-locker.dir}/classes/compiler"
727-
classpath="${build-locker.dir}/classes/compiler"
728-
includes="**/*.java"
729-
excludes="**/tests/**"
730-
debug="true"
731-
target="1.6" source="1.4">
732-
<compilerarg line="${javac.args}"/>
733-
</javac>
734-
<scalacfork
735-
destdir="${build-locker.dir}/classes/compiler"
736-
compilerpathref="starr.classpath"
737-
params="${scalac.args.all}"
738-
srcdir="${src.dir}/msil"
739-
jvmargs="${scalacfork.jvmargs}">
740-
<include name="**/*.scala"/>
741-
<compilationpath>
742-
<pathelement location="${build-locker.dir}/classes/library"/>
743-
<pathelement location="${build-locker.dir}/classes/reflect"/>
744-
<pathelement location="${build-locker.dir}/classes/compiler"/>
745-
<path refid="aux.libs"/>
746-
<pathelement location="${jline.jar}"/>
747-
</compilationpath>
748-
</scalacfork>
749-
<property name="locker.comp.msil" value="${build-locker.dir}/classes/compiler"/>
750-
</else>
751-
</if>
752711
<scalacfork
753712
destdir="${build-locker.dir}/classes/compiler"
754713
compilerpathref="starr.classpath"
@@ -762,7 +721,6 @@ LOCAL REFERENCE BUILD (LOCKER)
762721
<pathelement location="${build-locker.dir}/classes/compiler"/>
763722
<path refid="aux.libs"/>
764723
<path refid="asm.classpath"/>
765-
<pathelement location="${locker.comp.msil}" />
766724
<pathelement location="${jline.jar}"/>
767725
</compilationpath>
768726
</scalacfork>
@@ -1110,32 +1068,6 @@ QUICK BUILD (QUICK)
11101068
<target name="quick.comp" depends="quick.pre-comp" unless="quick.comp.available">
11111069
<stopwatch name="quick.comp.timer"/>
11121070
<mkdir dir="${build-quick.dir}/classes/compiler"/>
1113-
<!-- Compile MSIL inside of quick.... -->
1114-
<javac
1115-
srcdir="${src.dir}/msil"
1116-
destdir="${build-quick.dir}/classes/compiler"
1117-
classpath="${build-quick.dir}/classes/compiler"
1118-
includes="**/*.java"
1119-
excludes="**/tests/**"
1120-
debug="true"
1121-
target="1.6" source="1.4">
1122-
<compilerarg line="${javac.args}"/>
1123-
</javac>
1124-
<scalacfork
1125-
destdir="${build-quick.dir}/classes/compiler"
1126-
compilerpathref="locker.classpath"
1127-
params="${scalac.args.all}"
1128-
srcdir="${src.dir}/msil"
1129-
jvmargs="${scalacfork.jvmargs}">
1130-
<include name="**/*.scala"/>
1131-
<compilationpath>
1132-
<pathelement location="${build-quick.dir}/classes/library"/>
1133-
<pathelement location="${build-quick.dir}/classes/reflect"/>
1134-
<pathelement location="${build-quick.dir}/classes/compiler"/>
1135-
<path refid="aux.libs"/>
1136-
<pathelement location="${jline.jar}"/>
1137-
</compilationpath>
1138-
</scalacfork>
11391071
<scalacfork
11401072
destdir="${build-quick.dir}/classes/compiler"
11411073
compilerpathref="locker.classpath"
@@ -1886,32 +1818,6 @@ BOOTSTRAPPING BUILD (STRAP)
18861818
<target name="strap.comp" depends="strap.pre-comp" unless="strap.comp.available">
18871819
<stopwatch name="strap.comp.timer"/>
18881820
<mkdir dir="${build-strap.dir}/classes/compiler"/>
1889-
<!-- Compile MSIL inside of strap.... -->
1890-
<javac
1891-
srcdir="${src.dir}/msil"
1892-
destdir="${build-strap.dir}/classes/compiler"
1893-
classpath="${build-strap.dir}/classes/compiler"
1894-
includes="**/*.java"
1895-
excludes="**/tests/**"
1896-
debug="true"
1897-
target="1.6" source="1.4">
1898-
<compilerarg line="${javac.args}"/>
1899-
</javac>
1900-
<scalacfork
1901-
destdir="${build-strap.dir}/classes/compiler"
1902-
compilerpathref="pack.classpath"
1903-
params="${scalac.args.all}"
1904-
srcdir="${src.dir}/msil"
1905-
jvmargs="${scalacfork.jvmargs}">
1906-
<include name="**/*.scala"/>
1907-
<compilationpath>
1908-
<pathelement location="${build-strap.dir}/classes/library"/>
1909-
<pathelement location="${build-strap.dir}/classes/reflect"/>
1910-
<pathelement location="${build-strap.dir}/classes/compiler"/>
1911-
<path refid="aux.libs"/>
1912-
<pathelement location="${jline.jar}"/>
1913-
</compilationpath>
1914-
</scalacfork>
19151821
<scalacfork
19161822
destdir="${build-strap.dir}/classes/compiler"
19171823
compilerpathref="pack.classpath"
@@ -2772,7 +2678,6 @@ STABLE REFERENCE (STARR)
27722678
<jar destfile="${basedir}/lib/scala-compiler-src.jar">
27732679
<fileset dir="${basedir}/src/compiler"/>
27742680
<fileset dir="${basedir}/src/asm"/>
2775-
<fileset dir="${basedir}/src/msil"/>
27762681
</jar>
27772682
</target>
27782683

‎lib/msil.jar.desired.sha1

-1
This file was deleted.

‎project/Build.scala

+15-15
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
1111
override lazy val settings = super.settings ++ Versions.settings ++ Seq(
1212
autoScalaLibrary := false,
1313
resolvers += Resolver.url(
14-
"Typesafe nightlies",
14+
"Typesafe nightlies",
1515
url("https://typesafe.artifactoryonline.com/typesafe/ivy-snapshots/")
1616
)(Resolver.ivyStylePatterns),
1717
resolvers ++= Seq(
@@ -21,14 +21,14 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
2121
organization := "org.scala-lang",
2222
version <<= Versions.mavenVersion,
2323
pomExtra := epflPomExtra
24-
)
24+
)
2525

2626
// Collections of projects to run 'compile' on.
2727
lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, forkjoin)
2828
// Collection of projects to 'package' and 'publish' together.
2929
lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, actors, continuationsPlugin, jline, scalap)
3030
lazy val partestRunProjects = Seq(testsuite, continuationsTestsuite)
31-
31+
3232
private def epflPomExtra = (
3333
<xml:group>
3434
<inceptionYear>2002</inceptionYear>
@@ -47,7 +47,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
4747
</issueManagement>
4848
</xml:group>
4949
)
50-
50+
5151
// Settings used to make sure publishing goes smoothly.
5252
def publishSettings: Seq[Setting[_]] = Seq(
5353
ivyScala ~= ((is: Option[IvyScala]) => is.map(_.copy(checkExplicit = false))),
@@ -91,7 +91,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
9191
lazy val aaa_root = Project("scala", file(".")) settings(projectSettings: _*) settings(ShaResolve.settings: _*)
9292

9393
// External dependencies used for various projects
94-
lazy val externalDeps: Setting[_] = libraryDependencies <<= (sbtVersion)(v =>
94+
lazy val externalDeps: Setting[_] = libraryDependencies <<= (sbtVersion)(v =>
9595
Seq(
9696
"org.apache.ant" % "ant" % "1.8.2",
9797
"org.scala-sbt" % "compiler-interface" % v % "provided"
@@ -132,7 +132,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
132132

133133
// Jline nested project. Compile this sucker once and be done.
134134
lazy val jline = Project("jline", file("src/jline"))
135-
// Our wrapped version of msil.
135+
// Our wrapped version of asm.
136136
lazy val asm = Project("asm", file(".")) settings(settingOverrides : _*)
137137
// Forkjoin backport
138138
lazy val forkjoin = Project("forkjoin", file(".")) settings(settingOverrides : _*)
@@ -173,9 +173,9 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
173173
// --------------------------------------------------------------
174174
// Projects dependent on layered compilation (quick)
175175
// --------------------------------------------------------------
176-
def addCheaterDependency(projectName: String): Setting[_] =
177-
pomPostProcess <<= (version, organization, pomPostProcess) apply { (v,o,k) =>
178-
val dependency: scala.xml.Node =
176+
def addCheaterDependency(projectName: String): Setting[_] =
177+
pomPostProcess <<= (version, organization, pomPostProcess) apply { (v,o,k) =>
178+
val dependency: scala.xml.Node =
179179
<dependency>
180180
<groupId>{o}</groupId>
181181
<artifactid>{projectName}</artifactid>
@@ -191,10 +191,10 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
191191
case n: scala.xml.Elem if n.label == "dependencies" => n
192192
} isEmpty)
193193
// TODO - Keep namespace on project...
194-
k andThen {
194+
k andThen {
195195
case n @ <project>{ nested@_*}</project> if hasDependencies(n) =>
196196
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">{nested}<dependencies>{dependency}</dependencies></project>
197-
case <project>{ nested@_*}</project> =>
197+
case <project>{ nested@_*}</project> =>
198198
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">{ nested map fixDependencies }</project>
199199
}
200200
}
@@ -203,7 +203,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
203203
lazy val dependentProjectSettings = settingOverrides ++ Seq(quickScalaInstance, quickScalaLibraryDependency, addCheaterDependency("scala-library"))
204204
lazy val actors = Project("scala-actors", file(".")) settings(dependentProjectSettings:_*) dependsOn(forkjoin % "provided")
205205
lazy val swing = Project("scala-swing", file(".")) settings(dependentProjectSettings:_*) dependsOn(actors % "provided")
206-
// This project will generate man pages (in man1 and html) for scala.
206+
// This project will generate man pages (in man1 and html) for scala.
207207
lazy val manmakerSettings: Seq[Setting[_]] = dependentProjectSettings :+ externalDeps
208208
lazy val manmaker = Project("manual", file(".")) settings(manmakerSettings:_*)
209209

@@ -232,7 +232,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
232232
lazy val continuationsPlugin = Project("continuations-plugin", file(".")) settings(continuationsPluginSettings:_*)
233233
lazy val continuationsLibrarySettings = dependentProjectSettings ++ Seq(
234234
scalaSource in Compile <<= baseDirectory(_ / "src/continuations/library/"),
235-
scalacOptions in Compile <++= (exportedProducts in Compile in continuationsPlugin) map {
235+
scalacOptions in Compile <++= (exportedProducts in Compile in continuationsPlugin) map {
236236
case Seq(cpDir) => Seq("-Xplugin-require:continuations", "-P:continuations:enable", "-Xplugin:"+cpDir.data.getAbsolutePath)
237237
}
238238
)
@@ -295,11 +295,11 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
295295
lazy val scalaCompiler = Project("scala-compiler", file(".")) settings(publishSettings:_*) settings(scalaBinArtifactSettings:_*) dependsOn(scalaReflect)
296296
lazy val fullQuickScalaReference = makeScalaReference("pack", scalaLibrary, scalaReflect, scalaCompiler)
297297

298-
298+
299299
// --------------------------------------------------------------
300300
// Generating Documentation.
301301
// --------------------------------------------------------------
302-
302+
303303
// TODO - Migrate this into the dist project.
304304
// Scaladocs
305305
lazy val documentationSettings: Seq[Setting[_]] = dependentProjectSettings ++ Seq(

‎project/Layers.scala

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ trait Layers extends Build {
9393
version := layer,
9494
scalaSource in Compile <<= (baseDirectory) apply (_ / "src" / "compiler"),
9595
resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "compiler"),
96-
unmanagedSourceDirectories in Compile <+= (baseDirectory) apply (_ / "src" / "msil"),
9796
defaultExcludes := ("tests"),
9897
defaultExcludes in unmanagedResources := "*.scala",
9998
resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, skip in Compile, streams) map Versions.generateVersionPropertiesFile("compiler.properties"),

‎src/compiler/scala/tools/ant/Scalac.scala

+1-14
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ import scala.tools.nsc.reporters.{Reporter, ConsoleReporter}
5656
* - `usejavacp`,
5757
* - `failonerror`,
5858
* - `scalacdebugging`,
59-
* - `assemname`,
60-
* - `assemrefs`.
6159
*
6260
* It also takes the following parameters as nested elements:
6361
* - `src` (for `srcdir`),
@@ -100,7 +98,7 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
10098

10199
/** Defines valid values for the `target` property. */
102100
object Target extends PermissibleValue {
103-
val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7", "msil")
101+
val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7")
104102
}
105103

106104
/** Defines valid values for the `deprecation` and `unchecked` properties. */
@@ -170,11 +168,6 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
170168
/** Indicates whether compilation errors will fail the build; defaults to true. */
171169
protected var failonerror: Boolean = true
172170

173-
// Name of the output assembly (only relevant with -target:msil)
174-
protected var assemname: Option[String] = None
175-
// List of assemblies referenced by the program (only relevant with -target:msil)
176-
protected var assemrefs: Option[String] = None
177-
178171
/** Prints out the files being compiled by the scalac ant task
179172
* (not only the number of files). */
180173
protected var scalacDebugging: Boolean = false
@@ -421,9 +414,6 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
421414
* @param input The specified flag */
422415
def setScalacdebugging(input: Boolean) { scalacDebugging = input }
423416

424-
def setAssemname(input: String) { assemname = Some(input) }
425-
def setAssemrefs(input: String) { assemrefs = Some(input) }
426-
427417
/** Sets the `compilerarg` as a nested compilerarg Ant parameter.
428418
* @return A compiler argument to be configured. */
429419
def createCompilerArg(): ImplementationSpecificArgument = {
@@ -616,9 +606,6 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
616606
if (!unchecked.isEmpty) settings.unchecked.value = unchecked.get
617607
if (!usejavacp.isEmpty) settings.usejavacp.value = usejavacp.get
618608

619-
if (!assemname.isEmpty) settings.assemname.value = assemname.get
620-
if (!assemrefs.isEmpty) settings.assemrefs.value = assemrefs.get
621-
622609
val jvmargs = scalacCompilerArgs.getArgs filter (_ startsWith "-J")
623610
if (!jvmargs.isEmpty) settings.jvmargs.value = jvmargs.toList
624611
val defines = scalacCompilerArgs.getArgs filter (_ startsWith "-D")

0 commit comments

Comments
 (0)