diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2010-03-12 13:34:05 +0000 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2010-03-12 13:34:05 +0000 |
commit | 1c4651b9b1da3ecfff1813bfd87b99a6023289fa (patch) | |
tree | 14da560bac83a5f01091555a42d644060a6f3947 | |
parent | 32e1da60a1ae55675b07e031bef89c7e28832d02 (diff) | |
download | scala-1c4651b9b1da3ecfff1813bfd87b99a6023289fa.tar.gz scala-1c4651b9b1da3ecfff1813bfd87b99a6023289fa.tar.bz2 scala-1c4651b9b1da3ecfff1813bfd87b99a6023289fa.zip |
Added continuations to maven deployment.
-rw-r--r-- | src/build/maven/continuations-plugin-pom.xml | 51 | ||||
-rw-r--r-- | src/build/maven/maven-deploy.xml | 51 | ||||
-rw-r--r-- | src/build/pack.xml | 20 |
3 files changed, 121 insertions, 1 deletions
diff --git a/src/build/maven/continuations-plugin-pom.xml b/src/build/maven/continuations-plugin-pom.xml new file mode 100644 index 0000000000..0277b899ed --- /dev/null +++ b/src/build/maven/continuations-plugin-pom.xml @@ -0,0 +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> + <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-like</name> + <url>http://www.scala-lang.org/downloads/license.html + </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.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> +</project> diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index 4075c25ae0..b1d75f171d 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -45,6 +45,21 @@ <artifact:pom id="@{name}.pom" file="@{name}/@{name}-pom-fixed.xml" /> </sequential> </macrodef> + + <macrodef name="make-pom-plugin"> + <attribute name="name" /> + <attribute name="version" /> + <sequential> + <copy file="plugins/@{name}/@{name}-plugin-pom.xml" tofile="plugins/@{name}/@{name}-pom-fixed.xml" overwrite="true"> + <filterset> + <filter token="VERSION" value="@{version}" /> + <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" /> + <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" /> + </filterset> + </copy> + <artifact:pom id="plugin-@{name}.pom" file="plugins/@{name}/@{name}-pom-fixed.xml" /> + </sequential> + </macrodef> <!-- Simply attaching documentation --> <macrodef name="attach-doc"> <attribute name="name" /> @@ -72,6 +87,23 @@ </sequential> </macrodef> + <!-- Deploy compiler plugins --> + <macrodef name="deploy-local-plugin"> + <attribute name="name" /> + <attribute name="version" /> + <attribute name="repository" /> + <element name="extra-attachments" optional="yes" /> + <sequential> + <make-pom-plugin name="@{name}" version="@{version}" /> + <artifact:install file="plugins/@{name}/@{name}.jar"> + <artifact:pom refid="plugin-@{name}.pom" /> + <artifact:localRepository path="@{repository}" id="${repository.credentials.id}" /> + <extra-attachments /> + </artifact:install> + </sequential> + </macrodef> + + <!-- Deploy all artifacts locally --> <macrodef name="deploy-local-all"> <attribute name="repository" /> @@ -87,6 +119,7 @@ <deploy-local name="scala-swing" version="@{version}" repository="@{repository}"/> <deploy-local name="scalap" version="@{version}" repository="@{repository}"/> <deploy-local name="scala-partest" version="@{version}" repository="@{repository}"/> + <deploy-local-plugin name="continuations" version="@{version}" repository="@{repository}"/> <!-- scala swing api is included in main library api <extra-attachments> <artifact:attach type="jar" file="scala-swing/scala-swing-docs.jar" classifier="javadoc" /> @@ -116,6 +149,23 @@ </sequential> </macrodef> + + <!-- Deploy compiler plugins --> + <macrodef name="deploy-remote-plugin"> + <attribute name="name" /> + <attribute name="version" /> + <attribute name="repository" /> + <element name="extra-attachments" optional="yes" /> + <sequential> + <make-pom-plugin name="@{name}" version="@{version}" /> + <artifact:deploy file="plugins/@{name}/@{name}.jar" settingsFile="${settings.file}"> + <artifact:pom refid="plugin-@{name}.pom" /> + <artifact:remoteRepository url="@{repository}" id="${repository.credentials.id}" /> + <extra-attachments /> + </artifact:deploy> + </sequential> + </macrodef> + <!-- Deploy all artifacts locally --> <macrodef name="deploy-remote-all"> <attribute name="repository" /> @@ -131,6 +181,7 @@ <deploy-remote name="scala-swing" version="@{version}" repository="@{repository}"/> <deploy-remote name="scalap" version="@{version}" repository="@{repository}"/> <deploy-remote name="scala-partest" version="@{version}" repository="@{repository}"/> + <deploy-remote-plugin name="continuations" version="@{version}" repository="@{repository}"/> <!-- scala swing api is included in main library api <extra-attachments> <artifact:attach type="jar" file="scala-swing/scala-swing-docs.jar" classifier="javadoc" /> diff --git a/src/build/pack.xml b/src/build/pack.xml index 6239e61187..5c5c8fbd8d 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -194,7 +194,25 @@ MAIN DISTRIBUTION SBAZ <mvn-copy-lib mvn.artifact.name="scalap"/> </target> - <target name="pack-maven.docs" depends="pack-maven.libs"> + <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}"> + <fileset dir="${dist.dir}/plugins/"> + <filename name="@{mvn.artifact.name}.jar"/> + </fileset> + <fileset dir="${src.dir}/build/maven/"> + <filename name="@{mvn.artifact.name}-plugin-pom.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + <mvn-copy-plugin mvn.artifact.name="continuations"/> + </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"> <include name="**/*"/> |