diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-09-06 14:03:49 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-09-06 14:03:49 -0700 |
| commit | d6fe8905af690c176ed52e89bb2989c27000bcee (patch) | |
| tree | 4c9b60c80f75a23bf6efeb3dbd594deb9399a09c /src/build/pack.xml | |
| parent | 6dd565ff9b73a3ebc8f702e01d46eca78b423dd9 (diff) | |
| parent | 15155567fb78b0ccb009477e9b38061913b7489d (diff) | |
| download | scala-2.11.0-M5.tar.gz scala-2.11.0-M5.tar.bz2 scala-2.11.0-M5.zip | |
Merge pull request #2855 from adriaanm/modularize-xml-parsersv2.11.0-M5
Modularize: xml & parser-combinators
Diffstat (limited to 'src/build/pack.xml')
| -rw-r--r-- | src/build/pack.xml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml index fa030300ac..8e2d2f19fa 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -10,9 +10,12 @@ PROPERTIES ============================================================================ --> - <property file="${basedir}/build.number.maven"/> <!-- the maven stuff requires version.major, version.minor and version.patch properties. the "get-scala-revision" script only returns "version.number" --> + <property file="${basedir}/build.number.maven"/> + <!-- also need to know scala binary version and versions for xml and parsers --> + <property file="${basedir}/versions.properties"/> + <!-- =========================================================================== MAIN DISTRIBUTION PACKAGING @@ -152,8 +155,6 @@ MAIN DISTRIBUTION PACKAGING </sequential> </macrodef> <mvn-copy-lib mvn.artifact.name="scala-library"/> - <mvn-copy-lib mvn.artifact.name="scala-xml"/> - <mvn-copy-lib mvn.artifact.name="scala-parser-combinators"/> <mvn-copy-lib mvn.artifact.name="scala-reflect"/> <mvn-copy-lib mvn.artifact.name="scala-compiler"/> <mvn-copy-lib mvn.artifact.name="scala-swing"/> @@ -193,14 +194,6 @@ MAIN DISTRIBUTION PACKAGING basedir="${build-docs.dir}/library"> <include name="**/*"/> </jar> - <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-xml/scala-xml-docs.jar" - basedir="${build-docs.dir}/xml"> - <include name="**/*"/> - </jar> - <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-parser-combinators/scala-parser-combinators-docs.jar" - basedir="${build-docs.dir}/parser-combinators"> - <include name="**/*"/> - </jar> <jar whenmanifestonly="fail" destfile="${dists.dir}/maven/${version.number}/scala-compiler/scala-compiler-docs.jar" basedir="${build-docs.dir}/compiler"> <include name="**/*"/> |