diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-10-22 16:09:26 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-10-22 17:03:25 -0700 |
| commit | d925c2155d59fe009c49e52341ce563bee6b085c (patch) | |
| tree | 3d51fea04a985710631ca3984ef87da3a558be18 /src/build | |
| parent | 331d32b2b34d3a97bcc753b26a5441971d7cd4b4 (diff) | |
| download | scala-d925c2155d59fe009c49e52341ce563bee6b085c.tar.gz scala-d925c2155d59fe009c49e52341ce563bee6b085c.tar.bz2 scala-d925c2155d59fe009c49e52341ce563bee6b085c.zip | |
Build cleanup. Prepare for scaladoc module build.
Diffstat (limited to 'src/build')
| -rw-r--r-- | src/build/maven/maven-deploy.xml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml index 3607aa5e5e..90bfaa419b 100644 --- a/src/build/maven/maven-deploy.xml +++ b/src/build/maven/maven-deploy.xml @@ -9,9 +9,8 @@ <macrodef name="deploy-one"> <attribute name="dir" default=""/> <attribute name="name" /> - <attribute name="version" /> - <attribute name="local" /> - <attribute name="signed" /> + <attribute name="local" default="false"/> + <attribute name="signed" default="false"/> <sequential> <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/> @@ -20,7 +19,7 @@ <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true"> <filterset> - <filter token="VERSION" value="@{version}" /> + <filter token="VERSION" value="${maven.version.number}" /> <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" /> <filter token="XML_VERSION" value="${scala-xml.version.number}" /> <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" /> @@ -85,13 +84,13 @@ <attribute name="signed" default="false"/> <sequential> - <deploy-one dir="@{dir}" name="scala-actors" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> - <deploy-one dir="@{dir}" name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> - <deploy-one dir="@{dir}" name="scala-library" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> - <deploy-one dir="@{dir}" name="scala-reflect" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> - <deploy-one dir="@{dir}" name="scala-swing" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> - <deploy-one dir="@{dir}" name="scalap" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> - <deploy-one dir="@{dir}plugins/" name="continuations" version="${maven.version.number}" local="@{local}" signed="@{signed}"/> + <deploy-one dir="@{dir}" name="scala-library" local="@{local}" signed="@{signed}"/> + <deploy-one dir="@{dir}" name="scala-reflect" local="@{local}" signed="@{signed}"/> + <deploy-one dir="@{dir}" name="scala-compiler" local="@{local}" signed="@{signed}"/> + <deploy-one dir="@{dir}" name="scala-actors" local="@{local}" signed="@{signed}"/> + <deploy-one dir="@{dir}" name="scala-swing" local="@{local}" signed="@{signed}"/> + <deploy-one dir="@{dir}" name="scalap" local="@{local}" signed="@{signed}"/> + <deploy-one dir="@{dir}plugins/" name="continuations" local="@{local}" signed="@{signed}"/> </sequential> </macrodef> |