diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-13 22:23:54 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-19 10:26:11 -0800 |
| commit | 94ca91dd5f404015bdfa94e373ed94c284761a1d (patch) | |
| tree | e28fad37679e3b26ddcfbd3d49c163e7ba002bf1 /build-ant-macros.xml | |
| parent | 846d8d119514ba631c08235d2352bfa49821f265 (diff) | |
| download | scala-94ca91dd5f404015bdfa94e373ed94c284761a1d.tar.gz scala-94ca91dd5f404015bdfa94e373ed94c284761a1d.tar.bz2 scala-94ca91dd5f404015bdfa94e373ed94c284761a1d.zip | |
Prepare maven-based distribution building.
NOTE: `maven/latest/build.xml` is now deprecated.
To publish a Scala build, simply call `ant publish` or `ant publish-local`.
`maven/latest/build.xml` will soon disappear from `dists/`
The idea is that a Scala distribution is a simple
repackaging of artifacts already available on maven.
Already available: typical jars for the artifacts (classes, sources, scaladoc).
To add: the bin/, doc/, and man/ directories.
Thus, move the contents that should end up in the distribution
from docs/ to doc/, create the man/ directory with the manpages,
and include the scripts in bin/.
Next up: package these directories in a jar and publish to maven,
with a dependency on scala-library-all, scala-reflect and scala-compiler,
for the jars that should end up in the distribution.
Refactorings:
- Pull filter-pom out from deploy-one.
- Rename maven-base to dist.maven.
- Set all properties in the init target (dist.maven)
Diffstat (limited to 'build-ant-macros.xml')
| -rw-r--r-- | build-ant-macros.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml index 593f93b784..0b92f1dab1 100644 --- a/build-ant-macros.xml +++ b/build-ant-macros.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="build-support"> +<project name="build-support" xmlns:artifact="urn:maven-artifact-ant"> <description> Macros for Scala's ant build </description> <macrodef name="optimized"> @@ -451,8 +451,8 @@ <attribute name="project"/> <sequential> <local name="artifact-base"/> - <property name="artifact-base" value="${maven-base}/${@{project}.dir}${@{project}.name}/${@{project}.name}"/> - <mkdir dir="${maven-base}/${@{project}.dir}${@{project}.name}"/> + <property name="artifact-base" value="${dist.maven}/${@{project}.dir}${@{project}.name}/${@{project}.name}"/> + <mkdir dir="${dist.maven}/${@{project}.dir}${@{project}.name}"/> <copy tofile="${artifact-base}.jar" file="${build-osgi.dir}/org.scala-lang.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.jar" overwrite="true"/> <copy tofile="${artifact-base}-src.jar" file="${build-osgi.dir}/${@{project}.name}-src.jar" overwrite="true"/> <copy tofile="${artifact-base}-pom.xml" file="${src.dir}/build/maven/${@{project}.dir}/${@{project}.name}-pom.xml" overwrite="true"/> @@ -469,7 +469,8 @@ </sequential> </macrodef> - + <!-- TODO inline maven-deploy.xml's macrodefs, remove maven-deploy.xml --> + <include file="src/build/maven/maven-deploy.xml" as="deploy-macros"/> <macrodef name="testSuite"> <attribute name="dir" default="${partest.dir}"/> |