From 2432afcc61db2b08ad66f5335c4c1b18afe9f36d Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Sat, 22 Jan 2011 17:12:25 +0000
Subject: Modified scala build to push jline artifact to ...

Modified scala build to push jline artifact to maven repositories.
Review by: extempore
---
 src/build/maven/jline-pom.xml          | 57 ++++++++++++++++++++++++++++++++++
 src/build/maven/maven-deploy.xml       |  2 ++
 src/build/maven/scala-compiler-pom.xml | 12 +++----
 src/build/pack.xml                     | 10 +++++-
 4 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 src/build/maven/jline-pom.xml

(limited to 'src')

diff --git a/src/build/maven/jline-pom.xml b/src/build/maven/jline-pom.xml
new file mode 100644
index 0000000000..0c96c1374e
--- /dev/null
+++ b/src/build/maven/jline-pom.xml
@@ -0,0 +1,57 @@
+<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>jline</artifactId>
+	<packaging>jar</packaging>
+	<version>@VERSION@</version>
+	<url>http://www.scala-lang.org/</url>
+	<inceptionYear>2011</inceptionYear>
+	<organization>
+		<name>LAMP/EPFL</name>
+		<url>http://lamp.epfl.ch/</url>
+	</organization>
+	<licenses>
+		<license>
+			<name>BSD-like</name>
+			<url>http://www.scala-lang.org/downloads/license.html
+			</url>
+			<distribution>repo</distribution>
+		</license>
+    <license>
+      <name>The BSD License</name>
+      <url>http://www.opensource.org/licenses/bsd-license.php</url>
+      <distribution>repo</distribution>
+    </license>
+	</licenses>
+	<scm>
+		<connection>scm:svn:http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk</connection>
+		<url>https://lampsvn.epfl.ch/trac/scala/browser/scala/trunk</url>
+	</scm>
+	<issueManagement>
+		<system>trac</system>
+		<url>http://lampsvn.epfl.ch/trac/scala
+		</url>
+	</issueManagement>
+
+	<dependencies>
+    <dependency>
+        <groupId>org.fusesource.jansi</groupId>
+        <artifactId>jansi</artifactId>
+        <version>1.4</version>
+        <!--<scope>provided</scope>-->
+    </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>
+</project>
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index b1d75f171d..8816e6f185 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -114,6 +114,7 @@
             <artifact:attach type="jar" file="scala-library/scala-library-docs.jar" classifier="javadoc" />
           </extra-attachments>
         </deploy-local>
+      	<deploy-local name="jline" version="@{version}" repository="@{repository}"/>
         <deploy-local name="scala-compiler" version="@{version}" repository="@{repository}" />
         <deploy-local name="scala-dbc" version="@{version}" repository="@{repository}" />
         <deploy-local name="scala-swing" version="@{version}" repository="@{repository}"/>
@@ -176,6 +177,7 @@
             <artifact:attach type="jar" file="scala-library/scala-library-docs.jar" classifier="javadoc" />
           </extra-attachments>
         </deploy-remote>
+      	<deploy-remote name="jline" version="@{version}" repository="@{repository}"/>
         <deploy-remote name="scala-compiler" version="@{version}" repository="@{repository}" />
         <deploy-remote name="scala-dbc" version="@{version}" repository="@{repository}" />
         <deploy-remote name="scala-swing" version="@{version}" repository="@{repository}"/>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 01ede9bb31..520c5fd5fd 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -36,12 +36,12 @@
 			<artifactId>scala-library</artifactId>
 			<version>@VERSION@</version>
 		</dependency>
-                <dependency>
-                        <groupId>jline</groupId>
-                        <artifactId>jline</artifactId>
-                        <version>0.9.91</version>
-                        <optional>true</optional>
-                </dependency>
+    <dependency>
+      <groupId>org.scala-lang</groupId>
+      <artifactId>jline</artifactId>
+      <version>@VERSION@</version>
+      <optional>true</optional>
+    </dependency>
 	</dependencies>
 	<distributionManagement>
 		<repository>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index d75e36c337..7ae23dad5e 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -189,6 +189,7 @@ MAIN DISTRIBUTION SBAZ
         </copy>
       </sequential>
     </macrodef>
+    <mvn-copy-lib mvn.artifact.name="jline"/>
     <mvn-copy-lib mvn.artifact.name="scala-library"/>
     <mvn-copy-lib mvn.artifact.name="scala-compiler"/>
     <mvn-copy-lib mvn.artifact.name="scala-dbc"/>
@@ -215,6 +216,13 @@ MAIN DISTRIBUTION SBAZ
     <mvn-copy-plugin mvn.artifact.name="continuations"/>
   </target>
 
+  <target name="pack-maven.srcs" depends="pack-maven.libs">
+    <jar destfile="${dists.dir}/maven/${version.number}/jline/jline-src.jar"
+         basedir="${src.dir}/jline/src/main/java">
+      <include name="**/*"/>
+    </jar>
+  </target>
+
   <target name="pack-maven.docs" depends="pack-maven.libs, pack-maven.plugins">
     <jar destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"
          basedir="${build-docs.dir}/library">
@@ -240,7 +248,7 @@ MAIN DISTRIBUTION SBAZ
     </copy>
   </target>
 
-  <target name="pack-maven.scripts" depends="pack-maven.latest.unix,pack-maven.latest.win">
+  <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}/maven-ant-tasks-2.0.9.jar"/>
     <copy tofile="${dists.dir}/maven/${version.number}/build.xml"
-- 
cgit v1.2.3