Merge pull request #3221 from adriaanm/modularize-cps

Final library modularization for 2.11

8 files changed, 12 insertions, 135 deletions

diff --git a/src/build/bnd/continuations.bnd b/src/build/bnd/continuations.bnd
deleted file mode 100644
index 748502f653..0000000000
--- a/src/build/bnd/continuations.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Name: Scala Continuations Plugin
-Bundle-SymbolicName: org.scala-lang.plugins.continuations
-ver: @VERSION@
-Bundle-Version: ${ver}
-Export-Package: *;version=${ver}
diff --git a/src/build/bnd/scala-continuations-library.bnd b/src/build/bnd/scala-continuations-library.bnd
new file mode 100644
index 0000000000..66022d473a
--- /dev/null
+++ b/src/build/bnd/scala-continuations-library.bnd
@@ -0,0 +1,5 @@
+Bundle-Name: Scala Delimited Continuations Library
+Bundle-SymbolicName: org.scala-lang.plugins.continuations-library
+ver: @VERSION@
+Bundle-Version: ${ver}
+Export-Package: *;version=${ver}
diff --git a/src/build/bnd/scala-continuations-plugin.bnd b/src/build/bnd/scala-continuations-plugin.bnd
new file mode 100644
index 0000000000..94bd3ccc8f
--- /dev/null
+++ b/src/build/bnd/scala-continuations-plugin.bnd
@@ -0,0 +1,5 @@
+Bundle-Name: Scala Delimited Continuations Compiler Plugin
+Bundle-SymbolicName: org.scala-lang.plugins.continuations-plugin
+ver: @VERSION@
+Bundle-Version: ${ver}
+Export-Package: *;version=${ver}
diff --git a/src/build/bnd/scala-swing.bnd b/src/build/bnd/scala-swing.bnd
index eeacb9bd3f..7cccb1343b 100644
--- a/src/build/bnd/scala-swing.bnd
+++ b/src/build/bnd/scala-swing.bnd
@@ -1,5 +1,5 @@
 Bundle-Name: Scala Swing
-Bundle-SymbolicName: org.scala-lang.scala-swing
+Bundle-SymbolicName: org.scala-lang.modules.scala-swing
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala
index ee1976ffa4..d1d4c12b3f 100644
--- a/src/build/dbuild-meta-json-gen.scala
+++ b/src/build/dbuild-meta-json-gen.scala
@@ -30,10 +30,6 @@ val meta =
     //   Seq(ProjectRef("scala-interactive", "org.scala-lang")),
     //   Seq(ProjectRef("scala-compiler", "org.scala-lang"), ProjectRef("scaladoc", "org.scala-lang"))),
 
-    Project("scala-swing", "org.scala-lang",
-      Seq(ProjectRef("scala-swing", "org.scala-lang")),
-      Seq(ProjectRef("scala-library", "org.scala-lang"))),
-
     Project("scala-actors", "org.scala-lang",
       Seq(ProjectRef("scala-actors", "org.scala-lang")),
       Seq(ProjectRef("scala-library", "org.scala-lang"))),
@@ -44,9 +40,8 @@ val meta =
 
     Project("scalap", "org.scala-lang",
       Seq(ProjectRef("scalap", "org.scala-lang")),
-      Seq(ProjectRef("scala-compiler", "org.scala-lang"))),
+      Seq(ProjectRef("scala-compiler", "org.scala-lang")))
 
-    Project("continuations", "org.scala-lang.plugins", Seq(ProjectRef("continuations", "org.scala-lang.plugins")), Seq.empty)
   ))
 
 println(Utils.writeValue(meta))
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 822cc1a25f..412d7caab6 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -124,9 +124,7 @@
       -->
 
       <deploy-one dir="@{dir}"          name="scala-actors"      local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scala-swing"       local="@{local}" signed="@{signed}"/>
       <deploy-one dir="@{dir}"          name="scalap"            local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}plugins/"  name="continuations"     local="@{local}" signed="@{signed}"/>
     </sequential>
   </macrodef>
 
diff --git a/src/build/maven/plugins/continuations-pom.xml b/src/build/maven/plugins/continuations-pom.xml
deleted file mode 100644
index 8dc79c8664..0000000000
--- a/src/build/maven/plugins/continuations-pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.scala-lang.plugins</groupId>
-  <artifactId>continuations</artifactId>
-  <packaging>jar</packaging>
-  <version>@VERSION@</version>
-  <name>Scala Continuations Plugin</name>
-  <description>Delimited continuations compilation for Scala</description>
-  <url>http://www.scala-lang.org/</url>
-  <inceptionYear>2010</inceptionYear>
-  <organization>
-    <name>LAMP/EPFL</name>
-    <url>http://lamp.epfl.ch/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>BSD 3-Clause</name>
-      <url>http://www.scala-lang.org/license.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:git:git://github.com/scala/scala.git</connection>
-    <url>https://github.com/scala/scala.git</url>
-  </scm>
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.scala-lang.org/</url>
-  </issueManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-compiler</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>scala-tools.org</id>
-      <url>@RELEASE_REPOSITORY@</url>
-    </repository>
-    <snapshotRepository>
-      <id>scala-tools.org</id>
-      <url>@SNAPSHOT_REPOSITORY@</url>
-      <uniqueVersion>false</uniqueVersion>
-    </snapshotRepository>
-  </distributionManagement>
-  <developers>
-    <developer>
-      <id>lamp</id>
-      <name>EPFL LAMP</name>
-    </developer>
-    <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
-    </developer>
-  </developers>
-</project>
diff --git a/src/build/maven/scala-swing-pom.xml b/src/build/maven/scala-swing-pom.xml
deleted file mode 100644
index 01c89f9bea..0000000000
--- a/src/build/maven/scala-swing-pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.scala-lang</groupId>
-  <artifactId>scala-swing</artifactId>
-  <packaging>jar</packaging>
-  <version>@VERSION@</version>
-  <name>Scala Swing library</name>
-  <description>Swing for Scala</description>
-  <url>http://www.scala-lang.org/</url>
-  <inceptionYear>2002</inceptionYear>
-  <organization>
-    <name>LAMP/EPFL</name>
-    <url>http://lamp.epfl.ch/</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>BSD 3-Clause</name>
-      <url>http://www.scala-lang.org/license.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <connection>scm:git:git://github.com/scala/scala.git</connection>
-    <url>https://github.com/scala/scala.git</url>
-  </scm>
-  <issueManagement>
-    <system>JIRA</system>
-    <url>https://issues.scala-lang.org/</url>
-  </issueManagement>
-  <properties>
-    <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>scala-tools.org</id>
-      <url>@RELEASE_REPOSITORY@</url>
-    </repository>
-    <snapshotRepository>
-      <id>scala-tools.org</id>
-      <url>@SNAPSHOT_REPOSITORY@</url>
-      <uniqueVersion>false</uniqueVersion>
-    </snapshotRepository>
-  </distributionManagement>
-  <developers>
-    <developer>
-      <id>lamp</id>
-      <name>EPFL LAMP</name>
-    </developer>
-    <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
-    </developer>
-  </developers>
-</project>