diff options
-rw-r--r-- | build.xml | 4 | ||||
-rw-r--r-- | src/build/maven/maven-deploy.xml | 4 | ||||
-rw-r--r-- | src/build/maven/scala-partest-pom.xml | 50 | ||||
-rw-r--r-- | src/build/maven/scalap-pom.xml | 50 | ||||
-rw-r--r-- | src/build/pack.xml | 2 |
5 files changed, 110 insertions, 0 deletions
@@ -1522,6 +1522,10 @@ DISTRIBUTION <jar destfile="${dist.dir}/src/scalap-src.jar"> <fileset dir="${src.dir}/scalap"/> </jar> + <!-- Needed for Maven distribution --> + <jar destfile="${dist.dir}/src/scala-partest-src.jar"> + <fileset dir="${src.dir}/partest"/> + </jar> </target> <target name="dist.latest.unix" depends="dist.src" unless="os.win"> diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index 02c4adaafb..21ecce604b 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -81,6 +81,8 @@ <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}"/> + <deploy-local name="scalap" version="@{version}" repository="@{repository}"/> + <deploy-local name="scala-partest" 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" /> @@ -123,6 +125,8 @@ <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}"/> + <deploy-remote name="scalap" version="@{version}" repository="@{repository}"/> + <deploy-remote name="scala-partest" 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/maven/scala-partest-pom.xml b/src/build/maven/scala-partest-pom.xml new file mode 100644 index 0000000000..1278ecd8fd --- /dev/null +++ b/src/build/maven/scala-partest-pom.xml @@ -0,0 +1,50 @@ +<project + 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-partest</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <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-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>
\ No newline at end of file diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml new file mode 100644 index 0000000000..d2b933c0cd --- /dev/null +++ b/src/build/maven/scalap-pom.xml @@ -0,0 +1,50 @@ +<project + 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> + <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-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>
\ No newline at end of file diff --git a/src/build/pack.xml b/src/build/pack.xml index 8ed5f25713..d98029105d 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -186,6 +186,8 @@ MAIN DISTRIBUTION SBAZ <mvn-copy-lib mvn.artifact.name="scala-compiler"/> <mvn-copy-lib mvn.artifact.name="scala-dbc"/> <mvn-copy-lib mvn.artifact.name="scala-swing"/> + <mvn-copy-lib mvn.artifact.name="scala-partest"/> + <mvn-copy-lib mvn.artifact.name="scalap"/> </target> <target name="pack-maven.docs" depends="pack-maven.libs"> |