From 6ba5fc604ab3c8dca6bba4c50c943b31ccb04935 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 18 Oct 2013 13:48:44 -0700
Subject: Correct license to 3-clause BSD in poms.

---
 src/build/maven/plugins/continuations-pom.xml | 5 ++---
 src/build/maven/scala-actors-pom.xml          | 5 ++---
 src/build/maven/scala-compiler-pom.xml        | 5 ++---
 src/build/maven/scala-library-pom.xml         | 5 ++---
 src/build/maven/scala-reflect-pom.xml         | 5 ++---
 src/build/maven/scala-swing-pom.xml           | 5 ++---
 src/build/maven/scalap-pom.xml                | 5 ++---
 7 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/build/maven/plugins/continuations-pom.xml b/src/build/maven/plugins/continuations-pom.xml
index 9abb0a36f0..7217270e96 100644
--- a/src/build/maven/plugins/continuations-pom.xml
+++ b/src/build/maven/plugins/continuations-pom.xml
@@ -16,9 +16,8 @@
 	</organization>
 	<licenses>
 		<license>
-			<name>BSD-like</name>
-			<url>http://www.scala-lang.org/downloads/license.html
-			</url>
+                        <name>BSD 3-Clause</name>
+                        <url>http://www.scala-lang.org/license.html</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
diff --git a/src/build/maven/scala-actors-pom.xml b/src/build/maven/scala-actors-pom.xml
index 3d37ef8174..dbbdbb46f6 100644
--- a/src/build/maven/scala-actors-pom.xml
+++ b/src/build/maven/scala-actors-pom.xml
@@ -16,9 +16,8 @@
    </organization>
    <licenses>
       <license>
-         <name>BSD-like</name>
-         <url>http://www.scala-lang.org/downloads/license.html
-         </url>
+         <name>BSD 3-Clause</name>
+         <url>http://www.scala-lang.org/license.html</url>
          <distribution>repo</distribution>
       </license>
    </licenses>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 8cc42c22ae..676e054a36 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -16,9 +16,8 @@
 	</organization>
 	<licenses>
 		<license>
-			<name>BSD-like</name>
-			<url>http://www.scala-lang.org/downloads/license.html
-			</url>
+                        <name>BSD 3-Clause</name>
+                        <url>http://www.scala-lang.org/license.html</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml
index 684474e79a..fcadc16197 100644
--- a/src/build/maven/scala-library-pom.xml
+++ b/src/build/maven/scala-library-pom.xml
@@ -16,9 +16,8 @@
    </organization>
    <licenses>
       <license>
-         <name>BSD-like</name>
-         <url>http://www.scala-lang.org/downloads/license.html
-         </url>
+         <name>BSD 3-Clause</name>
+         <url>http://www.scala-lang.org/license.html</url>
          <distribution>repo</distribution>
       </license>
    </licenses>
diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml
index 56d2ffc57c..7c6aa024ae 100644
--- a/src/build/maven/scala-reflect-pom.xml
+++ b/src/build/maven/scala-reflect-pom.xml
@@ -16,9 +16,8 @@
 	</organization>
 	<licenses>
 		<license>
-			<name>BSD-like</name>
-			<url>http://www.scala-lang.org/downloads/license.html
-			</url>
+                        <name>BSD 3-Clause</name>
+                        <url>http://www.scala-lang.org/license.html</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
diff --git a/src/build/maven/scala-swing-pom.xml b/src/build/maven/scala-swing-pom.xml
index 5099fe11dc..b87c9219a3 100644
--- a/src/build/maven/scala-swing-pom.xml
+++ b/src/build/maven/scala-swing-pom.xml
@@ -16,9 +16,8 @@
    </organization>
    <licenses>
       <license>
-         <name>BSD-like</name>
-         <url>http://www.scala-lang.org/downloads/license.html
-         </url>
+         <name>BSD 3-Clause</name>
+         <url>http://www.scala-lang.org/license.html</url>
          <distribution>repo</distribution>
       </license>
    </licenses>
diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml
index 50c08e899c..b2445cf420 100644
--- a/src/build/maven/scalap-pom.xml
+++ b/src/build/maven/scalap-pom.xml
@@ -16,9 +16,8 @@
 	</organization>
 	<licenses>
 		<license>
-			<name>BSD-like</name>
-			<url>http://www.scala-lang.org/downloads/license.html
-			</url>
+                        <name>BSD 3-Clause</name>
+                        <url>http://www.scala-lang.org/license.html</url>
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
-- 
cgit v1.2.3


From 09faf8ede1e14a3b294ff62a88efc1732a8fb105 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 1 Oct 2013 12:18:15 -0700
Subject: Clarify comment.

---
 build.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index b28e6d4e8e..e6c9cc66e9 100755
--- a/build.xml
+++ b/build.xml
@@ -561,7 +561,8 @@ TODO:
     <if><isset property="locker.skip"/><then>
       <echo message="Using STARR to build the quick stage (skipping locker)."/>
       <path id="locker.compiler.path" refid="starr.compiler.path"/>
-       <!-- this is cheating, but should be close enough: -->
+       <!-- this is cheating (we don't know the classpath used to build starr)
+            but should be close enough: -->
       <path id="locker.compiler.build.path" refid="starr.compiler.path"/>
       <property name="locker.locked" value="locker skipped"/></then>
     <else>
-- 
cgit v1.2.3


From 2cba4f7c5b6f372a150f5ebabecf2eaa25ece797 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 1 Oct 2013 12:21:43 -0700
Subject: Remove dead target: locker.actors

---
 build.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/build.xml b/build.xml
index e6c9cc66e9..adbe33e65b 100755
--- a/build.xml
+++ b/build.xml
@@ -587,11 +587,6 @@ TODO:
       <path refid="aux.libs"/>
     </path>
 
-    <path id="locker.actors.build.path">
-      <path refid="locker.library.build.path"/>
-      <pathelement location="${build-locker.dir}/classes/actors"/>
-    </path>
-
     <path id="locker.reflect.build.path">
       <path refid="locker.library.build.path"/>
       <pathelement location="${build-locker.dir}/classes/reflect"/>
@@ -1241,9 +1236,6 @@ TODO:
   <target name="locker.lib"    depends="locker.start"     unless="locker.locked">
     <staged-build with="starr" stage="locker" project="library" srcpath="${src.dir}/library" includes="lib.includes"/></target>
 
-  <target name="locker.actors" depends="locker.lib"       unless="locker.locked">
-    <staged-build with="starr" stage="locker" project="actors"/> </target>
-
   <target name="locker.reflect" depends="locker.lib"      unless="locker.locked">
     <staged-build with="starr" stage="locker" project="reflect"/></target>
 
-- 
cgit v1.2.3


From 8f05b5a0946dc2d4f715b22be841e0656be70b52 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 18 Oct 2013 13:42:48 -0700
Subject: Untangle classpaths related to doc targets.

---
 build.xml | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/build.xml b/build.xml
index adbe33e65b..c369c99fe6 100755
--- a/build.xml
+++ b/build.xml
@@ -749,18 +749,33 @@ TODO:
       <path refid="asm.classpath"/>
     </path>
 
-    <!-- MISC -->
-    <path id="docs.compiler.path">
+    <!-- DOCS -->
+    <path id="docs.compiler.build.path">             <path refid="quick.compiler.build.path"/> </path>
+    <path id="docs.scalap.build.path">               <path refid="quick.scalap.build.path"/>   </path>
+    <path id="docs.continuations-plugin.build.path"> <path refid="quick.plugins.build.path"/>  </path>
+    <path id="docs.library.build.path">
+      <path refid="quick.reflect.build.path"/>
+      <path refid="quick.actors.build.path"/>
+    </path>
+
+    <!-- run-time classpath for scaladoc: should be resolved through maven once it's an actual module -->
+    <path id="scaladoc.classpath">
       <path refid="external-modules-nocore"/>
       <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-reflect.jar"/>
       <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/>
-      <pathelement location="${build-pack.dir}/lib/scalap.jar"/>
-      <pathelement location="${build-pack.dir}/lib/scala-actors.jar"/>
       <pathelement location="${ant.jar}"/>
       <path refid="aux.libs"/>
     </path>
 
+    <path id="manual.build.path">
+      <path refid="external-modules-nocore"/> <!-- xml -->
+      <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
+      <pathelement location="${build.dir}/manmaker/classes"/>
+      <path refid="aux.libs"/>  <!-- for ant -->
+    </path>
+
+    <!-- MISC -->
     <path id="sbt.compile.build.path">
       <path refid="quick.compiler.build.path"/>
       <pathelement location="${build-quick.dir}/classes/repl"/>
@@ -769,10 +784,6 @@ TODO:
       <pathelement location="${sbt.interface.jar}"/>
     </path>
 
-    <path id="manual.classpath">
-      <pathelement location="${build-pack.dir}/lib/scala-library.jar"/>
-      <pathelement location="${build.dir}/manmaker/classes"/>
-    </path>
 
     <!--
        This is the classpath used to run partest, which is what it uses to run the compiler and find other required jars.
@@ -1186,13 +1197,12 @@ TODO:
             <stopwatch name="docs.@{project}.timer"/>
             <mkdir dir="${build-docs.dir}/@{project}"/>
             <if><equals arg1="@{docroot}" arg2="NOT SET"/><then>
-              <!-- TODO: introduce docs.@{project}.build.path for classpathref -->
               <scaladoc
                 destdir="${build-docs.dir}/@{project}"
                 doctitle="@{title}"
                 docversion="${version.number}"
                 sourcepath="${src.dir}"
-                classpathref="docs.compiler.path"
+                classpathref="docs.@{project}.build.path"
                 srcdir="${src.dir}/@{dir}"
                 addparams="${scalac.args.all}"
                 implicits="on"
@@ -1208,7 +1218,7 @@ TODO:
                 doctitle="@{title}"
                 docversion="${version.number}"
                 sourcepath="${src.dir}"
-                classpathref="docs.compiler.path"
+                classpathref="docs.@{project}.build.path"
                 srcdir="${src.dir}/@{dir}"
                 docRootContent="${src.dir}/@{project}/@{docroot}"
                 addparams="${scalac.args.all}"
@@ -1381,7 +1391,7 @@ TODO:
   <!-- depend on quick.done so quick.bin is run when pack.done is -->
   <target name="pack.done" depends="quick.done, pack.bin">
     <!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks -->
-    <taskdef resource="scala/tools/ant/antlib.xml" classpathref="docs.compiler.path"/>
+    <taskdef resource="scala/tools/ant/antlib.xml" classpathref="scaladoc.classpath"/>
   </target>
 
 
@@ -1786,7 +1796,7 @@ TODO:
             docversion="${version.number}"
             docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
             sourcepath="${src.dir}"
-            classpathref="docs.compiler.path"
+            classpathref="docs.library.build.path"
             addparams="${scalac.args.all}"
             docRootContent="${src.dir}/library/rootdoc.txt"
             implicits="on"
@@ -1845,16 +1855,16 @@ TODO:
         <mkdir dir="${build.dir}/manmaker/classes"/>
         <scalac
           destdir="${build.dir}/manmaker/classes"
-          classpathref="docs.compiler.path"
+          classpathref="manual.build.path"
           srcdir="${src.dir}/manual"
           includes="**/*.scala"
-          addparams="${scalac.args.all}"/>
+          addparams="${scalac.args.all} -language:implicitConversions"/>
         <mkdir dir="${build-docs.dir}/manual/man/man1"/>
         <mkdir dir="${build-docs.dir}/manual/html"/>
         <mkdir dir="${build-docs.dir}/manual/genman/man1"/>
         <taskdef name="genman"
                  classname="scala.tools.docutil.ManMaker"
-                 classpathref="manual.classpath"/>
+                 classpathref="manual.build.path"/>
         <genman command="fsc, scala, scalac, scaladoc, scalap"
                 htmlout="${build-docs.dir}/manual/html"
                 manout="${build-docs.dir}/manual/genman"/>
-- 
cgit v1.2.3


From 5a487ef176ddd3877373b99019b9e134ad920353 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 21 Oct 2013 11:20:04 -0700
Subject: Generate scaladoc for each subproject.

---
 build.xml | 131 ++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 63 insertions(+), 68 deletions(-)

diff --git a/build.xml b/build.xml
index c369c99fe6..7b6912b1f6 100755
--- a/build.xml
+++ b/build.xml
@@ -750,13 +750,14 @@ TODO:
     </path>
 
     <!-- DOCS -->
-    <path id="docs.compiler.build.path">             <path refid="quick.compiler.build.path"/> </path>
-    <path id="docs.scalap.build.path">               <path refid="quick.scalap.build.path"/>   </path>
-    <path id="docs.continuations-plugin.build.path"> <path refid="quick.plugins.build.path"/>  </path>
-    <path id="docs.library.build.path">
-      <path refid="quick.reflect.build.path"/>
-      <path refid="quick.actors.build.path"/>
-    </path>
+    <path id="docs.library.build.path">               <path refid="quick.library.build.path"/>  </path>
+    <path id="docs.reflect.build.path">               <path refid="quick.reflect.build.path"/>  </path>
+    <path id="docs.compiler.build.path">              <path refid="quick.compiler.build.path"/> </path>
+    <path id="docs.scalap.build.path">                <path refid="quick.scalap.build.path"/>   </path>
+    <path id="docs.continuations-plugin.build.path">  <path refid="quick.plugins.build.path"/>  </path>
+    <path id="docs.continuations-library.build.path"> <path refid="quick.plugins.build.path"/>  </path>
+    <path id="docs.actors.build.path">                <path refid="quick.actors.build.path"/>   </path>
+    <path id="docs.swing.build.path">                 <path refid="quick.swing.build.path"/>    </path>
 
     <!-- run-time classpath for scaladoc: should be resolved through maven once it's an actual module -->
     <path id="scaladoc.classpath">
@@ -1187,19 +1188,22 @@ TODO:
     <attribute name="dir" default="@{project}"/>
     <attribute name="title"/>
     <attribute name="docroot" default="NOT SET"/>
+    <attribute name="skipPackages" default=""/>
+
     <element name="includes" implicit="true"/>
 
     <sequential>
-      <staged-uptodate stage="docs" project="@{project}">
-        <check><srcfiles dir="${src.dir}/@{dir}"/></check>
-        <do>
-          <if><not><isset property="docs.skip"/></not><then>
+      <if><not><isset property="docs.skip"/></not><then>
+        <staged-uptodate stage="docs" project="@{project}">
+          <check><srcfiles dir="${src.dir}/@{dir}"/></check>
+          <do>
             <stopwatch name="docs.@{project}.timer"/>
             <mkdir dir="${build-docs.dir}/@{project}"/>
             <if><equals arg1="@{docroot}" arg2="NOT SET"/><then>
               <scaladoc
                 destdir="${build-docs.dir}/@{project}"
                 doctitle="@{title}"
+                docfooter="epfl"
                 docversion="${version.number}"
                 sourcepath="${src.dir}"
                 classpathref="docs.@{project}.build.path"
@@ -1209,13 +1213,16 @@ TODO:
                 diagrams="on"
                 groups="on"
                 rawOutput="${scaladoc.raw.output}"
-                noPrefixes="${scaladoc.no.prefixes}">
+                noPrefixes="${scaladoc.no.prefixes}"
+                docUncompilable="${src.dir}/library-aux"
+                skipPackages="@{skipPackages}">
                 <includes/>
               </scaladoc>
             </then><else>
               <scaladoc
                 destdir="${build-docs.dir}/@{project}"
                 doctitle="@{title}"
+                docfooter="epfl"
                 docversion="${version.number}"
                 sourcepath="${src.dir}"
                 classpathref="docs.@{project}.build.path"
@@ -1226,14 +1233,16 @@ TODO:
                 diagrams="on"
                 groups="on"
                 rawOutput="${scaladoc.raw.output}"
-                noPrefixes="${scaladoc.no.prefixes}">
+                noPrefixes="${scaladoc.no.prefixes}"
+                docUncompilable="${src.dir}/library-aux"
+                skipPackages="@{skipPackages}">
                 <includes/>
               </scaladoc>
             </else></if>
             <stopwatch name="docs.@{project}.timer" action="total"/>
-          </then></if>
-        </do>
-      </staged-uptodate>
+          </do>
+        </staged-uptodate>
+      </then></if>
     </sequential>
   </macrodef>
 
@@ -1777,57 +1786,25 @@ TODO:
   </target>
 
   <target name="docs.lib" depends="docs.start">
-    <staged-uptodate stage="docs" project="library">
-      <check><srcfiles dir="${src.dir}">
-        <include name="library/**"/>
-        <include name="swing/**"/>
-        <include name="actors/**"/>
-        <include name="reflect/**"/>
-        <include name="continuations/library/**"/>
-      </srcfiles></check>
-      <do>
-        <stopwatch name="docs.lib.timer"/>
-        <mkdir dir="${build-docs.dir}/library"/>
-        <if><not><isset property="docs.skip"/></not><then>
-          <!-- last three attributes not supported by staged-docs: -->
-          <scaladoc
-            destdir="${build-docs.dir}/library"
-            doctitle="Scala Standard Library API (Scaladoc)"
-            docversion="${version.number}"
-            docsourceurl="${scaladoc.url}€{FILE_PATH}.scala#L1"
-            sourcepath="${src.dir}"
-            classpathref="docs.library.build.path"
-            addparams="${scalac.args.all}"
-            docRootContent="${src.dir}/library/rootdoc.txt"
-            implicits="on"
-            diagrams="on"
-            groups="on"
-            rawOutput="${scaladoc.raw.output}"
-            noPrefixes="${scaladoc.no.prefixes}"
-            docfooter="epfl"
-            docUncompilable="${src.dir}/library-aux"
-            skipPackages="scala.reflect.macros.internal:scala.reflect.internal:scala.reflect.io:scala.concurrent.impl">
-            <src>
-              <files includes="${src.dir}/actors"/>
-              <files includes="${src.dir}/library"/>
-              <files includes="${src.dir}/reflect"/>
-              <files includes="${src.dir}/swing"/>
-              <files includes="${src.dir}/continuations/library"/>
-            </src>
-            <include name="**/*.scala"/>
-            <exclude name="reflect/Code.scala"/>
-            <exclude name="reflect/Print.scala"/>
-            <exclude name="reflect/Symbol.scala"/>
-            <exclude name="reflect/Tree.scala"/>
-            <exclude name="reflect/Type.scala"/>
-            <exclude name="runtime/*$.scala"/>
-            <exclude name="runtime/ScalaRunTime.scala"/>
-            <exclude name="runtime/StringAdd.scala"/>
-          </scaladoc>
-        </then></if>
-        <stopwatch name="docs.lib.timer" action="total"/>
-      </do>
-    </staged-uptodate>
+    <staged-docs project="library" title="Scala Standard Library" docroot="rootdoc.txt"
+                 skipPackages="scala.concurrent.impl">
+      <include name="**/*.scala"/>
+      <exclude name="runtime/*$.scala"/>
+      <exclude name="runtime/ScalaRunTime.scala"/>
+      <exclude name="runtime/StringAdd.scala"/>
+    </staged-docs>
+  </target>
+
+  <target name="docs.reflect" depends="docs.start">
+    <staged-docs project="reflect" title="Scala Reflection Library"
+                 skipPackages="scala.reflect.macros.internal:scala.reflect.internal:scala.reflect.io">
+      <include name="**/*.scala"/>
+      <exclude name="reflect/Code.scala"/>
+      <exclude name="reflect/Print.scala"/>
+      <exclude name="reflect/Symbol.scala"/>
+      <exclude name="reflect/Tree.scala"/>
+      <exclude name="reflect/Type.scala"/>
+    </staged-docs>
   </target>
 
   <target name="docs.comp" depends="docs.start">
@@ -1836,6 +1813,18 @@ TODO:
     </staged-docs>
   </target>
 
+  <target name="docs.actors" depends="docs.start">
+    <staged-docs project="actors" title="Scala Actors Library">
+      <include name="**/*.scala"/>
+    </staged-docs>
+  </target>
+
+  <target name="docs.swing" depends="docs.start">
+    <staged-docs project="swing" title="Scala Swing Library">
+      <include name="**/*.scala"/>
+    </staged-docs>
+  </target>
+
   <target name="docs.scalap" depends="docs.start">
     <staged-docs project="scalap" title="Scalap">
       <include name="**/*.scala"/>
@@ -1848,6 +1837,12 @@ TODO:
     </staged-docs>
   </target>
 
+  <target name="docs.continuations-library" depends="docs.start">
+    <staged-docs project="continuations-library" dir="continuations/library" title="Delimited Continuations Library">
+      <include name="**/*.scala"/>
+    </staged-docs>
+  </target>
+
   <target name="docs.man" depends="docs.start">
     <staged-uptodate stage="docs" project="manual">
       <check><srcfiles dir="${src.dir}/manual"/></check>
@@ -1885,7 +1880,7 @@ TODO:
     </staged-uptodate>
   </target>
 
-  <target name="docs.done" depends="docs.comp, docs.man, docs.lib, docs.scalap, docs.continuations-plugin"/>
+  <target name="docs.done" depends="docs.lib, docs.reflect, docs.comp, docs.man, docs.actors, docs.swing, docs.scalap, docs.continuations-plugin, docs.continuations-library"/>
 
 <!-- ===========================================================================
                                   DISTRIBUTION
-- 
cgit v1.2.3


From cd779d1460b7461636b1bb88b786415f8aa8d12c Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 21 Oct 2013 12:05:50 -0700
Subject: Continuations plugin gets its own osgi source bundle.

---
 build.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index 7b6912b1f6..c675fc3b17 100755
--- a/build.xml
+++ b/build.xml
@@ -2012,10 +2012,10 @@ TODO:
       <fileset dir="${src.dir}/library"/>
       <fileset dir="${src.dir}/continuations/library"/>
     </osgi.source.bundle>
-    <osgi.source.bundle destfile="${dist.dir}/src/scala-actors-src.jar"
-                        symbolicName="org.scala-lang.scala-actors"
-                        bundleName="Scala Actors Sources">
-      <fileset dir="${src.dir}/actors"/>
+    <osgi.source.bundle destfile="${dist.dir}/src/scala-reflect-src.jar"
+                        symbolicName="org.scala-lang.scala-reflect"
+                        bundleName="Scala Reflect Sources">
+      <fileset dir="${src.dir}/reflect"/>
     </osgi.source.bundle>
     <osgi.source.bundle destfile="${dist.dir}/src/scala-compiler-src.jar"
                         symbolicName="org.scala-lang.scala-compiler"
@@ -2024,6 +2024,16 @@ TODO:
       <fileset dir="${src.dir}/repl"/>
       <fileset dir="${src.dir}/scaladoc"/>
       <fileset dir="${src.dir}/interactive"/>
+    </osgi.source.bundle>
+
+    <osgi.source.bundle destfile="${dist.dir}/src/scala-actors-src.jar"
+                        symbolicName="org.scala-lang.scala-actors"
+                        bundleName="Scala Actors Sources">
+      <fileset dir="${src.dir}/actors"/>
+    </osgi.source.bundle>
+    <osgi.source.bundle destfile="${dist.dir}/src/continuations-src.jar"
+                        symbolicName="org.scala-lang.plugins.continuations"
+                        bundleName="Scala Continuations Plugin Sources">
       <fileset dir="${src.dir}/continuations/plugin"/>
     </osgi.source.bundle>
     <osgi.source.bundle destfile="${dist.dir}/src/scala-swing-src.jar"
@@ -2031,11 +2041,6 @@ TODO:
                         bundleName="Scala Swing Sources">
       <fileset dir="${src.dir}/swing"/>
     </osgi.source.bundle>
-    <osgi.source.bundle destfile="${dist.dir}/src/scala-reflect-src.jar"
-                        symbolicName="org.scala-lang.scala-reflect"
-                        bundleName="Scala Reflect Sources">
-      <fileset dir="${src.dir}/reflect"/>
-    </osgi.source.bundle>
     <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scalap-src.jar"         basedir="${src.dir}/scalap"/>
   </target>
 
-- 
cgit v1.2.3


From a51c7891a4de3d9dc42350ae35e2e8ecdffec683 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 18 Oct 2013 16:57:20 -0700
Subject: Inline src/build/pack.xml into build.xml.

It tended too easily to get out of synch with build.xml.
---
 build.xml          | 243 +++++++++++++++++++++++++++++++++++++++++++++++--
 src/build/pack.xml | 263 -----------------------------------------------------
 2 files changed, 233 insertions(+), 273 deletions(-)
 delete mode 100644 src/build/pack.xml

diff --git a/build.xml b/build.xml
index c675fc3b17..471457be15 100755
--- a/build.xml
+++ b/build.xml
@@ -28,7 +28,10 @@ scalacArgs examples:
   "-Dscalac.args=\"-Yrangepos\" -Dpartest.scalac_opts=\"-Yrangepos\""
 
 targets exercised:
-  locker.done build-opt nightly test.suite test.continuations.suite test.scaladoc
+  distpack-maven-opt nightly locker.done build-opt test.suite test.continuations.suite test.scaladoc
+
+NOTE: after distpack-maven-opt, it is expected there's a build file in dists/maven/latest that defines targets deploy and deploy.local
+TODO: get rid of this separate step
 -->
 
 <!-- To use Zinc with the ant build:
@@ -65,20 +68,15 @@ TODO:
   <target name="fastdist-opt"    description="Optimized version of fastdist.">    <optimized name="fastdist"/></target>
 
   <!-- packaging -->
-  <target name="distpack" depends="dist.done, docs.done">
-    <ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inheritrefs="yes"/></target>
-
-  <target name="distpack-maven" depends="dist.done, docs.done">
-    <ant antfile="${src.dir}/build/pack.xml" target="pack-maven.done" inheritall="yes" inheritrefs="yes"/></target>
+  <target name="distpack" depends="pack-archives.done, pack-maven.done"/>
+  <target name="distpack-maven" depends="pack-maven.done"/>
 
   <target name="distpack-opt" description="Builds an optimised distribution."> <optimized name="distpack"/></target>
   <target name="distpack-maven-opt" description="Builds an optimised maven distribution."><optimized name="distpack-maven"/></target>
 
-  <target name="all.done" depends="dist.done, test.done"/>
+  <target name="all.done" depends="test.done, distpack"/>
 
-  <!-- must use depends for all.done, not antcall: need the properties defined in there (dist.dir) -->
-  <target name="nightly-nopt" depends="all.done, docs.done">
-    <ant antfile="${src.dir}/build/pack.xml" target="pack-all.done" inheritall="yes" inheritrefs="yes"/></target>
+  <target name="nightly-nopt" depends="all.done"/>
   <target name="nightly"><optimized name="nightly-nopt"/></target>
 
   <target name="nightly.checkall">
@@ -2054,6 +2052,231 @@ TODO:
 
   <target name="dist.done" depends="dist.doc, dist.man, dist.src, dist.partial"/>
 
+<!-- ===========================================================================
+MAIN DISTRIBUTION PACKAGING
+============================================================================ -->
+
+  <target name="pack-archives.start" depends="dist.done, docs.done">
+    <mkdir dir="${dists.dir}/archives"/>
+  </target>
+
+  <target name="pack-archives.tar" depends="pack-archives.start">
+    <tar destfile="${dists.dir}/archives/${dist.name}.tar"
+         compression="none" longfile="gnu">
+      <tarfileset dir="${dist.dir}" prefix="${dist.name}" includes="bin/**" mode="755"/>
+      <tarfileset dir="${dist.dir}" prefix="${dist.name}" excludes="bin/**"/>
+    </tar>
+    <gzip src="${dists.dir}/archives/${dist.name}.tar" destfile="${dists.dir}/archives/${dist.name}.tgz"/>
+    <if>
+      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
+      <then>
+        <exec executable="xz" failifexecutionfails="false">
+          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}.tar"/>
+        </exec>
+        <move file="${dists.dir}/archives/${dist.name}.tar.xz" tofile="${dists.dir}/archives/${dist.name}.txz" failonerror="false"/>
+      </then>
+    </if>
+    <delete file="${dists.dir}/archives/${dist.name}.tar" />
+    <checksum fileext=".md5">
+      <fileset dir="${dists.dir}/archives">
+        <include name="${dist.name}.t?z"/>
+      </fileset>
+    </checksum>
+  </target>
+
+  <target name="pack-archives.zip" depends="pack-archives.tar">
+    <zip destfile="${dists.dir}/archives/${dist.name}.zip">
+      <zipfileset prefix="${dist.name}" dir="${dist.dir}"/>
+    </zip>
+    <checksum file="${dists.dir}/archives/${dist.name}.zip" fileext=".md5"/>
+  </target>
+
+  <target name="pack-devel-docs.tar" depends="pack-archives.zip" unless="docs.skip">
+    <tar destfile="${dists.dir}/archives/${dist.name}-devel-docs.tar"
+         compression="none" longfile="gnu">
+      <tarfileset dir="${dist.dir}/doc/scala-devel-docs" prefix="${dist.name}-devel-docs"/>
+    </tar>
+    <gzip src="${dists.dir}/archives/${dist.name}-devel-docs.tar" destfile="${dists.dir}/archives/${dist.name}-devel-docs.tgz"/>
+    <if>
+      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
+      <then>
+        <exec executable="xz" failifexecutionfails="false">
+          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}-devel-docs.tar"/>
+        </exec>
+        <move file="${dists.dir}/archives/${dist.name}-devel-docs.tar.xz" tofile="${dists.dir}/archives/${dist.name}-devel-docs.txz" failonerror="false"/>
+      </then>
+    </if>
+    <delete file="${dists.dir}/archives/${dist.name}-devel-docs.tar" />
+    <checksum fileext=".md5">
+      <fileset dir="${dists.dir}/archives">
+        <include name="${dist.name}-devel-docs.t?z"/>
+      </fileset>
+    </checksum>
+  </target>
+
+  <target name="pack-archives.src" depends="pack-devel-docs.tar">
+    <tar destfile="${dists.dir}/archives/${dist.name}-sources.tar"
+         compression="none" longfile="gnu">
+      <tarfileset dir="${basedir}" prefix="${dist.name}-sources">
+        <exclude name="bin/**"/>
+        <exclude name="build/**"/>
+        <exclude name="debian/**"/>
+        <exclude name="dists/**"/>
+        <exclude name="logs/**"/>
+        <exclude name="sandbox/**"/>
+        <exclude name="test/partest"/>
+        <exclude name=".git"/>
+      </tarfileset>
+      <tarfileset dir="${basedir}" prefix="${dist.name}-sources" filemode="755">
+        <include name="test/partest"/>
+      </tarfileset>
+    </tar>
+    <gzip src="${dists.dir}/archives/${dist.name}-sources.tar" destfile="${dists.dir}/archives/${dist.name}-sources.tgz"/>
+    <if>
+      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
+      <then>
+        <exec executable="xz" failifexecutionfails="false">
+          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}-sources.tar"/>
+        </exec>
+        <move file="${dists.dir}/archives/${dist.name}-sources.tar.xz" tofile="${dists.dir}/archives/${dist.name}-sources.txz" failonerror="false"/>
+      </then>
+    </if>
+    <delete file="${dists.dir}/archives/${dist.name}-sources.tar" />
+    <checksum fileext=".md5">
+      <fileset dir="${dists.dir}/archives">
+        <include name="${dist.name}-sources.t?z"/>
+      </fileset>
+    </checksum>
+  </target>
+
+  <target name="pack-archives.latest.unix" depends="pack-archives.src" unless="os.win">
+    <!-- be sure to use a relative symlink to make the distribution portable,
+        `resource` is relative to directory of `link` -->
+    <symlink link="${dists.dir}/archives/scala-latest-sources.tgz"
+             resource="scala-${version.number}-sources.tgz"
+             overwrite="true"/>
+  </target>
+
+  <target name="pack-archives.latest.win" depends="pack-archives.src" if="os.win">
+    <copy tofile="${dists.dir}/archives/scala-latest-sources.tgz" overwrite="true">
+      <fileset dir="${dists.dir}/archives">
+         <include name="scala-${version.number}-sources.tgz"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="pack-archives.done" depends="pack-archives.src, pack-archives.latest.win, pack-archives.latest.unix"/>
+
+  <target name="pack-maven.start" depends="dist.done, docs.done">
+    <mkdir dir="${dists.dir}/maven/${version.number}"/>
+  </target>
+
+  <target name="pack-maven.libs" depends="pack-maven.start">
+    <macrodef name="mvn-copy-lib">
+      <attribute name="mvn.artifact.name"/>
+      <sequential>
+        <mkdir dir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}"/>
+        <copy verbose="true" overwrite="true" todir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}">
+          <fileset dir="${dist.dir}/lib/">
+            <filename name="@{mvn.artifact.name}.jar"/>
+          </fileset>
+          <fileset dir="${src.dir}/build/maven/">
+            <filename name="@{mvn.artifact.name}-pom.xml"/>
+          </fileset>
+          <fileset dir="${dist.dir}/src/">
+            <filename name="@{mvn.artifact.name}-src.jar"/>
+          </fileset>
+        </copy>
+      </sequential>
+    </macrodef>
+    <mvn-copy-lib mvn.artifact.name="scala-library"/>
+    <mvn-copy-lib mvn.artifact.name="scala-reflect"/>
+    <mvn-copy-lib mvn.artifact.name="scala-compiler"/>
+    <mvn-copy-lib mvn.artifact.name="scala-swing"/>
+    <mvn-copy-lib mvn.artifact.name="scala-actors"/>
+    <mvn-copy-lib mvn.artifact.name="scalap"/>
+  </target>
+
+  <target name="pack-maven.plugins" depends="pack-maven.start">
+    <macrodef name="mvn-copy-plugin">
+      <attribute name="mvn.artifact.name"/>
+      <sequential>
+        <mkdir dir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}"/>
+        <copy todir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}" overwrite="true">
+          <fileset dir="${dist.dir}/misc/scala-devel/plugins/">
+            <filename name="@{mvn.artifact.name}.jar"/>
+          </fileset>
+          <fileset dir="${src.dir}/build/maven/plugins/">
+            <filename name="@{mvn.artifact.name}-pom.xml"/>
+          </fileset>
+        </copy>
+      </sequential>
+    </macrodef>
+    <mvn-copy-plugin mvn.artifact.name="continuations"/>
+  </target>
+
+  <target name="pack-maven.srcs" depends="pack-maven.libs">
+    <!-- Add missing src jars. -->
+    <!-- Continuations plugin -->
+    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-src.jar"
+         basedir="${src.dir}/continuations/plugin">
+      <include name="**/*"/>
+    </jar>
+  </target>
+
+  <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins" unless="docs.skip">
+    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"
+         basedir="${build-docs.dir}/library">
+      <include name="**/*"/>
+    </jar>
+    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar"
+         basedir="${build-docs.dir}/compiler">
+      <include name="**/*"/>
+    </jar>
+    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scalap/scalap-docs.jar"
+         basedir="${build-docs.dir}/scalap">
+      <include name="**/*"/>
+    </jar>
+    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-docs.jar"
+         basedir="${build-docs.dir}/continuations-plugin">
+      <include name="**/*"/>
+    </jar>
+
+    <!-- TODO - Scala swing and actors should maybe have thier own jar, but creating it is SLOW. -->
+    <copy tofile="${dists.dir}/maven/${version.number}/scala-swing/scala-swing-docs.jar"
+          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
+    <copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-docs.jar"
+          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
+    <copy tofile="${dists.dir}/maven/${version.number}/scala-reflect/scala-reflect-docs.jar"
+          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
+  </target>
+
+  <target name="pack-maven.latest.unix" depends="pack-maven.docs" unless="os.win">
+    <symlink link="${dists.dir}/maven/latest"
+             resource="${version.number}"
+             overwrite="true"/>
+  </target>
+
+  <target name="pack-maven.latest.win" depends="pack-maven.docs" if="os.win">
+    <copy todir="${dists.dir}/maven/latest" overwrite="true">
+      <fileset dir="${dists.dir}/maven/${version.number}"/>
+    </copy>
+  </target>
+
+  <target name="pack-maven.scripts" depends="pack-maven.latest.unix,pack-maven.latest.win,pack-maven.srcs">
+    <copy todir="${dists.dir}/maven/${version.number}"
+          file="${lib-ant.dir}/ant-contrib.jar" overwrite="true"/>
+    <copy todir="${dists.dir}/maven/${version.number}"
+          file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" overwrite="true"/>
+    <copy tofile="${dists.dir}/maven/${version.number}/build.xml"
+          file="${src.dir}/build/maven/maven-deploy.xml"/>
+    <!-- export properties for use when deploying -->
+    <echoproperties destfile="${dists.dir}/maven/${version.number}/build.properties"/>
+  </target>
+
+  <target name="pack-maven.done" depends="pack-maven.scripts"/>
+
+
 
 <!-- ===========================================================================
                                   STABLE REFERENCE (STARR)
diff --git a/src/build/pack.xml b/src/build/pack.xml
deleted file mode 100644
index 4c5ba228fc..0000000000
--- a/src/build/pack.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="sabbus-pack">
-
-  <description>
-    SuperSabbus extension for packaging a distribution. THIS FILE IS NOT STAND-ALONE AND SHOULD ONLY BE USED THROUGH ENTRY POINTS IN SUPERSABBUS.
-  </description>
-  
-<!-- ===========================================================================
-PROPERTIES
-============================================================================ -->
-  
-  <!-- the maven stuff requires version.major, version.minor and version.patch properties.
-       the "get-scala-revision" script only returns "version.number" -->
-  <property file="${basedir}/build.number"/>
-  <!-- also need to know scala binary version and versions for xml and parsers -->
-  <property file="${basedir}/versions.properties"/>
-
-  
-<!-- ===========================================================================
-MAIN DISTRIBUTION PACKAGING
-============================================================================ -->
-  
-  <target name="pack-archives.start">
-    <mkdir dir="${dists.dir}/archives"/>
-  </target>
-  
-  <target name="pack-archives.tar" depends="pack-archives.start">
-    <tar destfile="${dists.dir}/archives/${dist.name}.tar"
-         compression="none" longfile="gnu">
-      <tarfileset dir="${dist.dir}" prefix="${dist.name}" includes="bin/**" mode="755"/>
-      <tarfileset dir="${dist.dir}" prefix="${dist.name}" excludes="bin/**"/>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}.tar" destfile="${dists.dir}/archives/${dist.name}.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}.tar.xz" tofile="${dists.dir}/archives/${dist.name}.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}.tar" />
-    <checksum fileext=".md5">
-      <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}.t?z"/>
-      </fileset>
-    </checksum>
-  </target>
-  
-  <target name="pack-archives.zip" depends="pack-archives.tar">
-    <zip destfile="${dists.dir}/archives/${dist.name}.zip">
-      <zipfileset prefix="${dist.name}" dir="${dist.dir}"/>
-    </zip>
-    <checksum file="${dists.dir}/archives/${dist.name}.zip" fileext=".md5"/>
-  </target>
-
-  <target name="pack-devel-docs.tar" depends="pack-archives.zip" unless="docs.skip">
-    <tar destfile="${dists.dir}/archives/${dist.name}-devel-docs.tar"
-         compression="none" longfile="gnu">
-      <tarfileset dir="${dist.dir}/doc/scala-devel-docs" prefix="${dist.name}-devel-docs"/>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}-devel-docs.tar" destfile="${dists.dir}/archives/${dist.name}-devel-docs.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}-devel-docs.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}-devel-docs.tar.xz" tofile="${dists.dir}/archives/${dist.name}-devel-docs.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}-devel-docs.tar" />
-    <checksum fileext=".md5">
-      <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}-devel-docs.t?z"/>
-      </fileset>
-    </checksum>
-  </target>
-  
-  <target name="pack-archives.src" depends="pack-devel-docs.tar">
-    <tar destfile="${dists.dir}/archives/${dist.name}-sources.tar"
-         compression="none" longfile="gnu">
-      <tarfileset dir="${basedir}" prefix="${dist.name}-sources">
-        <exclude name="bin/**"/>
-        <exclude name="build/**"/>
-        <exclude name="debian/**"/>
-        <exclude name="dists/**"/>
-        <exclude name="logs/**"/>
-        <exclude name="sandbox/**"/>
-        <exclude name="test/partest"/>
-        <exclude name=".git"/>
-      </tarfileset>
-      <tarfileset dir="${basedir}" prefix="${dist.name}-sources" filemode="755">
-        <include name="test/partest"/>
-      </tarfileset>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}-sources.tar" destfile="${dists.dir}/archives/${dist.name}-sources.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}-sources.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}-sources.tar.xz" tofile="${dists.dir}/archives/${dist.name}-sources.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}-sources.tar" />
-    <checksum fileext=".md5">
-      <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}-sources.t?z"/>
-      </fileset>
-    </checksum>
-  </target>
-
-  <target name="pack-archives.latest.unix" depends="pack-archives.src" unless="os.win">
-    <!-- be sure to use a relative symlink to make the distribution portable,
-        `resource` is relative to directory of `link` -->
-    <symlink link="${dists.dir}/archives/scala-latest-sources.tgz"
-             resource="scala-${version.number}-sources.tgz"
-             overwrite="true"/>
-  </target>
-
-  <target name="pack-archives.latest.win" depends="pack-archives.src" if="os.win">
-    <copy tofile="${dists.dir}/archives/scala-latest-sources.tgz" overwrite="true">
-      <fileset dir="${dists.dir}/archives">
-         <include name="scala-${version.number}-sources.tgz"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <target name="pack-archives.done" depends="pack-archives.src, pack-archives.latest.win, pack-archives.latest.unix"/>
-
-  <target name="pack-maven.start">
-    <mkdir dir="${dists.dir}/maven/${version.number}"/>
-  </target>
-
-  <target name="pack-maven.libs" depends="pack-maven.start">
-    <macrodef name="mvn-copy-lib">
-      <attribute name="mvn.artifact.name"/>
-      <sequential>
-        <mkdir dir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}"/>
-        <copy verbose="true" overwrite="true" todir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}">
-          <fileset dir="${dist.dir}/lib/">
-            <filename name="@{mvn.artifact.name}.jar"/>
-          </fileset>
-          <fileset dir="${src.dir}/build/maven/">
-            <filename name="@{mvn.artifact.name}-pom.xml"/>
-          </fileset>
-          <fileset dir="${dist.dir}/src/">
-            <filename name="@{mvn.artifact.name}-src.jar"/>
-          </fileset>
-        </copy>
-      </sequential>
-    </macrodef>
-    <mvn-copy-lib mvn.artifact.name="scala-library"/>
-    <mvn-copy-lib mvn.artifact.name="scala-reflect"/>
-    <mvn-copy-lib mvn.artifact.name="scala-compiler"/>
-    <mvn-copy-lib mvn.artifact.name="scala-swing"/>
-    <mvn-copy-lib mvn.artifact.name="scala-actors"/>
-    <mvn-copy-lib mvn.artifact.name="scalap"/>
-  </target>
-
-  <target name="pack-maven.plugins" depends="pack-maven.start">
-    <macrodef name="mvn-copy-plugin">
-      <attribute name="mvn.artifact.name"/>
-      <sequential>
-        <mkdir dir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}"/>
-        <copy todir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}" overwrite="true">
-          <fileset dir="${dist.dir}/misc/scala-devel/plugins/">
-            <filename name="@{mvn.artifact.name}.jar"/>
-          </fileset>
-          <fileset dir="${src.dir}/build/maven/plugins/">
-            <filename name="@{mvn.artifact.name}-pom.xml"/>
-          </fileset>
-        </copy>
-      </sequential>
-    </macrodef>
-    <mvn-copy-plugin mvn.artifact.name="continuations"/>
-  </target>
-
-  <target name="pack-maven.srcs" depends="pack-maven.libs">
-    <!-- Add missing src jars. -->
-    <!-- Continuations plugin -->
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-src.jar"
-         basedir="${src.dir}/continuations/plugin">
-      <include name="**/*"/>
-    </jar>
-  </target>
-
-  <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins" unless="docs.skip">
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"
-         basedir="${build-docs.dir}/library">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar"
-         basedir="${build-docs.dir}/compiler">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scalap/scalap-docs.jar"
-         basedir="${build-docs.dir}/scalap">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-docs.jar"
-         basedir="${build-docs.dir}/continuations-plugin">
-      <include name="**/*"/>
-    </jar>
-
-    <!-- TODO - Scala swing and actors should maybe have thier own jar, but creating it is SLOW. -->
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-swing/scala-swing-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-reflect/scala-reflect-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-  </target>
-
-  <target name="pack-maven.latest.unix" depends="pack-maven.docs" unless="os.win">
-    <symlink link="${dists.dir}/maven/latest"
-             resource="${version.number}"
-             overwrite="true"/>
-  </target>
-
-  <target name="pack-maven.latest.win" depends="pack-maven.docs" if="os.win">
-    <copy todir="${dists.dir}/maven/latest" overwrite="true">
-      <fileset dir="${dists.dir}/maven/${version.number}"/>
-    </copy>
-  </target>
-
-  <target name="pack-maven.scripts" depends="pack-maven.latest.unix,pack-maven.latest.win,pack-maven.srcs">
-    <copy todir="${dists.dir}/maven/${version.number}"
-          file="${lib-ant.dir}/ant-contrib.jar" overwrite="true"/>
-    <copy todir="${dists.dir}/maven/${version.number}"
-          file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/build.xml"
-          file="${src.dir}/build/maven/maven-deploy.xml"/>
-    <!-- export properties for use when deploying -->
-    <echoproperties destfile="${dists.dir}/maven/${version.number}/build.properties"/>
-  </target>
-
-  <target name="pack-maven.done" depends="pack-maven.scripts"/>
-
-<!-- ===========================================================================
-MISCELLANEOUS
-============================================================================ -->
-
-  <target name="pack-all.done" depends="pack-archives.done, pack-maven.done"/>
-
-<!-- ===========================================================================
-MISCELLANEOUS
-============================================================================ -->
-
-  <target name="graph.init">
-    <echo message="${basedir}/lib/ant/vizant.jar"/>
-    <taskdef name="vizant" classname="vizant.Vizant" classpath="${basedir}/../../lib/ant/vizant.jar"/>
-  </target>
-  
-  <target name="graph.pack" depends="graph.init">
-    <vizant antfile="${ant.file}" outfile="${ant.project.name}.dot"/>
-  </target>
-  
-</project>
-- 
cgit v1.2.3


From c1055be507e42cc6cfe9e114a24a397d15030377 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 18 Oct 2013 17:50:33 -0700
Subject: Simplify packing, align maven-deploy and pack-maven.

---
 build.xml | 274 +++++++++++++++++++++++---------------------------------------
 1 file changed, 101 insertions(+), 173 deletions(-)

diff --git a/build.xml b/build.xml
index 471457be15..7c35fc0fe7 100755
--- a/build.xml
+++ b/build.xml
@@ -2056,67 +2056,48 @@ TODO:
 MAIN DISTRIBUTION PACKAGING
 ============================================================================ -->
 
-  <target name="pack-archives.start" depends="dist.done, docs.done">
+  <target name="pack-archives.done" depends="dist.done, docs.done">
+    <macrodef name="tarz">
+      <attribute name="name"     description="The tar file name (without extension)."/>
+      <element   name="file-sets"    description="A sequence of fileset elements to be included in the tar balls." optional="false" implicit="true"/>
+
+      <sequential>
+        <tar destfile="@{name}.tar" compression="none" longfile="gnu">
+          <file-sets/>
+        </tar>
+        <gzip src="@{name}.tar" destfile="@{name}.tgz"/>
+        <if>
+          <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
+          <then>
+            <exec executable="xz" failifexecutionfails="false">
+              <arg line="-k -9e -S .xz @{name}.tar"/>
+            </exec>
+            <move file="@{name}.tar.xz" tofile="@{name}.txz" failonerror="false"/>
+          </then>
+        </if>
+        <delete file="@{name}.tar" />
+      </sequential>
+    </macrodef>
+
     <mkdir dir="${dists.dir}/archives"/>
-  </target>
+    <property name="archive-base" value="${dists.dir}/archives/${dist.name}"/>
 
-  <target name="pack-archives.tar" depends="pack-archives.start">
-    <tar destfile="${dists.dir}/archives/${dist.name}.tar"
-         compression="none" longfile="gnu">
+    <tarz name="${archive-base}">
       <tarfileset dir="${dist.dir}" prefix="${dist.name}" includes="bin/**" mode="755"/>
       <tarfileset dir="${dist.dir}" prefix="${dist.name}" excludes="bin/**"/>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}.tar" destfile="${dists.dir}/archives/${dist.name}.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}.tar.xz" tofile="${dists.dir}/archives/${dist.name}.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}.tar" />
-    <checksum fileext=".md5">
-      <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}.t?z"/>
-      </fileset>
-    </checksum>
-  </target>
+    </tarz>
 
-  <target name="pack-archives.zip" depends="pack-archives.tar">
-    <zip destfile="${dists.dir}/archives/${dist.name}.zip">
+    <zip destfile="${archive-base}.zip">
       <zipfileset prefix="${dist.name}" dir="${dist.dir}"/>
     </zip>
-    <checksum file="${dists.dir}/archives/${dist.name}.zip" fileext=".md5"/>
-  </target>
 
-  <target name="pack-devel-docs.tar" depends="pack-archives.zip" unless="docs.skip">
-    <tar destfile="${dists.dir}/archives/${dist.name}-devel-docs.tar"
-         compression="none" longfile="gnu">
-      <tarfileset dir="${dist.dir}/doc/scala-devel-docs" prefix="${dist.name}-devel-docs"/>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}-devel-docs.tar" destfile="${dists.dir}/archives/${dist.name}-devel-docs.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}-devel-docs.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}-devel-docs.tar.xz" tofile="${dists.dir}/archives/${dist.name}-devel-docs.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}-devel-docs.tar" />
-    <checksum fileext=".md5">
-      <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}-devel-docs.t?z"/>
-      </fileset>
-    </checksum>
-  </target>
+    <if><not><isset property="docs.skip"/></not><then>
+      <tarz name="${archive-base}-devel-docs">
+        <tarfileset dir="${dist.dir}/doc/scala-devel-docs" prefix="${dist.name}-devel-docs"/>
+      </tarz>
+    </then></if>
 
-  <target name="pack-archives.src" depends="pack-devel-docs.tar">
-    <tar destfile="${dists.dir}/archives/${dist.name}-sources.tar"
-         compression="none" longfile="gnu">
+    <tarz name="${archive-base}-sources">
       <tarfileset dir="${basedir}" prefix="${dist.name}-sources">
         <exclude name="bin/**"/>
         <exclude name="build/**"/>
@@ -2130,152 +2111,99 @@ MAIN DISTRIBUTION PACKAGING
       <tarfileset dir="${basedir}" prefix="${dist.name}-sources" filemode="755">
         <include name="test/partest"/>
       </tarfileset>
-    </tar>
-    <gzip src="${dists.dir}/archives/${dist.name}-sources.tar" destfile="${dists.dir}/archives/${dist.name}-sources.tgz"/>
-    <if>
-      <not><equals arg1="${archives.skipxz}" arg2="true" /></not>
-      <then>
-        <exec executable="xz" failifexecutionfails="false">
-          <arg line="-k -9e -S .xz ${dists.dir}/archives/${dist.name}-sources.tar"/>
-        </exec>
-        <move file="${dists.dir}/archives/${dist.name}-sources.tar.xz" tofile="${dists.dir}/archives/${dist.name}-sources.txz" failonerror="false"/>
-      </then>
-    </if>
-    <delete file="${dists.dir}/archives/${dist.name}-sources.tar" />
+    </tarz>
+
+    <!-- checksum everything -->
     <checksum fileext=".md5">
       <fileset dir="${dists.dir}/archives">
-        <include name="${dist.name}-sources.t?z"/>
+        <include name="${dist.name}*"/>
       </fileset>
     </checksum>
-  </target>
-
-  <target name="pack-archives.latest.unix" depends="pack-archives.src" unless="os.win">
-    <!-- be sure to use a relative symlink to make the distribution portable,
-        `resource` is relative to directory of `link` -->
-    <symlink link="${dists.dir}/archives/scala-latest-sources.tgz"
-             resource="scala-${version.number}-sources.tgz"
-             overwrite="true"/>
-  </target>
-
-  <target name="pack-archives.latest.win" depends="pack-archives.src" if="os.win">
-    <copy tofile="${dists.dir}/archives/scala-latest-sources.tgz" overwrite="true">
-      <fileset dir="${dists.dir}/archives">
-         <include name="scala-${version.number}-sources.tgz"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="pack-archives.done" depends="pack-archives.src, pack-archives.latest.win, pack-archives.latest.unix"/>
 
-  <target name="pack-maven.start" depends="dist.done, docs.done">
-    <mkdir dir="${dists.dir}/maven/${version.number}"/>
-  </target>
-
-  <target name="pack-maven.libs" depends="pack-maven.start">
-    <macrodef name="mvn-copy-lib">
-      <attribute name="mvn.artifact.name"/>
+    <!-- UNUSED: create 'scala-latest-sources.tgz' alias (or copy, on windows)
+         we use github's source download feature
+    <if><isset property="os.win"/><then>
+      <copy tofile="${dists.dir}/archives/scala-latest-sources.tgz" overwrite="true">
+        <fileset dir="${dists.dir}/archives">
+           <include name="scala-${version.number}-sources.tgz"/>
+        </fileset>
+      </copy>
+    </then><else>
+      (be sure to use a relative symlink to make the distribution portable,
+          `resource` is relative to directory of `link`)
+      <symlink link="${dists.dir}/archives/scala-latest-sources.tgz"
+               resource="scala-${version.number}-sources.tgz"
+               overwrite="true"/>
+    </else></if> -->
+  </target>
+
+  <target name="pack-maven.done" depends="dist.done, docs.done">
+    <property name="maven-base" value="${dists.dir}/maven/${version.number}"/>
+
+    <macrodef name="mvn-package">
+      <attribute name="dir"    default=""                 />
+      <attribute name="clsdir" default="${dist.dir}/lib/" />
+      <attribute name="project"                           />
+      <attribute name="name"   default="scala-@{project}"/>
       <sequential>
-        <mkdir dir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}"/>
-        <copy verbose="true" overwrite="true" todir="${dists.dir}/maven/${version.number}/@{mvn.artifact.name}">
-          <fileset dir="${dist.dir}/lib/">
-            <filename name="@{mvn.artifact.name}.jar"/>
+        <local name="path"/> <property name="path" value="${maven-base}/@{dir}@{name}"/>
+
+        <mkdir dir="${path}"/>
+        <copy verbose="true" overwrite="true" todir="${path}">
+          <fileset dir="@{clsdir}">
+            <filename name="@{name}.jar"/>
           </fileset>
-          <fileset dir="${src.dir}/build/maven/">
-            <filename name="@{mvn.artifact.name}-pom.xml"/>
+          <fileset dir="${src.dir}/build/maven/@{dir}">
+            <filename name="@{name}-pom.xml"/>
           </fileset>
           <fileset dir="${dist.dir}/src/">
-            <filename name="@{mvn.artifact.name}-src.jar"/>
+            <filename name="@{name}-src.jar"/>
           </fileset>
         </copy>
-      </sequential>
-    </macrodef>
-    <mvn-copy-lib mvn.artifact.name="scala-library"/>
-    <mvn-copy-lib mvn.artifact.name="scala-reflect"/>
-    <mvn-copy-lib mvn.artifact.name="scala-compiler"/>
-    <mvn-copy-lib mvn.artifact.name="scala-swing"/>
-    <mvn-copy-lib mvn.artifact.name="scala-actors"/>
-    <mvn-copy-lib mvn.artifact.name="scalap"/>
-  </target>
 
-  <target name="pack-maven.plugins" depends="pack-maven.start">
-    <macrodef name="mvn-copy-plugin">
-      <attribute name="mvn.artifact.name"/>
-      <sequential>
-        <mkdir dir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}"/>
-        <copy todir="${dists.dir}/maven/${version.number}/plugins/@{mvn.artifact.name}" overwrite="true">
-          <fileset dir="${dist.dir}/misc/scala-devel/plugins/">
-            <filename name="@{mvn.artifact.name}.jar"/>
-          </fileset>
-          <fileset dir="${src.dir}/build/maven/plugins/">
-            <filename name="@{mvn.artifact.name}-pom.xml"/>
-          </fileset>
-        </copy>
+        <if><not><isset property="docs.skip"/></not><then>
+          <jar whenmanifestonly="fail" destfile="${path}/@{name}-docs.jar"
+               basedir="${build-docs.dir}/@{project}">
+            <include name="**/*"/>
+          </jar>
+        </then></if>
       </sequential>
     </macrodef>
-    <mvn-copy-plugin mvn.artifact.name="continuations"/>
-  </target>
 
-  <target name="pack-maven.srcs" depends="pack-maven.libs">
-    <!-- Add missing src jars. -->
-    <!-- Continuations plugin -->
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-src.jar"
-         basedir="${src.dir}/continuations/plugin">
-      <include name="**/*"/>
-    </jar>
-  </target>
 
-  <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins" unless="docs.skip">
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"
-         basedir="${build-docs.dir}/library">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar"
-         basedir="${build-docs.dir}/compiler">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scalap/scalap-docs.jar"
-         basedir="${build-docs.dir}/scalap">
-      <include name="**/*"/>
-    </jar>
-    <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-docs.jar"
-         basedir="${build-docs.dir}/continuations-plugin">
-      <include name="**/*"/>
-    </jar>
+    <mkdir dir="${maven-base}"/>
 
-    <!-- TODO - Scala swing and actors should maybe have thier own jar, but creating it is SLOW. -->
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-swing/scala-swing-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/scala-reflect/scala-reflect-docs.jar"
-          file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" overwrite="true"/>
-  </target>
+    <mvn-package project="library"/>
+    <mvn-package project="reflect"/>
+    <mvn-package project="compiler"/>
 
-  <target name="pack-maven.latest.unix" depends="pack-maven.docs" unless="os.win">
-    <symlink link="${dists.dir}/maven/latest"
-             resource="${version.number}"
-             overwrite="true"/>
-  </target>
+    <mvn-package project="swing"/>
+    <mvn-package project="actors"/>
+    <mvn-package project="scalap" name="scalap"/>
+    <mvn-package project="continuations-plugin" name="continuations" dir="plugins/" clsdir="${dist.dir}/misc/scala-devel/plugins/"/>
 
-  <target name="pack-maven.latest.win" depends="pack-maven.docs" if="os.win">
-    <copy todir="${dists.dir}/maven/latest" overwrite="true">
-      <fileset dir="${dists.dir}/maven/${version.number}"/>
-    </copy>
-  </target>
 
-  <target name="pack-maven.scripts" depends="pack-maven.latest.unix,pack-maven.latest.win,pack-maven.srcs">
-    <copy todir="${dists.dir}/maven/${version.number}"
+    <!-- Create dists/maven/latest alias and copy maven-deploy ant build there. -->
+    <if><isset property="os.win"/><then>
+      <copy todir="${dists.dir}/maven/latest" overwrite="true">
+        <fileset dir="${maven-base}"/>
+      </copy>
+    </then><else>
+      <symlink link="${dists.dir}/maven/latest"
+               resource="${version.number}"
+               overwrite="true"/>
+    </else></if>
+    <!-- copy build file and its dependencies -->
+    <copy todir="${maven-base}"
           file="${lib-ant.dir}/ant-contrib.jar" overwrite="true"/>
-    <copy todir="${dists.dir}/maven/${version.number}"
+    <copy todir="${maven-base}"
           file="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" overwrite="true"/>
-    <copy tofile="${dists.dir}/maven/${version.number}/build.xml"
+    <copy tofile="${maven-base}/build.xml"
           file="${src.dir}/build/maven/maven-deploy.xml"/>
     <!-- export properties for use when deploying -->
-    <echoproperties destfile="${dists.dir}/maven/${version.number}/build.properties"/>
-  </target>
-
-  <target name="pack-maven.done" depends="pack-maven.scripts"/>
+    <echoproperties destfile="${maven-base}/build.properties"/>
 
+  </target>
 
 
 <!-- ===========================================================================
-- 
cgit v1.2.3


From 9c46b97414a1d4a64bf076fdf2ff009f010c33bc Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 21 Oct 2013 12:07:59 -0700
Subject: Support publishing to maven from main build

Publish to maven with `ant publish.local`,
`ant publish`, or `ant publish.signed`.

For now, we must keep copying `src/build/maven/maven-deploy.xml`
to `dists/maven/latest.build.xml`, along with its dependencies,
as it's used by jenkins jobs and PR validation.

TODO: `inline src/build/maven/maven-deploy.xml` into `build.xml`.
---
 build.xml                        |  28 ++++++
 src/build/maven/maven-deploy.xml | 201 ++++++++++++++++++++-------------------
 2 files changed, 129 insertions(+), 100 deletions(-)

diff --git a/build.xml b/build.xml
index 7c35fc0fe7..6c20d8d9ff 100755
--- a/build.xml
+++ b/build.xml
@@ -4,6 +4,7 @@
   xmlns:artifact="urn:maven-artifact-ant"
   xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors">
   <include file="test/build-partest.xml" as="partest"/>
+  <include file="src/build/maven/maven-deploy.xml" as="maven-deploy"/>
 
   <description>
 SuperSabbus for Scala core, builds the scala library and compiler. It can also package it as a simple distribution, tests it for stable bootstrapping and against the Scala test suite.
@@ -2202,10 +2203,37 @@ MAIN DISTRIBUTION PACKAGING
           file="${src.dir}/build/maven/maven-deploy.xml"/>
     <!-- export properties for use when deploying -->
     <echoproperties destfile="${maven-base}/build.properties"/>
+  </target>
+
+  <!-- keep these properties out of ${maven-base}/build.properties, dumped in pack-maven.done -->
+  <target name="init.maven" depends="init">
+    <property name="remote.snapshot.repository" value="https://oss.sonatype.org/content/repositories/snapshots" />
+    <property name="remote.release.repository"  value="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
+
+    <property name="local.snapshot.repository" value="${user.home}/.m2/repository" />
+    <property name="local.release.repository"  value="${user.home}/.m2/repository" />
 
+    <property name="repository.credentials.id" value="sonatype-nexus" />
+    <property name="settings.file" value="${user.home}/.m2/settings.xml" />
+
+    <if><contains string="${maven.version.number}" substring="-SNAPSHOT"/><then>
+      <property name="remote.repository" value="${remote.snapshot.repository}"/>
+      <property name="local.repository"  value="${local.snapshot.repository}"/>
+    </then><else>
+      <property name="remote.repository" value="${remote.release.repository}"/>
+      <property name="local.repository"  value="${local.release.repository}"/>
+    </else></if>
   </target>
 
 
+<!-- ===========================================================================
+                                  MAVEN PUBLISHING
+============================================================================ -->
+  <!-- TODO: inline maven-deploy.xml here and remove it, once jenkins jobs no longer rely on it -->
+  <target name="publish"        depends="pack-maven.done, init.maven" description="Publishes unsigned artifacts to the maven repo.">       <deploy dir="${maven-base}/"/> </target>
+  <target name="publish.local"  depends="pack-maven.done, init.maven" description="Publishes unsigned artifacts to the local maven repo."> <deploy dir="${maven-base}/" local="true"/> </target>
+  <target name="publish.signed" depends="pack-maven.done, init.maven" description="Publishes signed artifacts to the remote maven repo.">  <deploy dir="${maven-base}/" signed="true"/> </target>
+
 <!-- ===========================================================================
                                   STABLE REFERENCE (STARR)
 ============================================================================ -->
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index fbd6d4cd51..3607aa5e5e 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -6,10 +6,107 @@
     SuperSabbus extension for deploying a distribution to Maven. THIS FILE IS MEANT TO BE RUN STANDALONE IN THE MAVEN "distpack" DIRECTORY
   </description>
 
-  <target name="boot">
+  <macrodef name="deploy-one">
+    <attribute name="dir" default=""/>
+    <attribute name="name" />
+    <attribute name="version" />
+    <attribute name="local" />
+    <attribute name="signed" />
+
+    <sequential>
+      <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/>
+
+      <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
+
+      <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
+        <filterset>
+          <filter token="VERSION" value="@{version}" />
+          <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" />
+          <filter token="XML_VERSION" value="${scala-xml.version.number}" />
+          <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
+          <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" />
+          <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" />
+          <filter token="JLINE_VERSION" value="${jline.version}" />
+        </filterset>
+      </copy>
+      <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
+
+      <if><equals arg1="@{signed}" arg2="false"/><then>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <artifact:deploy file="${path}.jar" settingsFile="${settings.file}">
+            <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
+            <artifact:pom refid="@{name}.pom" />
+            <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+            <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
+          </artifact:deploy>
+        </then><else>
+          <if><isset property="docs.skip"/><then>
+             <artifact:install file="${path}.jar">
+               <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+               <artifact:pom refid="@{name}.pom" />
+               <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+             </artifact:install>
+          </then>
+          <else>
+            <artifact:install file="${path}.jar">
+              <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+              <artifact:pom refid="@{name}.pom" />
+              <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+              <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
+            </artifact:install>
+          </else>
+          </if>
+        </else></if>
+      </then><else>
+        <local name="repo"/>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <property name="repo" value="${remote.repository}"/>
+        </then><else>
+          <property name="repo" value="${local.repository}"/>
+        </else></if>
+        <artifact:mvn>
+          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+          <arg value="-Durl=${repo}" />
+          <arg value="-DrepositoryId=${repository.credentials.id}" />
+          <arg value="-DpomFile=${path}-pom-filtered.xml" />
+          <arg value=   "-Dfile=${path}.jar" />
+          <arg value="-Dsources=${path}-src.jar" />
+          <arg value="-Djavadoc=${path}-docs.jar" />
+          <arg value="-Pgpg" />
+          <arg value="-Dgpg.useagent=true" />
+        </artifact:mvn>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy">
+    <attribute name="dir"    default=""/>
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <deploy-one dir="@{dir}"          name="scala-actors"   version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-library"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-reflect"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-swing"    version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scalap"         version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}plugins/" name="continuations"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+    </sequential>
+  </macrodef>
+
+  <target name="boot.maven">
     <!-- Pull in properties from build -->
     <property file="build.properties" />
+    <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute -->
+    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="ant-contrib.jar"/>
+
+    <!-- Add our maven ant tasks -->
+    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" />
+    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+  </target>
 
+  <target name="init.maven" depends="boot.maven">
     <property name="remote.snapshot.repository" value="https://oss.sonatype.org/content/repositories/snapshots" />
     <property name="remote.release.repository"  value="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
 
@@ -19,15 +116,6 @@
     <property name="repository.credentials.id" value="sonatype-nexus" />
     <property name="settings.file" value="${user.home}/.m2/settings.xml" />
 
-    <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute -->
-    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="ant-contrib.jar"/>
-
-    <!-- Add our maven ant tasks -->
-    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" />
-    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-  </target>
-
-  <target name="init" depends="boot">
     <if><contains string="${maven.version.number}" substring="-SNAPSHOT"/><then>
       <property name="remote.repository" value="${remote.snapshot.repository}"/>
       <property name="local.repository"  value="${local.snapshot.repository}"/>
@@ -39,96 +127,9 @@
     <echo>Using server[${repository.credentials.id}] for maven repository credentials.
        Please make sure that your ~/.m2/settings.xml has the needed username/password for this server id
     </echo>
-
-    <macrodef name="deploy-one">
-      <attribute name="dir" default=""/>
-      <attribute name="name" />
-      <attribute name="version" />
-      <attribute name="local" />
-      <attribute name="signed" />
-
-      <sequential>
-        <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/>
-
-        <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
-
-        <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
-          <filterset>
-            <filter token="VERSION" value="@{version}" />
-            <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" />
-            <filter token="XML_VERSION" value="${scala-xml.version.number}" />
-            <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
-            <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" />
-            <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" />
-            <filter token="JLINE_VERSION" value="${jline.version}" />
-          </filterset>
-        </copy>
-        <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
-
-        <if><equals arg1="@{signed}" arg2="false"/><then>
-          <if><equals arg1="@{local}" arg2="false"/><then>
-            <artifact:deploy file="${path}.jar" settingsFile="${settings.file}">
-              <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
-              <artifact:pom refid="@{name}.pom" />
-              <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-              <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
-            </artifact:deploy>
-          </then><else>
-            <if><isset property="docs.skip"/><then>
-               <artifact:install file="${path}.jar">
-                 <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-                 <artifact:pom refid="@{name}.pom" />
-                 <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-               </artifact:install>
-            </then>
-            <else>
-              <artifact:install file="${path}.jar">
-                <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-                <artifact:pom refid="@{name}.pom" />
-                <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-              </artifact:install>
-            </else>
-            </if>
-          </else></if>
-        </then><else>
-          <local name="repo"/>
-          <if><equals arg1="@{local}" arg2="false"/><then>
-            <property name="repo" value="${remote.repository}"/>
-          </then><else>
-            <property name="repo" value="${local.repository}"/>
-          </else></if>
-          <artifact:mvn>
-            <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
-            <arg value="-Durl=${repo}" />
-            <arg value="-DrepositoryId=${repository.credentials.id}" />
-            <arg value="-DpomFile=${path}-pom-filtered.xml" />
-            <arg value=   "-Dfile=${path}.jar" />
-            <arg value="-Dsources=${path}-src.jar" />
-            <arg value="-Djavadoc=${path}-docs.jar" />
-            <arg value="-Pgpg" />
-            <arg value="-Dgpg.useagent=true" />
-          </artifact:mvn>
-        </else></if>
-      </sequential>
-    </macrodef>
-
-    <macrodef name="deploy">
-      <attribute name="local"  default="false"/>
-      <attribute name="signed" default="false"/>
-
-      <sequential>
-        <deploy-one                name="scala-actors"   version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-library"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-reflect"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-swing"    version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scalap"         version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one dir="plugins/" name="continuations"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      </sequential>
-    </macrodef>
   </target>
 
-  <target name="deploy"        depends="init" description="Deploys unsigned artifacts to the maven repo.">       <deploy/> </target>
-  <target name="deploy.local"  depends="init" description="Deploys unsigned artifacts to the local maven repo."> <deploy local="true"/> </target>
-  <target name="deploy.signed" depends="init" description="Deploys signed artifacts to the remote maven repo.">  <deploy signed="true"/> </target>
+  <target name="deploy"        depends="init.maven" description="Deploys unsigned artifacts to the maven repo.">       <deploy/> </target>
+  <target name="deploy.local"  depends="init.maven" description="Deploys unsigned artifacts to the local maven repo."> <deploy local="true"/> </target>
+  <target name="deploy.signed" depends="init.maven" description="Deploys signed artifacts to the remote maven repo.">  <deploy signed="true"/> </target>
 </project>
-- 
cgit v1.2.3


From a3238122835efdfe5759b29da3feae30a09fcd91 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 21 Oct 2013 15:19:45 -0700
Subject: Towards minimal build for publishing core to maven.

Use `unless` attribute in targets so that `docs.skip` influences dependency graph.

Create `scaladoc` task in `pack.core` so that we don't need `pack.done`
for publishing the core.

Move source bundle creation from `dist.src` to `osgi.core`/`osgi.done`.

Split dependencies of maven publishing into core/all variants:
`osgi.core` creates osgi bundles for just lib/reflect/comp.
---
 build.xml                                  | 490 +++++++++++++++--------------
 src/build/bnd/scala-parser-combinators.bnd |   2 +-
 src/build/bnd/scala-xml.bnd                |   2 +-
 3 files changed, 253 insertions(+), 241 deletions(-)

diff --git a/build.xml b/build.xml
index 6c20d8d9ff..dd70f0b798 100755
--- a/build.xml
+++ b/build.xml
@@ -1192,56 +1192,54 @@ TODO:
     <element name="includes" implicit="true"/>
 
     <sequential>
-      <if><not><isset property="docs.skip"/></not><then>
-        <staged-uptodate stage="docs" project="@{project}">
-          <check><srcfiles dir="${src.dir}/@{dir}"/></check>
-          <do>
-            <stopwatch name="docs.@{project}.timer"/>
-            <mkdir dir="${build-docs.dir}/@{project}"/>
-            <if><equals arg1="@{docroot}" arg2="NOT SET"/><then>
-              <scaladoc
-                destdir="${build-docs.dir}/@{project}"
-                doctitle="@{title}"
-                docfooter="epfl"
-                docversion="${version.number}"
-                sourcepath="${src.dir}"
-                classpathref="docs.@{project}.build.path"
-                srcdir="${src.dir}/@{dir}"
-                addparams="${scalac.args.all}"
-                implicits="on"
-                diagrams="on"
-                groups="on"
-                rawOutput="${scaladoc.raw.output}"
-                noPrefixes="${scaladoc.no.prefixes}"
-                docUncompilable="${src.dir}/library-aux"
-                skipPackages="@{skipPackages}">
-                <includes/>
-              </scaladoc>
-            </then><else>
-              <scaladoc
-                destdir="${build-docs.dir}/@{project}"
-                doctitle="@{title}"
-                docfooter="epfl"
-                docversion="${version.number}"
-                sourcepath="${src.dir}"
-                classpathref="docs.@{project}.build.path"
-                srcdir="${src.dir}/@{dir}"
-                docRootContent="${src.dir}/@{project}/@{docroot}"
-                addparams="${scalac.args.all}"
-                implicits="on"
-                diagrams="on"
-                groups="on"
-                rawOutput="${scaladoc.raw.output}"
-                noPrefixes="${scaladoc.no.prefixes}"
-                docUncompilable="${src.dir}/library-aux"
-                skipPackages="@{skipPackages}">
-                <includes/>
-              </scaladoc>
-            </else></if>
-            <stopwatch name="docs.@{project}.timer" action="total"/>
-          </do>
-        </staged-uptodate>
-      </then></if>
+      <staged-uptodate stage="docs" project="@{project}">
+        <check><srcfiles dir="${src.dir}/@{dir}"/></check>
+        <do>
+          <stopwatch name="docs.@{project}.timer"/>
+          <mkdir dir="${build-docs.dir}/@{project}"/>
+          <if><equals arg1="@{docroot}" arg2="NOT SET"/><then>
+            <scaladoc
+              destdir="${build-docs.dir}/@{project}"
+              doctitle="@{title}"
+              docfooter="epfl"
+              docversion="${version.number}"
+              sourcepath="${src.dir}"
+              classpathref="docs.@{project}.build.path"
+              srcdir="${src.dir}/@{dir}"
+              addparams="${scalac.args.all}"
+              implicits="on"
+              diagrams="on"
+              groups="on"
+              rawOutput="${scaladoc.raw.output}"
+              noPrefixes="${scaladoc.no.prefixes}"
+              docUncompilable="${src.dir}/library-aux"
+              skipPackages="@{skipPackages}">
+              <includes/>
+            </scaladoc>
+          </then><else>
+            <scaladoc
+              destdir="${build-docs.dir}/@{project}"
+              doctitle="@{title}"
+              docfooter="epfl"
+              docversion="${version.number}"
+              sourcepath="${src.dir}"
+              classpathref="docs.@{project}.build.path"
+              srcdir="${src.dir}/@{dir}"
+              docRootContent="${src.dir}/@{project}/@{docroot}"
+              addparams="${scalac.args.all}"
+              implicits="on"
+              diagrams="on"
+              groups="on"
+              rawOutput="${scaladoc.raw.output}"
+              noPrefixes="${scaladoc.no.prefixes}"
+              docUncompilable="${src.dir}/library-aux"
+              skipPackages="@{skipPackages}">
+              <includes/>
+            </scaladoc>
+          </else></if>
+          <stopwatch name="docs.@{project}.timer" action="total"/>
+        </do>
+      </staged-uptodate>
     </sequential>
   </macrodef>
 
@@ -1387,7 +1385,12 @@ TODO:
 
   <target name="pack.scalap"     depends="quick.scalap">     <staged-pack project="scalap"     targetjar="scalap.jar"/> </target>
 
-  <target name="pack.bin" depends="pack.comp, pack.lib, pack.actors, pack.plugins, pack.reflect, pack.scalap, pack.swing, pack.partest-extras">
+  <target name="pack.core" depends="pack.reflect, pack.comp, pack.lib">
+    <!-- can't define task until we built jars for the core -->
+    <taskdef resource="scala/tools/ant/antlib.xml" classpathref="scaladoc.classpath"/>
+  </target>
+
+  <target name="pack.bin" depends="pack.core, pack.actors, pack.plugins, pack.scalap, pack.swing, pack.partest-extras">
     <copy todir="${build-pack.dir}/lib">
       <path refid="external-modules-nocore" />
       <mapper type="flatten" />
@@ -1397,10 +1400,7 @@ TODO:
   </target>
 
   <!-- depend on quick.done so quick.bin is run when pack.done is -->
-  <target name="pack.done" depends="quick.done, pack.bin">
-    <!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks -->
-    <taskdef resource="scala/tools/ant/antlib.xml" classpathref="scaladoc.classpath"/>
-  </target>
+  <target name="pack.done" depends="quick.done, pack.bin"/>
 
 
 <!-- ===========================================================================
@@ -1442,73 +1442,153 @@ TODO:
 <!-- ===========================================================================
                                   OSGi Artifacts
 ============================================================================ -->
-  <target name="osgi.done" depends="pack.done">
-    <mkdir dir="${build-osgi.dir}"/>
+  <!-- simplify fixing pom versions -->
+  <macrodef name="make-bundle">
+    <attribute name="name" />
+    <attribute name="version" />
+    <attribute name="jar" default="${build-pack.dir}/lib/@{name}.jar" />
+    <sequential>
+      <copy file="${src.dir}/build/bnd/@{name}.bnd" tofile="${build-osgi.dir}/@{name}.bnd" overwrite="true">
+        <filterset>
+          <filter token="VERSION" value="@{version}" />
+        </filterset>
+      </copy>
+      <bnd classpath="@{jar}"
+           eclipse="false"
+           failok="false"
+           exceptions="true"
+           files="${build-osgi.dir}/@{name}.bnd"
+           output="${build-osgi.dir}"/>
+    </sequential>
+  </macrodef>
+  <macrodef name="make-plugin-bundle">
+    <attribute name="name" />
+    <attribute name="version" />
+    <sequential>
+      <copy file="${src.dir}/build/bnd/@{name}.bnd" tofile="${build-osgi.dir}/@{name}.bnd" overwrite="true">
+        <filterset>
+          <filter token="VERSION" value="@{version}" />
+        </filterset>
+      </copy>
+      <bnd classpath="${build-pack.dir}/misc/scala-devel/plugins/@{name}.jar"
+           eclipse="false"
+           failok="false"
+           exceptions="true"
+           files="${build-osgi.dir}/@{name}.bnd"
+           output="${build-osgi.dir}"/>
+    </sequential>
+  </macrodef>
 
-    <!-- simplify fixing pom versions -->
-    <macrodef name="make-bundle">
-      <attribute name="name" />
-      <attribute name="version" />
-      <attribute name="jar" default="${build-pack.dir}/lib/@{name}.jar" />
-      <sequential>
-        <copy file="${src.dir}/build/bnd/@{name}.bnd" tofile="${build-osgi.dir}/@{name}.bnd" overwrite="true">
-          <filterset>
-            <filter token="VERSION" value="@{version}" />
-          </filterset>
-        </copy>
-        <bnd classpath="@{jar}"
-             eclipse="false"
-             failok="false"
-             exceptions="true"
-             files="${build-osgi.dir}/@{name}.bnd"
-             output="${build-osgi.dir}"/>
-      </sequential>
-    </macrodef>
-    <macrodef name="make-plugin-bundle">
-      <attribute name="name" />
-      <attribute name="version" />
-      <sequential>
-        <copy file="${src.dir}/build/bnd/@{name}.bnd" tofile="${build-osgi.dir}/@{name}.bnd" overwrite="true">
-          <filterset>
-            <filter token="VERSION" value="@{version}" />
-          </filterset>
-        </copy>
-        <bnd classpath="${build-pack.dir}/misc/scala-devel/plugins/@{name}.jar"
-             eclipse="false"
-             failok="false"
-             exceptions="true"
-             files="${build-osgi.dir}/@{name}.bnd"
-             output="${build-osgi.dir}"/>
-      </sequential>
-    </macrodef>
+  <!--
+       A jar-like task that creates an OSGi source bundle. It adds the required MANIFEST.MF headers that allow
+       Eclipse to match sources with the corresponding binaries.
+  -->
+  <macrodef name="osgi.source.bundle">
+    <attribute name="destfile"     description="The jar file name"/>
+    <attribute name="symbolicName" description="The original bundle symbolic name (without .source at the end)"/>
+    <attribute name="bundleName"   description="A value for Bundle-Name, usually a textual description"/>
+    <element   name="file-sets"    description="A sequence of fileset elements to be included in the jar" optional="true" implicit="true"/>
 
-    <uptodate property="osgi.bundles.available" targetfile="${build-osgi.dir}/bundles.complete">
+    <sequential>
+      <jar whenmanifestonly="fail" destfile="@{destFile}">
+        <file-sets/>
+        <manifest>
+          <attribute name="Manifest-Version" value="1.0"/>
+          <attribute name="Bundle-Name" value="@{bundleName}"/>
+          <attribute name="Bundle-SymbolicName" value="@{symbolicName}.source"/>
+          <attribute name="Bundle-Version" value="${osgi.version.number}"/>
+          <attribute name="Eclipse-SourceBundle" value="@{symbolicName};version=&quot;${osgi.version.number}&quot;;roots:=&quot;.&quot;" />
+        </manifest>
+      </jar>
+    </sequential>
+  </macrodef>
+
+
+  <target name="osgi.core" depends="pack.core">
+    <mkdir dir="${build-osgi.dir}"/>
+
+    <uptodate property="osgi.bundles.available" targetfile="${build-osgi.dir}/bundles.core.complete">
       <srcfiles dir="${basedir}">
         <include name="build.xml"/>
         <include name="src/build/bnd/*.bnd"/>
-        <include name="${build-pack.dir}/lib/*.jar"/>
-      </srcfiles>
-      <srcfiles dir="${build-pack.dir}">
-        <include name="**/*"/>
+        <include name="${build-pack.dir}/lib/scala-library.jar"/>
+        <include name="${build-pack.dir}/lib/scala-reflect.jar"/>
+        <include name="${build-pack.dir}/lib/scala-compiler.jar"/>
       </srcfiles>
-      <srcfiles file="${build-pack.dir}/lib/*.jar"/>
     </uptodate>
 
     <if><not><isset property="osgi.bundles.available"/></not><then>
-      <stopwatch name="osgi.bundle.timer"/>
+      <stopwatch name="osgi.core.timer"/>
       <make-bundle name="scala-library" version="${osgi.version.number}" />
-      <make-bundle name="scala-actors" version="${osgi.version.number}" />
-      <make-bundle name="scala-parser-combinators" version="${osgi.version.number}" jar="${scala-parser-combinators}"/>
       <make-bundle name="scala-reflect" version="${osgi.version.number}" />
       <make-bundle name="scala-compiler" version="${osgi.version.number}" />
+
+      <osgi.source.bundle destfile="${build-osgi.dir}/scala-library-src.jar"
+                          symbolicName="org.scala-lang.scala-library"
+                          bundleName="Scala Library Sources">
+        <fileset dir="${src.dir}/library"/>
+        <fileset dir="${src.dir}/continuations/library"/>
+      </osgi.source.bundle>
+      <osgi.source.bundle destfile="${build-osgi.dir}/scala-reflect-src.jar"
+                          symbolicName="org.scala-lang.scala-reflect"
+                          bundleName="Scala Reflect Sources">
+        <fileset dir="${src.dir}/reflect"/>
+      </osgi.source.bundle>
+      <osgi.source.bundle destfile="${build-osgi.dir}/scala-compiler-src.jar"
+                          symbolicName="org.scala-lang.scala-compiler"
+                          bundleName="Scala Compiler Sources">
+        <fileset dir="${src.dir}/compiler"/>
+        <fileset dir="${src.dir}/repl"/>
+        <fileset dir="${src.dir}/scaladoc"/>
+        <fileset dir="${src.dir}/interactive"/>
+      </osgi.source.bundle>
+      <touch file="${build-osgi.dir}/bundles.core.complete" verbose="no"/>
+      <stopwatch name="osgi.core.timer" action="total"/>
+    </then></if>
+  </target>
+
+  <target name="osgi.done" depends="pack.done, osgi.core">
+    <uptodate property="osgi.bundles.available" targetfile="${build-osgi.dir}/bundles.all.complete">
+      <srcfiles dir="${basedir}">
+        <include name="build.xml"/>
+        <include name="src/build/bnd/*.bnd"/>
+        <include name="${build-pack.dir}/lib/scala-actors.jar"/>
+        <include name="${scala-parser-combinators}"/>
+        <include name="${build-pack.dir}/misc/scala-devel/plugins/continuations.jar"/>
+        <include name="${scala-xml}"/>
+        <include name="${build-pack.dir}/lib/scala-swing.jar"/>
+      </srcfiles>
+    </uptodate>
+
+    <if><not><isset property="osgi.bundles.available"/></not><then>
+      <stopwatch name="osgi.all.timer"/>
+      <make-bundle name="scala-actors" version="${osgi.version.number}" />
+      <make-bundle name="scala-parser-combinators" version="${osgi.version.number}" jar="${scala-parser-combinators}"/>
       <make-plugin-bundle name="continuations" version="${osgi.version.number}" />
       <make-bundle name="scala-xml" version="${osgi.version.number}" jar="${scala-xml}"/>
-      <touch file="${build-osgi.dir}/bundles.complete" verbose="no"/>
 
       <if><isset property="has.java6"/><then>
         <make-bundle name="scala-swing" version="${osgi.version.number}"/></then>
       </if>
-      <stopwatch name="osgi.bundle.timer" action="total"/>
+
+      <osgi.source.bundle destfile="${build-osgi.dir}/scala-actors-src.jar"
+                          symbolicName="org.scala-lang.scala-actors"
+                          bundleName="Scala Actors Sources">
+        <fileset dir="${src.dir}/actors"/>
+      </osgi.source.bundle>
+      <osgi.source.bundle destfile="${build-osgi.dir}/continuations-src.jar"
+                          symbolicName="org.scala-lang.plugins.continuations"
+                          bundleName="Scala Continuations Plugin Sources">
+        <fileset dir="${src.dir}/continuations/plugin"/>
+      </osgi.source.bundle>
+      <osgi.source.bundle destfile="${build-osgi.dir}/scala-swing-src.jar"
+                          symbolicName="org.scala-lang.scala-swing"
+                          bundleName="Scala Swing Sources">
+        <fileset dir="${src.dir}/swing"/>
+      </osgi.source.bundle>
+
+      <touch file="${build-osgi.dir}/bundles.all.complete" verbose="no"/>
+      <stopwatch name="osgi.all.timer" action="total"/>
     </then></if>
   </target>
 
@@ -1763,7 +1843,7 @@ TODO:
 <!-- ===========================================================================
                                   DOCUMENTATION
 ============================================================================ -->
-  <target name="docs.start" depends="pack.done">
+  <target name="docs.start" depends="pack.comp" unless="docs.skip">
     <!-- Set the github commit scaladoc sources point to -->
     <!-- For releases, look for the tag with the same name as the maven version -->
     <condition property="scaladoc.git.commit" value="v${maven.version.number}">
@@ -1784,7 +1864,7 @@ TODO:
     <property name="scaladoc.no.prefixes" value="no"/>
   </target>
 
-  <target name="docs.lib" depends="docs.start">
+  <target name="docs.lib" depends="docs.start" unless="docs.skip">
     <staged-docs project="library" title="Scala Standard Library" docroot="rootdoc.txt"
                  skipPackages="scala.concurrent.impl">
       <include name="**/*.scala"/>
@@ -1794,7 +1874,7 @@ TODO:
     </staged-docs>
   </target>
 
-  <target name="docs.reflect" depends="docs.start">
+  <target name="docs.reflect" depends="docs.start" unless="docs.skip">
     <staged-docs project="reflect" title="Scala Reflection Library"
                  skipPackages="scala.reflect.macros.internal:scala.reflect.internal:scala.reflect.io">
       <include name="**/*.scala"/>
@@ -1806,7 +1886,7 @@ TODO:
     </staged-docs>
   </target>
 
-  <target name="docs.comp" depends="docs.start">
+  <target name="docs.comp" depends="docs.start" unless="docs.skip">
     <staged-docs project="compiler" title="Scala Compiler" docroot="rootdoc.txt">
       <include name="**/*.scala"/>
     </staged-docs>
@@ -1879,54 +1959,59 @@ TODO:
     </staged-uptodate>
   </target>
 
-  <target name="docs.done" depends="docs.lib, docs.reflect, docs.comp, docs.man, docs.actors, docs.swing, docs.scalap, docs.continuations-plugin, docs.continuations-library"/>
+  <target name="docs.core" depends="docs.lib, docs.reflect, docs.comp" unless="docs.skip"/>
+  <target name="docs.done" depends="docs.core, docs.actors, docs.swing, docs.scalap, docs.continuations-plugin, docs.continuations-library" unless="docs.skip"/>
 
 <!-- ===========================================================================
                                   DISTRIBUTION
 ============================================================================ -->
-  <target name="dist.base" depends="pack.done, osgi.done">
+  <target name="dist.base" depends="osgi.done">
     <property name="dist.name" value="scala-${version.number}"/>
     <property name="dist.dir" value="${dists.dir}/${dist.name}"/>
 
     <macrodef name="copy-bundle">
       <attribute name="name" />
+      <attribute name="pkg"    default=""/>
+      <attribute name="lib"    default="lib/"/>
+      <attribute name="srcjar" default="${build-osgi.dir}/@{name}-src.jar"/>
+
       <sequential>
-        <copy file="${build-osgi.dir}/org.scala-lang.@{name}.jar"
-          tofile="${dist.dir}/lib/@{name}.jar" overwrite="true"/>
-      </sequential>
-    </macrodef>
-    <macrodef name="copy-plugin-bundle">
-      <attribute name="name" />
-      <sequential>
-        <copy file="${build-osgi.dir}/org.scala-lang.plugins.@{name}.jar"
-          tofile="${dist.dir}/misc/scala-devel/plugins/@{name}.jar"
-          overwrite="true"/>
+        <copy tofile="${dist.dir}/@{lib}@{name}.jar"   file="${build-osgi.dir}/org.scala-lang.@{pkg}@{name}.jar" overwrite="true"/>
+        <copy tofile="${dist.dir}/src/@{name}-src.jar" file="@{srcjar}" overwrite="true"/>
       </sequential>
     </macrodef>
 
     <mkdir dir="${dist.dir}/lib"/>
-    <copy toDir="${dist.dir}/lib" overwrite="true">
-      <fileset dir="${build-pack.dir}/lib">
-        <include name="scalap.jar"/>
-      </fileset>
-    </copy>
+    <mkdir dir="${dist.dir}/misc/scala-devel/plugins"/>
+    <mkdir dir="${dist.dir}/src"/>
 
-    <!-- TODO -->
     <copy todir="${dist.dir}/lib" overwrite="true">
       <resources refid="repl.fileset"/>
       <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
               from="${repl.deps.versions}" to="flatten"/>
     </copy>
 
-    <mkdir dir="${dist.dir}/bin"/>
-    <!-- TODO - Stop being inefficient and don't copy OSGi bundles overtop other jars. -->
+    <!-- copy classfile jars and source jars from osgi build to dist -->
     <copy-bundle name="scala-library"/>
-    <copy-bundle name="scala-xml"/>
-    <copy-bundle name="scala-parser-combinators"/>
     <copy-bundle name="scala-reflect"/>
+    <copy-bundle name="scala-compiler"/>
+
     <copy-bundle name="scala-swing"/>
     <copy-bundle name="scala-actors"/>
-    <copy-bundle name="scala-compiler"/>
+
+    <copy-bundle pkg="modules." name="scala-xml.jar" srcjar="${scala-xml-sources}"/>
+    <copy-bundle pkg="modules." name="scala-parser-combinators.jar" srcjar="${scala-parser-combinators-sources}"/>
+    <copy-bundle pkg="plugins." name="continuations" lib="misc/scala-devel/plugins/"/>
+
+    <!-- scalap -->
+    <copy toDir="${dist.dir}/lib" overwrite="true">
+      <fileset dir="${build-pack.dir}/lib">
+        <include name="scalap.jar"/>
+      </fileset>
+    </copy>
+    <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scalap-src.jar" basedir="${src.dir}/scalap"/>
+
+    <mkdir dir="${dist.dir}/bin"/>
     <copy toDir="${dist.dir}/bin" overwrite="true">
       <fileset dir="${build-pack.dir}/bin"/>
     </copy>
@@ -1935,8 +2020,6 @@ TODO:
     <chmod perm="ugo+rx" file="${dist.dir}/bin/scaladoc"/>
     <chmod perm="ugo+rx" file="${dist.dir}/bin/fsc"/>
     <chmod perm="ugo+rx" file="${dist.dir}/bin/scalap"/>
-    <mkdir dir="${dist.dir}/misc/scala-devel/plugins"/>
-    <copy-plugin-bundle name="continuations"/>
   </target>
 
   <target name="dist.doc" depends="dist.base, docs.done">
@@ -1967,81 +2050,13 @@ TODO:
           overwrite="true"/>
   </target>
 
-  <target name="dist.man" depends="dist.base">
+  <target name="dist.man" depends="dist.base, docs.man">
     <mkdir dir="${dist.dir}/man"/>
     <copy toDir="${dist.dir}/man" overwrite="true">
       <fileset dir="${build-docs.dir}/manual/man"/>
     </copy>
   </target>
 
-  <!--
-       A jar-like task that creates an OSGi source bundle. It adds the required MANIFEST.MF headers that allow
-       Eclipse to match sources with the corresponding binaries.
-  -->
-  <macrodef name="osgi.source.bundle">
-    <attribute name="destfile"     description="The jar file name"/>
-    <attribute name="symbolicName" description="The original bundle symbolic name (without .source at the end)"/>
-    <attribute name="bundleName"   description="A value for Bundle-Name, usually a textual description"/>
-    <element   name="file-sets"    description="A sequence of fileset elements to be included in the jar" optional="true" implicit="true"/>
-
-    <sequential>
-      <jar whenmanifestonly="fail" destfile="@{destFile}">
-        <file-sets/>
-        <manifest>
-          <attribute name="Manifest-Version" value="1.0"/>
-          <attribute name="Bundle-Name" value="@{bundleName}"/>
-          <attribute name="Bundle-SymbolicName" value="@{symbolicName}.source"/>
-          <attribute name="Bundle-Version" value="${osgi.version.number}"/>
-          <attribute name="Eclipse-SourceBundle" value="@{symbolicName};version=&quot;${osgi.version.number}&quot;;roots:=&quot;.&quot;" />
-        </manifest>
-      </jar>
-    </sequential>
-  </macrodef>
-
-  <target name="dist.src" depends="dist.base">
-    <mkdir dir="${dist.dir}/src"/>
-    <copy toDir="${dist.dir}/src" overwrite="true" flatten="true">
-      <file file="${scala-xml-sources}"/>
-      <file file="${scala-parser-combinators-sources}"/>
-    </copy>
-
-    <osgi.source.bundle destfile="${dist.dir}/src/scala-library-src.jar"
-                        symbolicName="org.scala-lang.scala-library"
-                        bundleName="Scala Library Sources">
-      <fileset dir="${src.dir}/library"/>
-      <fileset dir="${src.dir}/continuations/library"/>
-    </osgi.source.bundle>
-    <osgi.source.bundle destfile="${dist.dir}/src/scala-reflect-src.jar"
-                        symbolicName="org.scala-lang.scala-reflect"
-                        bundleName="Scala Reflect Sources">
-      <fileset dir="${src.dir}/reflect"/>
-    </osgi.source.bundle>
-    <osgi.source.bundle destfile="${dist.dir}/src/scala-compiler-src.jar"
-                        symbolicName="org.scala-lang.scala-compiler"
-                        bundleName="Scala Compiler Sources">
-      <fileset dir="${src.dir}/compiler"/>
-      <fileset dir="${src.dir}/repl"/>
-      <fileset dir="${src.dir}/scaladoc"/>
-      <fileset dir="${src.dir}/interactive"/>
-    </osgi.source.bundle>
-
-    <osgi.source.bundle destfile="${dist.dir}/src/scala-actors-src.jar"
-                        symbolicName="org.scala-lang.scala-actors"
-                        bundleName="Scala Actors Sources">
-      <fileset dir="${src.dir}/actors"/>
-    </osgi.source.bundle>
-    <osgi.source.bundle destfile="${dist.dir}/src/continuations-src.jar"
-                        symbolicName="org.scala-lang.plugins.continuations"
-                        bundleName="Scala Continuations Plugin Sources">
-      <fileset dir="${src.dir}/continuations/plugin"/>
-    </osgi.source.bundle>
-    <osgi.source.bundle destfile="${dist.dir}/src/scala-swing-src.jar"
-                        symbolicName="org.scala-lang.scala-swing"
-                        bundleName="Scala Swing Sources">
-      <fileset dir="${src.dir}/swing"/>
-    </osgi.source.bundle>
-    <jar whenmanifestonly="fail" destfile="${dist.dir}/src/scalap-src.jar"         basedir="${src.dir}/scalap"/>
-  </target>
 
   <target name="dist.partial" depends="dist.base">
     <if><not><os family="windows"/></not><then>
@@ -2051,7 +2066,7 @@ TODO:
     </else></if>
   </target>
 
-  <target name="dist.done" depends="dist.doc, dist.man, dist.src, dist.partial"/>
+  <target name="dist.done" depends="dist.doc, dist.man, dist.partial"/>
 
 <!-- ===========================================================================
 MAIN DISTRIBUTION PACKAGING
@@ -2138,52 +2153,49 @@ MAIN DISTRIBUTION PACKAGING
     </else></if> -->
   </target>
 
-  <target name="pack-maven.done" depends="dist.done, docs.done">
-    <property name="maven-base" value="${dists.dir}/maven/${version.number}"/>
-
-    <macrodef name="mvn-package">
-      <attribute name="dir"    default=""                 />
-      <attribute name="clsdir" default="${dist.dir}/lib/" />
-      <attribute name="project"                           />
-      <attribute name="name"   default="scala-@{project}"/>
-      <sequential>
-        <local name="path"/> <property name="path" value="${maven-base}/@{dir}@{name}"/>
+  <macrodef name="mvn-package">
+    <attribute name="dir"    default=""/>
+    <attribute name="pkg"    default=""/>
+    <attribute name="project"/>
+    <attribute name="name"   default="scala-@{project}"/>
+    <sequential>
+      <local name="path"/> <property name="path" value="${maven-base}/@{dir}@{name}"/>
 
-        <mkdir dir="${path}"/>
-        <copy verbose="true" overwrite="true" todir="${path}">
-          <fileset dir="@{clsdir}">
-            <filename name="@{name}.jar"/>
-          </fileset>
-          <fileset dir="${src.dir}/build/maven/@{dir}">
-            <filename name="@{name}-pom.xml"/>
-          </fileset>
-          <fileset dir="${dist.dir}/src/">
-            <filename name="@{name}-src.jar"/>
-          </fileset>
-        </copy>
-
-        <if><not><isset property="docs.skip"/></not><then>
-          <jar whenmanifestonly="fail" destfile="${path}/@{name}-docs.jar"
-               basedir="${build-docs.dir}/@{project}">
-            <include name="**/*"/>
-          </jar>
-        </then></if>
-      </sequential>
-    </macrodef>
+      <mkdir dir="${path}"/>
+      <copy tofile="${path}/@{name}.jar"     file="${build-osgi.dir}/org.scala-lang.@{pkg}@{name}.jar" overwrite="true"/>
+      <copy tofile="${path}/@{name}-src.jar" file="${build-osgi.dir}/@{name}-src.jar" overwrite="true"/>
+      <copy tofile="${path}/@{name}-pom.xml" file="${src.dir}/build/maven/@{dir}/@{name}-pom.xml" overwrite="true"/>
 
+      <if><not><isset property="docs.skip"/></not><then>
+        <jar basedir="${build-docs.dir}/@{project}" destfile="${path}/@{name}-docs.jar" whenmanifestonly="fail">
+          <include name="**/*"/>
+        </jar>
+      </then></if>
+    </sequential>
+  </macrodef>
 
+  <target name="pack-maven.core" depends="osgi.core, docs.core">
+    <property name="maven-base" value="${dists.dir}/maven/${version.number}"/>
     <mkdir dir="${maven-base}"/>
 
     <mvn-package project="library"/>
     <mvn-package project="reflect"/>
     <mvn-package project="compiler"/>
+  </target>
 
+  <target name="pack-maven.base" depends="pack-maven.core, osgi.done, docs.done">
     <mvn-package project="swing"/>
     <mvn-package project="actors"/>
-    <mvn-package project="scalap" name="scalap"/>
-    <mvn-package project="continuations-plugin" name="continuations" dir="plugins/" clsdir="${dist.dir}/misc/scala-devel/plugins/"/>
+    <mvn-package project="continuations-plugin" name="continuations" dir="plugins/" pkg="plugins."/>
 
+    <!-- don't bother fitting scalap into the mould: it will move out soon -->
+    <copy tofile="${maven-base}/scalap/scalap-pom.xml" file="${src.dir}/build/maven/scalap-pom.xml" overwrite="true"/>
+    <copy tofile="${maven-base}/scalap/scalap.jar" file="${build-pack.dir}/lib/scalap.jar" overwrite="true"/>
+    <jar destfile="${maven-base}/scalap/scalap-src.jar" basedir="${src.dir}/scalap" whenmanifestonly="fail"/>
+    <jar destfile="${maven-base}/scalap/scalap-docs.jar" basedir="${build-docs.dir}/scalap"/>
+  </target>
 
+  <target name="pack-maven.done" depends="pack-maven.base">
     <!-- Create dists/maven/latest alias and copy maven-deploy ant build there. -->
     <if><isset property="os.win"/><then>
       <copy todir="${dists.dir}/maven/latest" overwrite="true">
@@ -2230,9 +2242,9 @@ MAIN DISTRIBUTION PACKAGING
                                   MAVEN PUBLISHING
 ============================================================================ -->
   <!-- TODO: inline maven-deploy.xml here and remove it, once jenkins jobs no longer rely on it -->
-  <target name="publish"        depends="pack-maven.done, init.maven" description="Publishes unsigned artifacts to the maven repo.">       <deploy dir="${maven-base}/"/> </target>
-  <target name="publish.local"  depends="pack-maven.done, init.maven" description="Publishes unsigned artifacts to the local maven repo."> <deploy dir="${maven-base}/" local="true"/> </target>
-  <target name="publish.signed" depends="pack-maven.done, init.maven" description="Publishes signed artifacts to the remote maven repo.">  <deploy dir="${maven-base}/" signed="true"/> </target>
+  <target name="publish"        depends="pack-maven.base, init.maven" description="Publishes unsigned artifacts to the maven repo.">       <deploy dir="${maven-base}/"/> </target>
+  <target name="publish.local"  depends="pack-maven.base, init.maven" description="Publishes unsigned artifacts to the local maven repo."> <deploy dir="${maven-base}/" local="true"/> </target>
+  <target name="publish.signed" depends="pack-maven.base, init.maven" description="Publishes signed artifacts to the remote maven repo.">  <deploy dir="${maven-base}/" signed="true"/> </target>
 
 <!-- ===========================================================================
                                   STABLE REFERENCE (STARR)
diff --git a/src/build/bnd/scala-parser-combinators.bnd b/src/build/bnd/scala-parser-combinators.bnd
index d712a4ba2a..6ffc3b2760 100644
--- a/src/build/bnd/scala-parser-combinators.bnd
+++ b/src/build/bnd/scala-parser-combinators.bnd
@@ -1,5 +1,5 @@
 Bundle-Name: Scala Parser Combinators Library
-Bundle-SymbolicName: org.scala-lang.scala-parser-combinators
+Bundle-SymbolicName: org.scala-lang.modules.scala-parser-combinators
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
diff --git a/src/build/bnd/scala-xml.bnd b/src/build/bnd/scala-xml.bnd
index 6203c57dfe..5d64c05e65 100644
--- a/src/build/bnd/scala-xml.bnd
+++ b/src/build/bnd/scala-xml.bnd
@@ -1,5 +1,5 @@
 Bundle-Name: Scala XML Library
-Bundle-SymbolicName: org.scala-lang.scala-xml
+Bundle-SymbolicName: org.scala-lang.modules.scala-xml
 ver: @VERSION@
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
-- 
cgit v1.2.3


From 331d32b2b34d3a97bcc753b26a5441971d7cd4b4 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 21 Oct 2013 15:45:35 -0700
Subject: Targets for publishing core to maven.

`ant publish-core-signed-opt-nodocs` creates and publishes the smallest
possible set of jars (library/reflect/compiler) we can send to maven.
It uploads jars with class files and sources, but no docs
(so that we don't need to build scaladoc or any other modules).

`ant publish-core-signed-opt` is similar, but also publishes docs.

For local experimentation: `ant publish-core-local-nodocs`.
With a little bit more work, this can be used instead of `replacestarr`.
---
 build.xml | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index dd70f0b798..b94cfaef04 100755
--- a/build.xml
+++ b/build.xml
@@ -75,6 +75,21 @@ TODO:
   <target name="distpack-opt" description="Builds an optimised distribution."> <optimized name="distpack"/></target>
   <target name="distpack-maven-opt" description="Builds an optimised maven distribution."><optimized name="distpack-maven"/></target>
 
+  <target name="publish-core-signed-opt" description="Builds an untested optimised core (library/reflect/compiler) and publishes to maven, signed.">
+    <optimized name="publish-core-signed"/>
+  </target>
+  <target name="publish-core-signed-opt-nodocs" description="Builds an untested, undocumented optimised core (library/reflect/compiler) and publishes to maven, signed.">
+    <antcall target="publish-core-signed">
+      <param name="docs.skip" value="1"/>
+      <param name="scalac.args.optimise" value="-optimise"/>
+    </antcall>
+  </target>
+  <target name="publish-core-local-nodocs" description="Builds an untested, undocumented core (library/reflect/compiler) and locally publishes to maven">
+    <antcall target="publish-core-local">
+      <param name="docs.skip" value="1"/>
+    </antcall>
+  </target>
+
   <target name="all.done" depends="test.done, distpack"/>
 
   <target name="nightly-nopt" depends="all.done"/>
@@ -1892,31 +1907,31 @@ TODO:
     </staged-docs>
   </target>
 
-  <target name="docs.actors" depends="docs.start">
+  <target name="docs.actors" depends="docs.start" unless="docs.skip">
     <staged-docs project="actors" title="Scala Actors Library">
       <include name="**/*.scala"/>
     </staged-docs>
   </target>
 
-  <target name="docs.swing" depends="docs.start">
+  <target name="docs.swing" depends="docs.start" unless="docs.skip">
     <staged-docs project="swing" title="Scala Swing Library">
       <include name="**/*.scala"/>
     </staged-docs>
   </target>
 
-  <target name="docs.scalap" depends="docs.start">
+  <target name="docs.scalap" depends="docs.start" unless="docs.skip">
     <staged-docs project="scalap" title="Scalap">
       <include name="**/*.scala"/>
     </staged-docs>
   </target>
 
-  <target name="docs.continuations-plugin" depends="docs.start">
+  <target name="docs.continuations-plugin" depends="docs.start" unless="docs.skip">
     <staged-docs project="continuations-plugin" dir="continuations/plugin" title="Delimited Continuations Compiler Plugin">
       <include name="**/*.scala"/>
     </staged-docs>
   </target>
 
-  <target name="docs.continuations-library" depends="docs.start">
+  <target name="docs.continuations-library" depends="docs.start" unless="docs.skip">
     <staged-docs project="continuations-library" dir="continuations/library" title="Delimited Continuations Library">
       <include name="**/*.scala"/>
     </staged-docs>
@@ -1999,8 +2014,8 @@ TODO:
     <copy-bundle name="scala-swing"/>
     <copy-bundle name="scala-actors"/>
 
-    <copy-bundle pkg="modules." name="scala-xml.jar" srcjar="${scala-xml-sources}"/>
-    <copy-bundle pkg="modules." name="scala-parser-combinators.jar" srcjar="${scala-parser-combinators-sources}"/>
+    <copy-bundle pkg="modules." name="scala-xml" srcjar="${scala-xml-sources}"/>
+    <copy-bundle pkg="modules." name="scala-parser-combinators" srcjar="${scala-parser-combinators-sources}"/>
     <copy-bundle pkg="plugins." name="continuations" lib="misc/scala-devel/plugins/"/>
 
     <!-- scalap -->
@@ -2041,10 +2056,6 @@ TODO:
         <exclude name="**/*.desired.sha1"/>
       </fileset>
     </copy>
-    <mkdir dir="${dist.dir}/doc/scala-devel-docs/tools"/>
-    <copy toDir="${dist.dir}/doc/scala-devel-docs/tools" overwrite="true">
-      <fileset dir="${build-docs.dir}/manual/html"/>
-    </copy>
     <copy file="${src.dir}/swing/doc/README"
           toFile="${dist.dir}/doc/scala-devel-docs/README.scala-swing"
           overwrite="true"/>
@@ -2055,6 +2066,10 @@ TODO:
     <copy toDir="${dist.dir}/man" overwrite="true">
       <fileset dir="${build-docs.dir}/manual/man"/>
     </copy>
+    <mkdir dir="${dist.dir}/doc/scala-devel-docs/tools"/>
+    <copy toDir="${dist.dir}/doc/scala-devel-docs/tools" overwrite="true">
+      <fileset dir="${build-docs.dir}/manual/html"/>
+    </copy>
   </target>
 
 
@@ -2246,6 +2261,22 @@ MAIN DISTRIBUTION PACKAGING
   <target name="publish.local"  depends="pack-maven.base, init.maven" description="Publishes unsigned artifacts to the local maven repo."> <deploy dir="${maven-base}/" local="true"/> </target>
   <target name="publish.signed" depends="pack-maven.base, init.maven" description="Publishes signed artifacts to the remote maven repo.">  <deploy dir="${maven-base}/" signed="true"/> </target>
 
+  <target name="publish-core"   depends="pack-maven.core, init.maven">
+    <deploy-one dir="${maven-base}/" name="scala-compiler" version="${maven.version.number}" />
+    <deploy-one dir="${maven-base}/" name="scala-library"  version="${maven.version.number}" />
+    <deploy-one dir="${maven-base}/" name="scala-reflect"  version="${maven.version.number}" />
+  </target>
+  <target name="publish-core-local" depends="pack-maven.core, init.maven">
+    <deploy-one dir="${maven-base}/" name="scala-compiler" version="${maven.version.number}" local="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-library"  version="${maven.version.number}" local="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-reflect"  version="${maven.version.number}" local="true"/>
+  </target>
+  <target name="publish-core-signed" depends="pack-maven.core, init.maven">
+    <deploy-one dir="${maven-base}/" name="scala-compiler" version="${maven.version.number}" signed="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-library"  version="${maven.version.number}" signed="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-reflect"  version="${maven.version.number}" signed="true"/>
+  </target>
+
 <!-- ===========================================================================
                                   STABLE REFERENCE (STARR)
 ============================================================================ -->
-- 
cgit v1.2.3


From d925c2155d59fe009c49e52341ce563bee6b085c Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 22 Oct 2013 16:09:26 -0700
Subject: Build cleanup. Prepare for scaladoc module build.

---
 build.xml                        | 80 +++++++++++++++++++++-------------------
 src/build/maven/maven-deploy.xml | 21 +++++------
 2 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/build.xml b/build.xml
index b94cfaef04..c6ffb188f7 100755
--- a/build.xml
+++ b/build.xml
@@ -1288,9 +1288,6 @@ TODO:
   <target name="quick.lib"        depends="quick.start">
     <staged-build with="locker"   stage="quick" project="library" srcpath="${src.dir}/library" includes="lib.rootdoc.includes"/></target>
 
-  <target name="quick.actors"     depends="quick.lib">
-    <staged-build with="locker"   stage="quick" project="actors"/> </target>
-
   <target name="quick.reflect"    depends="quick.lib">
     <staged-build with="locker"   stage="quick" project="reflect"/> </target>
 
@@ -1300,15 +1297,18 @@ TODO:
   <target name="quick.repl"       depends="quick.comp">
     <staged-build with="locker"   stage="quick" project="repl"/> </target>
 
-  <target name="quick.scalap"     depends="quick.repl">
-    <staged-build with="locker"   stage="quick" project="scalap"/> </target>
-
   <target name="quick.scaladoc"   depends="quick.comp">
     <staged-build with="locker"   stage="quick" project="scaladoc" version="scaladoc"/> </target>
 
   <target name="quick.interactive" depends="quick.comp, quick.scaladoc">
     <staged-build with="locker"    stage="quick" project="interactive"/> </target>
 
+  <target name="quick.scalap"     depends="quick.repl">
+    <staged-build with="locker"   stage="quick" project="scalap"/> </target>
+
+  <target name="quick.actors"     depends="quick.lib">
+    <staged-build with="locker"   stage="quick" project="actors"/> </target>
+
   <target name="quick.swing"      depends="quick.actors, quick.lib" if="has.java6">
     <staged-build with="locker"   stage="quick" project="swing"/> </target>
 
@@ -1347,7 +1347,9 @@ TODO:
     </staged-uptodate>
   </target>
 
-  <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.repl, quick.scalap, quick.interactive, quick.swing, quick.plugins, quick.scaladoc, quick.partest-extras">
+  <target name="quick.modules" depends="quick.repl, quick.scaladoc, quick.interactive, quick.scalap, quick.swing, quick.plugins"/>
+
+  <target name="quick.bin" depends="quick.lib, quick.reflect, quick.comp, quick.modules">
     <staged-bin stage="quick" classpathref="quick.bin.tool.path"/>
   </target>
 
@@ -1358,17 +1360,9 @@ TODO:
 <!-- ===========================================================================
                                   PACKED QUICK BUILD (PACK)
 ============================================================================ -->
-  <target name="pack.lib"    depends="quick.lib, quick.plugins, forkjoin.done">
-    <staged-pack project="library"/></target>
+  <target name="pack.lib"    depends="quick.lib, quick.plugins, forkjoin.done"> <staged-pack project="library"/></target>
 
-  <target name="pack.actors"  depends="quick.lib">                <staged-pack project="actors"/> </target>
-  <target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target>
-  <target name="pack.reflect" depends="quick.reflect">            <staged-pack project="reflect"/> </target>
-  <target name="pack.partest-extras" depends="quick.partest-extras">
-     <staged-pack project="partest-extras"/>
-     <staged-pack project="partest-javaagent"
-                  manifest="${src.dir}/partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF"/>
-  </target>
+  <target name="pack.reflect" depends="quick.reflect"> <staged-pack project="reflect"/> </target>
 
   <target name="pack.comp"    depends="quick.comp, quick.scaladoc, quick.interactive, quick.repl, asm.done">
     <staged-pack project="compiler" manifest="${build-pack.dir}/META-INF/MANIFEST.MF">
@@ -1396,21 +1390,30 @@ TODO:
     </staged-pack>
   </target>
 
+  <target name="pack.actors" depends="quick.actors"> <staged-pack project="actors"/> </target>
+  <target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target>
+
   <target name="pack.plugins"    depends="quick.plugins">    <staged-pack project="plugins"    targetdir="misc/scala-devel/plugins" targetjar="continuations.jar"/> </target>
 
   <target name="pack.scalap"     depends="quick.scalap">     <staged-pack project="scalap"     targetjar="scalap.jar"/> </target>
 
-  <target name="pack.core" depends="pack.reflect, pack.comp, pack.lib">
-    <!-- can't define task until we built jars for the core -->
-    <taskdef resource="scala/tools/ant/antlib.xml" classpathref="scaladoc.classpath"/>
-  </target>
+  <target name="pack.core" depends="pack.reflect, pack.comp, pack.lib"/>
 
-  <target name="pack.bin" depends="pack.core, pack.actors, pack.plugins, pack.scalap, pack.swing, pack.partest-extras">
+  <target name="pack.modules" depends="pack.core, pack.actors, pack.swing, pack.plugins, pack.scalap">
     <copy todir="${build-pack.dir}/lib">
       <path refid="external-modules-nocore" />
       <mapper type="flatten" />
     </copy>
+    <taskdef resource="scala/tools/ant/antlib.xml" classpathref="scaladoc.classpath"/>
+  </target>
+
+  <target name="pack.partest-extras" depends="quick.partest-extras">
+     <staged-pack project="partest-extras"/>
+     <staged-pack project="partest-javaagent"
+                  manifest="${src.dir}/partest-javaagent/scala/tools/partest/javaagent/MANIFEST.MF"/>
+  </target>
 
+  <target name="pack.bin" depends="pack.core, pack.modules, pack.partest-extras">
     <staged-bin stage="pack"/>
   </target>
 
@@ -1858,7 +1861,7 @@ TODO:
 <!-- ===========================================================================
                                   DOCUMENTATION
 ============================================================================ -->
-  <target name="docs.start" depends="pack.comp" unless="docs.skip">
+  <target name="docs.start" depends="pack.modules" unless="docs.skip">
     <!-- Set the github commit scaladoc sources point to -->
     <!-- For releases, look for the tag with the same name as the maven version -->
     <condition property="scaladoc.git.commit" value="v${maven.version.number}">
@@ -2173,16 +2176,17 @@ MAIN DISTRIBUTION PACKAGING
     <attribute name="pkg"    default=""/>
     <attribute name="project"/>
     <attribute name="name"   default="scala-@{project}"/>
+
     <sequential>
-      <local name="path"/> <property name="path" value="${maven-base}/@{dir}@{name}"/>
+      <local name="artifact-base"/> <property name="artifact-base" value="${maven-base}/@{dir}@{name}/@{name}"/>
 
-      <mkdir dir="${path}"/>
-      <copy tofile="${path}/@{name}.jar"     file="${build-osgi.dir}/org.scala-lang.@{pkg}@{name}.jar" overwrite="true"/>
-      <copy tofile="${path}/@{name}-src.jar" file="${build-osgi.dir}/@{name}-src.jar" overwrite="true"/>
-      <copy tofile="${path}/@{name}-pom.xml" file="${src.dir}/build/maven/@{dir}/@{name}-pom.xml" overwrite="true"/>
+      <mkdir dir="${maven-base}/@{dir}@{name}"/>
+      <copy tofile="${artifact-base}.jar"     file="${build-osgi.dir}/org.scala-lang.@{pkg}@{name}.jar" overwrite="true"/>
+      <copy tofile="${artifact-base}-src.jar" file="${build-osgi.dir}/@{name}-src.jar" overwrite="true"/>
+      <copy tofile="${artifact-base}-pom.xml" file="${src.dir}/build/maven/@{dir}/@{name}-pom.xml" overwrite="true"/>
 
       <if><not><isset property="docs.skip"/></not><then>
-        <jar basedir="${build-docs.dir}/@{project}" destfile="${path}/@{name}-docs.jar" whenmanifestonly="fail">
+        <jar destfile="${artifact-base}-docs.jar" basedir="${build-docs.dir}/@{project}" whenmanifestonly="fail">
           <include name="**/*"/>
         </jar>
       </then></if>
@@ -2262,19 +2266,19 @@ MAIN DISTRIBUTION PACKAGING
   <target name="publish.signed" depends="pack-maven.base, init.maven" description="Publishes signed artifacts to the remote maven repo.">  <deploy dir="${maven-base}/" signed="true"/> </target>
 
   <target name="publish-core"   depends="pack-maven.core, init.maven">
-    <deploy-one dir="${maven-base}/" name="scala-compiler" version="${maven.version.number}" />
-    <deploy-one dir="${maven-base}/" name="scala-library"  version="${maven.version.number}" />
-    <deploy-one dir="${maven-base}/" name="scala-reflect"  version="${maven.version.number}" />
+    <deploy-one dir="${maven-base}/" name="scala-compiler" />
+    <deploy-one dir="${maven-base}/" name="scala-library"  />
+    <deploy-one dir="${maven-base}/" name="scala-reflect"  />
   </target>
   <target name="publish-core-local" depends="pack-maven.core, init.maven">
-    <deploy-one dir="${maven-base}/" name="scala-compiler" version="${maven.version.number}" local="true"/>
-    <deploy-one dir="${maven-base}/" name="scala-library"  version="${maven.version.number}" local="true"/>
-    <deploy-one dir="${maven-base}/" name="scala-reflect"  version="${maven.version.number}" local="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-compiler" local="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-library"  local="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-reflect"  local="true"/>
   </target>
   <target name="publish-core-signed" depends="pack-maven.core, init.maven">
-    <deploy-one dir="${maven-base}/" name="scala-compiler" version="${maven.version.number}" signed="true"/>
-    <deploy-one dir="${maven-base}/" name="scala-library"  version="${maven.version.number}" signed="true"/>
-    <deploy-one dir="${maven-base}/" name="scala-reflect"  version="${maven.version.number}" signed="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-compiler" signed="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-library"  signed="true"/>
+    <deploy-one dir="${maven-base}/" name="scala-reflect"  signed="true"/>
   </target>
 
 <!-- ===========================================================================
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 3607aa5e5e..90bfaa419b 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -9,9 +9,8 @@
   <macrodef name="deploy-one">
     <attribute name="dir" default=""/>
     <attribute name="name" />
-    <attribute name="version" />
-    <attribute name="local" />
-    <attribute name="signed" />
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
 
     <sequential>
       <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/>
@@ -20,7 +19,7 @@
 
       <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
         <filterset>
-          <filter token="VERSION" value="@{version}" />
+          <filter token="VERSION" value="${maven.version.number}" />
           <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" />
           <filter token="XML_VERSION" value="${scala-xml.version.number}" />
           <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
@@ -85,13 +84,13 @@
     <attribute name="signed" default="false"/>
 
     <sequential>
-      <deploy-one dir="@{dir}"          name="scala-actors"   version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scala-library"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scala-reflect"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scala-swing"    version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}"          name="scalap"         version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      <deploy-one dir="@{dir}plugins/" name="continuations"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-library"     local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-reflect"     local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-compiler"    local="@{local}" signed="@{signed}"/>
+      <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>
 
-- 
cgit v1.2.3


From 22ac38a8cf5fd45dc58d68a0ccfaf63464e992a7 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 25 Oct 2013 10:53:47 -0700
Subject: Fail build on error in signed maven publish.

---
 src/build/maven/maven-deploy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 90bfaa419b..9e4215d297 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -63,7 +63,7 @@
         </then><else>
           <property name="repo" value="${local.repository}"/>
         </else></if>
-        <artifact:mvn>
+        <artifact:mvn failonerror="true">
           <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
           <arg value="-Durl=${repo}" />
           <arg value="-DrepositoryId=${repository.credentials.id}" />
-- 
cgit v1.2.3


From 340907a5a617d2c1cfe2d396ea50b9c440e7470c Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 25 Oct 2013 10:58:58 -0700
Subject: Tidy pom xml files.

---
 src/build/maven/plugins/continuations-pom.xml |  94 ++++++++-------
 src/build/maven/scala-actors-pom.xml          |  95 ++++++++-------
 src/build/maven/scala-compiler-pom.xml        | 162 +++++++++++++-------------
 src/build/maven/scala-library-pom.xml         |  85 +++++++-------
 src/build/maven/scala-reflect-pom.xml         |  95 ++++++++-------
 src/build/maven/scala-swing-pom.xml           |  99 ++++++++--------
 src/build/maven/scalap-pom.xml                |  94 ++++++++-------
 7 files changed, 358 insertions(+), 366 deletions(-)

diff --git a/src/build/maven/plugins/continuations-pom.xml b/src/build/maven/plugins/continuations-pom.xml
index 7217270e96..8dc79c8664 100644
--- a/src/build/maven/plugins/continuations-pom.xml
+++ b/src/build/maven/plugins/continuations-pom.xml
@@ -1,53 +1,51 @@
-<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>
+<?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>
+  <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>
diff --git a/src/build/maven/scala-actors-pom.xml b/src/build/maven/scala-actors-pom.xml
index dbbdbb46f6..424ac2898c 100644
--- a/src/build/maven/scala-actors-pom.xml
+++ b/src/build/maven/scala-actors-pom.xml
@@ -1,55 +1,54 @@
-<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-actors</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?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-actors</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scala Actors library</name>
   <description>Deprecated Actors Library for Scala</description>
-  <url>http://www.scala-lang.org/</url>  
+  <url>http://www.scala-lang.org/</url>
   <inceptionYear>2006</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>
+    <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>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 676e054a36..442fe6a8d5 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -1,82 +1,82 @@
-<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-compiler</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
-	<name>Scala Compiler</name>
-	<description>Compiler for the Scala Programming Language</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>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-library</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-		<dependency> <!-- for scaladoc -->
-                <groupId>org.scala-lang.modules</groupId>
-                <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId>
-                <version>@XML_VERSION@</version>
-		</dependency>
-		<dependency> <!-- for scaladoc -->
-                <groupId>org.scala-lang.modules</groupId>
-                <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
-                <version>@PARSER_COMBINATORS_VERSION@</version>
-		</dependency>
-		<dependency>
-			<groupId>org.scala-lang</groupId>
-			<artifactId>scala-reflect</artifactId>
-			<version>@VERSION@</version>
-		</dependency>
-		<dependency>
-			<groupId>jline</groupId>
-			<artifactId>jline</artifactId>
-			<version>@JLINE_VERSION@</version>
-			<optional>true</optional>
-		</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>
+<?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-compiler</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
+  <name>Scala Compiler</name>
+  <description>Compiler for the Scala Programming Language</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>
+  <dependencies>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-library</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <!-- for scaladoc -->
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@XML_VERSION@</version>
+    </dependency>
+    <dependency>
+      <!-- for scaladoc -->
+      <groupId>org.scala-lang.modules</groupId>
+      <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
+      <version>@PARSER_COMBINATORS_VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-reflect</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <version>@JLINE_VERSION@</version>
+      <optional>true</optional>
+    </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-library-pom.xml b/src/build/maven/scala-library-pom.xml
index fcadc16197..d40cee2656 100644
--- a/src/build/maven/scala-library-pom.xml
+++ b/src/build/maven/scala-library-pom.xml
@@ -1,49 +1,48 @@
-<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-library</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?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-library</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scala Library</name>
   <description>Standard library for the Scala Programming Language</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>
+  <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>
    </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>
+    <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>
diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml
index 7c6aa024ae..d0a9c0e274 100644
--- a/src/build/maven/scala-reflect-pom.xml
+++ b/src/build/maven/scala-reflect-pom.xml
@@ -1,55 +1,54 @@
-<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-reflect</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?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-reflect</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scala Compiler</name>
   <description>Compiler for the Scala Programming Language</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>
+  <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>
+    <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>
+  <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>
diff --git a/src/build/maven/scala-swing-pom.xml b/src/build/maven/scala-swing-pom.xml
index b87c9219a3..01c89f9bea 100644
--- a/src/build/maven/scala-swing-pom.xml
+++ b/src/build/maven/scala-swing-pom.xml
@@ -1,55 +1,54 @@
-<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>
+<?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>
+  <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>
diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml
index b2445cf420..88cfce08d8 100644
--- a/src/build/maven/scalap-pom.xml
+++ b/src/build/maven/scalap-pom.xml
@@ -1,53 +1,51 @@
-<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>scalap</artifactId>
-	<packaging>jar</packaging>
-	<version>@VERSION@</version>
+<?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>scalap</artifactId>
+  <packaging>jar</packaging>
+  <version>@VERSION@</version>
   <name>Scalap</name>
   <description>bytecode analysis tool</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>
-
-	<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>
+  <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>
+  <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>
-- 
cgit v1.2.3


From 937e304dbab48c8bd47d1ea6740e6e044ed6f065 Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Fri, 25 Oct 2013 11:07:03 -0700
Subject: Bundle source and class file bundling in osgi bundling.

Fix oversight in not skipping scalap's ad-hoc published docs on docs.skip.
---
 build.xml | 144 +++++++++++++++++++++++++-------------------------------------
 1 file changed, 59 insertions(+), 85 deletions(-)

diff --git a/build.xml b/build.xml
index c6ffb188f7..bc7a3cf24b 100755
--- a/build.xml
+++ b/build.xml
@@ -1404,6 +1404,9 @@ TODO:
       <path refid="external-modules-nocore" />
       <mapper type="flatten" />
     </copy>
+  </target>
+
+  <target name="scaladoc.task" depends="pack.modules" unless="docs.skip">
     <taskdef resource="scala/tools/ant/antlib.xml" classpathref="scaladoc.classpath"/>
   </target>
 
@@ -1460,15 +1463,21 @@ TODO:
 <!-- ===========================================================================
                                   OSGi Artifacts
 ============================================================================ -->
-  <!-- simplify fixing pom versions -->
   <macrodef name="make-bundle">
     <attribute name="name" />
-    <attribute name="version" />
+    <attribute name="bundleName"   description="A value for Bundle-Name, usually a textual description"/>
     <attribute name="jar" default="${build-pack.dir}/lib/@{name}.jar" />
+    <element   name="srcs" description="Sources for this bundle" optional="true" implicit="true"/>
+    <attribute name="src" default="true"/>
+    <attribute name="version" default="${osgi.version.number}"/>
+    <attribute name="namesuffix" default=""/>
+    <attribute name="pkg" default=""/>
+
     <sequential>
       <copy file="${src.dir}/build/bnd/@{name}.bnd" tofile="${build-osgi.dir}/@{name}.bnd" overwrite="true">
         <filterset>
-          <filter token="VERSION" value="@{version}" />
+          <filter token="VERSION" value="${osgi.version.number}" />
+          <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" />
         </filterset>
       </copy>
       <bnd classpath="@{jar}"
@@ -1477,47 +1486,22 @@ TODO:
            exceptions="true"
            files="${build-osgi.dir}/@{name}.bnd"
            output="${build-osgi.dir}"/>
-    </sequential>
-  </macrodef>
-  <macrodef name="make-plugin-bundle">
-    <attribute name="name" />
-    <attribute name="version" />
-    <sequential>
-      <copy file="${src.dir}/build/bnd/@{name}.bnd" tofile="${build-osgi.dir}/@{name}.bnd" overwrite="true">
-        <filterset>
-          <filter token="VERSION" value="@{version}" />
-        </filterset>
-      </copy>
-      <bnd classpath="${build-pack.dir}/misc/scala-devel/plugins/@{name}.jar"
-           eclipse="false"
-           failok="false"
-           exceptions="true"
-           files="${build-osgi.dir}/@{name}.bnd"
-           output="${build-osgi.dir}"/>
-    </sequential>
-  </macrodef>
-
-  <!--
-       A jar-like task that creates an OSGi source bundle. It adds the required MANIFEST.MF headers that allow
-       Eclipse to match sources with the corresponding binaries.
-  -->
-  <macrodef name="osgi.source.bundle">
-    <attribute name="destfile"     description="The jar file name"/>
-    <attribute name="symbolicName" description="The original bundle symbolic name (without .source at the end)"/>
-    <attribute name="bundleName"   description="A value for Bundle-Name, usually a textual description"/>
-    <element   name="file-sets"    description="A sequence of fileset elements to be included in the jar" optional="true" implicit="true"/>
-
-    <sequential>
-      <jar whenmanifestonly="fail" destfile="@{destFile}">
-        <file-sets/>
-        <manifest>
-          <attribute name="Manifest-Version" value="1.0"/>
-          <attribute name="Bundle-Name" value="@{bundleName}"/>
-          <attribute name="Bundle-SymbolicName" value="@{symbolicName}.source"/>
-          <attribute name="Bundle-Version" value="${osgi.version.number}"/>
-          <attribute name="Eclipse-SourceBundle" value="@{symbolicName};version=&quot;${osgi.version.number}&quot;;roots:=&quot;.&quot;" />
-        </manifest>
-      </jar>
+      <if><equals arg1="@{src}" arg2="true"/><then>
+        <!--
+             A jar-like task that creates an OSGi source bundle. It adds the required MANIFEST.MF headers that allow
+             Eclipse to match sources with the corresponding binaries.
+        -->
+          <jar whenmanifestonly="fail" destfile="${build-osgi.dir}/@{name}-src.jar">
+            <srcs/>
+            <manifest>
+              <attribute name="Manifest-Version" value="1.0"/>
+              <attribute name="Bundle-Name" value="@{bundleName} Sources"/>
+              <attribute name="Bundle-SymbolicName" value="org.scala-lang.@{pkg}@{name}@{namesuffix}.source"/>
+              <attribute name="Bundle-Version" value="@{version}"/>
+              <attribute name="Eclipse-SourceBundle" value="org.scala-lang.@{pkg}@{name}@{namesuffix};version=&quot;@{version}&quot;;roots:=&quot;.&quot;" />
+            </manifest>
+          </jar>
+      </then></if>
     </sequential>
   </macrodef>
 
@@ -1537,29 +1521,22 @@ TODO:
 
     <if><not><isset property="osgi.bundles.available"/></not><then>
       <stopwatch name="osgi.core.timer"/>
-      <make-bundle name="scala-library" version="${osgi.version.number}" />
-      <make-bundle name="scala-reflect" version="${osgi.version.number}" />
-      <make-bundle name="scala-compiler" version="${osgi.version.number}" />
-
-      <osgi.source.bundle destfile="${build-osgi.dir}/scala-library-src.jar"
-                          symbolicName="org.scala-lang.scala-library"
-                          bundleName="Scala Library Sources">
+      <make-bundle name="scala-library" bundleName="Scala Library">
         <fileset dir="${src.dir}/library"/>
         <fileset dir="${src.dir}/continuations/library"/>
-      </osgi.source.bundle>
-      <osgi.source.bundle destfile="${build-osgi.dir}/scala-reflect-src.jar"
-                          symbolicName="org.scala-lang.scala-reflect"
-                          bundleName="Scala Reflect Sources">
+      </make-bundle>
+
+      <make-bundle name="scala-reflect" bundleName="Scala Reflect">
         <fileset dir="${src.dir}/reflect"/>
-      </osgi.source.bundle>
-      <osgi.source.bundle destfile="${build-osgi.dir}/scala-compiler-src.jar"
-                          symbolicName="org.scala-lang.scala-compiler"
-                          bundleName="Scala Compiler Sources">
+      </make-bundle>
+
+      <make-bundle name="scala-compiler" bundleName="Scala Compiler">
         <fileset dir="${src.dir}/compiler"/>
         <fileset dir="${src.dir}/repl"/>
         <fileset dir="${src.dir}/scaladoc"/>
         <fileset dir="${src.dir}/interactive"/>
-      </osgi.source.bundle>
+      </make-bundle>
+
       <touch file="${build-osgi.dir}/bundles.core.complete" verbose="no"/>
       <stopwatch name="osgi.core.timer" action="total"/>
     </then></if>
@@ -1571,39 +1548,33 @@ TODO:
         <include name="build.xml"/>
         <include name="src/build/bnd/*.bnd"/>
         <include name="${build-pack.dir}/lib/scala-actors.jar"/>
-        <include name="${scala-parser-combinators}"/>
         <include name="${build-pack.dir}/misc/scala-devel/plugins/continuations.jar"/>
-        <include name="${scala-xml}"/>
         <include name="${build-pack.dir}/lib/scala-swing.jar"/>
+        <include name="${scala-parser-combinators}"/>
+        <include name="${scala-xml}"/>
       </srcfiles>
     </uptodate>
 
     <if><not><isset property="osgi.bundles.available"/></not><then>
       <stopwatch name="osgi.all.timer"/>
-      <make-bundle name="scala-actors" version="${osgi.version.number}" />
-      <make-bundle name="scala-parser-combinators" version="${osgi.version.number}" jar="${scala-parser-combinators}"/>
-      <make-plugin-bundle name="continuations" version="${osgi.version.number}" />
-      <make-bundle name="scala-xml" version="${osgi.version.number}" jar="${scala-xml}"/>
 
-      <if><isset property="has.java6"/><then>
-        <make-bundle name="scala-swing" version="${osgi.version.number}"/></then>
-      </if>
 
-      <osgi.source.bundle destfile="${build-osgi.dir}/scala-actors-src.jar"
-                          symbolicName="org.scala-lang.scala-actors"
-                          bundleName="Scala Actors Sources">
+      <make-bundle name="scala-actors" bundleName="Scala Actors">
         <fileset dir="${src.dir}/actors"/>
-      </osgi.source.bundle>
-      <osgi.source.bundle destfile="${build-osgi.dir}/continuations-src.jar"
-                          symbolicName="org.scala-lang.plugins.continuations"
-                          bundleName="Scala Continuations Plugin Sources">
+      </make-bundle>
+
+      <make-bundle name="continuations" pkg="plugins." jar="${build-pack.dir}/misc/scala-devel/plugins/continuations.jar" bundleName="Scala Continuations Plugin">
         <fileset dir="${src.dir}/continuations/plugin"/>
-      </osgi.source.bundle>
-      <osgi.source.bundle destfile="${build-osgi.dir}/scala-swing-src.jar"
-                          symbolicName="org.scala-lang.scala-swing"
-                          bundleName="Scala Swing Sources">
-        <fileset dir="${src.dir}/swing"/>
-      </osgi.source.bundle>
+      </make-bundle>
+
+      <if><isset property="has.java6"/><then>
+        <make-bundle name="scala-swing" version="${osgi.version.number}" bundleName="Scala Swing">
+          <fileset dir="${src.dir}/swing"/>
+        </make-bundle>
+      </then></if>
+
+      <make-bundle name="scala-parser-combinators" pkg="modules." jar="${scala-parser-combinators}" src="false" bundleName="Scala Parser Combinators"/>
+      <make-bundle name="scala-xml" pkg="modules." jar="${scala-xml}" src="false" bundleName="Scala XML"/>
 
       <touch file="${build-osgi.dir}/bundles.all.complete" verbose="no"/>
       <stopwatch name="osgi.all.timer" action="total"/>
@@ -1861,7 +1832,7 @@ TODO:
 <!-- ===========================================================================
                                   DOCUMENTATION
 ============================================================================ -->
-  <target name="docs.start" depends="pack.modules" unless="docs.skip">
+  <target name="docs.start" depends="scaladoc.task" unless="docs.skip">
     <!-- Set the github commit scaladoc sources point to -->
     <!-- For releases, look for the tag with the same name as the maven version -->
     <condition property="scaladoc.git.commit" value="v${maven.version.number}">
@@ -2176,12 +2147,13 @@ MAIN DISTRIBUTION PACKAGING
     <attribute name="pkg"    default=""/>
     <attribute name="project"/>
     <attribute name="name"   default="scala-@{project}"/>
+    <attribute name="jarsuffix" default=""/>
 
     <sequential>
       <local name="artifact-base"/> <property name="artifact-base" value="${maven-base}/@{dir}@{name}/@{name}"/>
 
       <mkdir dir="${maven-base}/@{dir}@{name}"/>
-      <copy tofile="${artifact-base}.jar"     file="${build-osgi.dir}/org.scala-lang.@{pkg}@{name}.jar" overwrite="true"/>
+      <copy tofile="${artifact-base}.jar" file="${build-osgi.dir}/org.scala-lang.@{pkg}@{name}@{jarsuffix}.jar" overwrite="true"/>
       <copy tofile="${artifact-base}-src.jar" file="${build-osgi.dir}/@{name}-src.jar" overwrite="true"/>
       <copy tofile="${artifact-base}-pom.xml" file="${src.dir}/build/maven/@{dir}/@{name}-pom.xml" overwrite="true"/>
 
@@ -2211,7 +2183,9 @@ MAIN DISTRIBUTION PACKAGING
     <copy tofile="${maven-base}/scalap/scalap-pom.xml" file="${src.dir}/build/maven/scalap-pom.xml" overwrite="true"/>
     <copy tofile="${maven-base}/scalap/scalap.jar" file="${build-pack.dir}/lib/scalap.jar" overwrite="true"/>
     <jar destfile="${maven-base}/scalap/scalap-src.jar" basedir="${src.dir}/scalap" whenmanifestonly="fail"/>
-    <jar destfile="${maven-base}/scalap/scalap-docs.jar" basedir="${build-docs.dir}/scalap"/>
+    <if><not><isset property="docs.skip"/></not><then>
+      <jar destfile="${maven-base}/scalap/scalap-docs.jar" basedir="${build-docs.dir}/scalap"/>
+    </then></if>
   </target>
 
   <target name="pack-maven.done" depends="pack-maven.base">
-- 
cgit v1.2.3