diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2012-02-20 14:08:25 -0500 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-02-27 13:16:04 -0500 |
commit | bb0237ed3a6415e3fb3088f61001f23b43da6f31 (patch) | |
tree | 9cab5b3e9e55ace6e54cf7da8d63949b2e7cfe92 /src/build/maven/maven-deploy.xml | |
parent | 39c5cdbaa4252203ab7c21b96cbc6254a2aa28bd (diff) | |
download | scala-bb0237ed3a6415e3fb3088f61001f23b43da6f31.tar.gz scala-bb0237ed3a6415e3fb3088f61001f23b43da6f31.tar.bz2 scala-bb0237ed3a6415e3fb3088f61001f23b43da6f31.zip |
Merged doc fixes from 2.10.x into 2.9.xv2.9.1-1-RC1v2.9.1-1
Conflicts:
src/build/maven/maven-deploy.xml
Diffstat (limited to 'src/build/maven/maven-deploy.xml')
-rw-r--r-- | src/build/maven/maven-deploy.xml | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index 35a7f6f117..2e490163e0 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -58,13 +58,6 @@ <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" /> - <sequential> - <artifact:attach type="jar" file="@{name}/@{name}-docs.jar" classifier="javadoc" /> - </sequential> - </macrodef> </target> <!-- macros for local deployment --> <target name="deploy.local.init" depends="init.maven"> @@ -80,6 +73,7 @@ <artifact:pom refid="@{name}.pom" /> <artifact:localRepository path="@{repository}" id="${repository.credentials.id}" /> <artifact:attach type="jar" file="@{name}/@{name}-src.jar" classifier="sources" /> + <artifact:attach type="jar" file="@{name}/@{name}-docs.jar" classifier="javadoc" /> <extra-attachments /> </artifact:install> </sequential> @@ -95,6 +89,8 @@ <make-pom-plugin name="@{name}" version="@{version}" /> <artifact:install file="plugins/@{name}/@{name}.jar"> <artifact:pom refid="plugin-@{name}.pom" /> + <artifact:attach type="jar" file="plugins/@{name}/@{name}-src.jar" classifier="sources" /> + <artifact:attach type="jar" file="plugins/@{name}/@{name}-docs.jar" classifier="javadoc" /> <artifact:localRepository path="@{repository}" id="${repository.credentials.id}" /> <extra-attachments /> </artifact:install> @@ -107,24 +103,14 @@ <attribute name="repository" /> <attribute name="version" /> <sequential> - <deploy-local name="scala-library" version="@{version}" repository="@{repository}"> - <extra-attachments> - <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-library" version="@{version}" repository="@{repository}" /> <deploy-local name="scala-compiler" version="@{version}" repository="@{repository}" /> + <deploy-local-plugin name="continuations" 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}"/> - <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" /> - </extra-attachments> - </deploy-local> - --> + <deploy-local name="jline" version="@{version}" repository="@{repository}"/> </sequential> </macrodef> </target> @@ -159,6 +145,8 @@ <make-pom-plugin name="@{name}" version="@{version}" /> <artifact:deploy file="plugins/@{name}/@{name}.jar" settingsFile="${settings.file}"> <artifact:pom refid="plugin-@{name}.pom" /> + <artifact:attach type="jar" file="plugins/@{name}/@{name}-src.jar" classifier="sources" /> + <artifact:attach type="jar" file="plugins/@{name}/@{name}-docs.jar" classifier="javadoc" /> <artifact:remoteRepository url="@{repository}" id="${repository.credentials.id}" /> <extra-attachments /> </artifact:deploy> @@ -182,12 +170,6 @@ <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" /> - </extra-attachments> - </deploy-remote> - --> </sequential> </macrodef> |