diff options
Diffstat (limited to 'src/build')
-rw-r--r-- | src/build/maven/maven-deploy.xml | 35 | ||||
-rw-r--r-- | src/build/pack.xml | 35 |
2 files changed, 40 insertions, 30 deletions
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index 679f45ab54..1137481a59 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -57,13 +57,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"> @@ -79,6 +72,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> @@ -94,6 +88,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> @@ -106,24 +102,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> @@ -142,6 +128,7 @@ <artifact:pom refid="@{name}.pom" /> <artifact:remoteRepository url="@{repository}" id="${repository.credentials.id}" /> <artifact:attach type="jar" file="@{name}/@{name}-src.jar" classifier="sources" /> + <artifact:attach type="jar" file="@{name}/@{name}-doc.jar" classifier="javadoc" /> <extra-attachments /> </artifact:deploy> </sequential> @@ -158,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> @@ -181,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> </target> diff --git a/src/build/pack.xml b/src/build/pack.xml index d022ac3f05..90aec8e25b 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -251,23 +251,50 @@ MAIN DISTRIBUTION SBAZ </target> <target name="pack-maven.srcs" depends="pack-maven.libs"> + <!-- Add missing src jars. --> <jar destfile="${dists.dir}/maven/${version.number}/jline/jline-src.jar" basedir="${src.dir}/jline/src/main/java"> <include name="**/*"/> </jar> + + + <!-- Continuations plugin --> + <jar 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"> + <jar destfile="${dists.dir}/maven/${version.number}/jline/jline-docs.jar" + basedir="${build-docs.dir}/jline"> + <include name="**/*"/> + </jar> <jar destfile="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar" basedir="${build-docs.dir}/library"> <include name="**/*"/> </jar> - <!-- scala-swing api is included in main library api - <jar destfile="${dists.dir}/maven/${version.number}/scala-swing/scala-swing-docs.jar" - basedir="${build-docs.dir}/swing"> + <jar destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar" + basedir="${build-docs.dir}/compiler"> + <include name="**/*"/> + </jar> + <jar destfile="${dists.dir}/maven/${version.number}/scalap/scalap-docs.jar" + basedir="${build-docs.dir}/scalap"> + <include name="**/*"/> + </jar> + <jar destfile="${dists.dir}/maven/${version.number}/scala-partest/scala-partest-docs.jar" + basedir="${build-docs.dir}/scala-partest"> + <include name="**/*"/> + </jar> + <jar destfile="${dists.dir}/maven/${version.number}/plugins/continuations/continuations-docs.jar" + basedir="${build-docs.dir}/continuations-plugin"> <include name="**/*"/> </jar> - --> + <!-- TODO - Scala swing, dbc 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"/> + <copy tofile="${dists.dir}/maven/${version.number}/scala-dbc/scala-dbc-docs.jar" + file="${dists.dir}/maven/${version.number}/scala-library/scala-library-docs.jar"/> </target> <target name="pack-maven.latest.unix" depends="pack-maven.docs" unless="os.win"> |