diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-20 11:39:47 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-07-05 15:51:28 -0700 |
commit | 4340f799da2c7a7097eb327c353d0d96084197f8 (patch) | |
tree | 3054df65ce7ed66bb2911a70795d57a734e8c2d3 /src/build/pack.xml | |
parent | b672009b43f6cbfd8cb22402f4f40b9201157e23 (diff) | |
download | scala-4340f799da2c7a7097eb327c353d0d96084197f8.tar.gz scala-4340f799da2c7a7097eb327c353d0d96084197f8.tar.bz2 scala-4340f799da2c7a7097eb327c353d0d96084197f8.zip |
Spin off src/library/scala/xml to src/xml/scala/xml.
Summary:
- Remove the last vestiges of xml from Predef and Contexts.
- Change build to compile scala.xml to scala-xml.jar.
- Deploy scala-xml module to maven.
- Update partest accordingly.
Note:
An older compiler cannot use the new standard library to
compile projects that use XML. Thus, skipping locker will
break the build until we use 2.11.0-M4 for STARR.
In the future build process, where we drop locker,
we would have to release a milestone that supports the old
and the new approach to xml. As soon as we'd be using that
new milestone for starr, we could drop support for the old approach.
Diffstat (limited to 'src/build/pack.xml')
-rw-r--r-- | src/build/pack.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml index f8eb3c67c5..44198adb1e 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -153,6 +153,7 @@ MAIN DISTRIBUTION PACKAGING </macrodef> <mvn-copy-lib mvn.artifact.name="jline"/> <mvn-copy-lib mvn.artifact.name="scala-library"/> + <mvn-copy-lib mvn.artifact.name="scala-xml"/> <mvn-copy-lib mvn.artifact.name="scala-reflect"/> <mvn-copy-lib mvn.artifact.name="scala-compiler"/> <mvn-copy-lib mvn.artifact.name="scala-swing"/> @@ -203,6 +204,10 @@ 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-compiler/scala-compiler-docs.jar" basedir="${build-docs.dir}/compiler"> <include name="**/*"/> |