diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-14 10:00:30 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-14 10:08:36 -0700 |
commit | 3ab383ae01a66208df4955bf2117dd2ea8eb2afe (patch) | |
tree | ac83e7e89310955ccbc317f57f34165f9781117c /src/build/pack.xml | |
parent | b6dde2b6cf5f66e96fc92c09c1fbe3b4a8dc348c (diff) | |
parent | 5dca64cefeed4bc3289e641949b103e5e806aa32 (diff) | |
download | scala-3ab383ae01a66208df4955bf2117dd2ea8eb2afe.tar.gz scala-3ab383ae01a66208df4955bf2117dd2ea8eb2afe.tar.bz2 scala-3ab383ae01a66208df4955bf2117dd2ea8eb2afe.zip |
Merge branch 'master' into merge-inline
Conflicts:
lib/scala-compiler.jar.desired.sha1
lib/scala-library-src.jar.desired.sha1
lib/scala-library.jar.desired.sha1
src/compiler/scala/reflect/internal/Definitions.scala
src/compiler/scala/reflect/internal/Importers.scala
src/compiler/scala/reflect/internal/Symbols.scala
src/compiler/scala/reflect/internal/Trees.scala
src/compiler/scala/reflect/internal/Types.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/transform/Erasure.scala
src/compiler/scala/tools/nsc/transform/LiftCode.scala
src/compiler/scala/tools/nsc/transform/UnCurry.scala
src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
test/files/run/programmatic-main.check
test/files/speclib/instrumented.jar.desired.sha1
Diffstat (limited to 'src/build/pack.xml')
-rw-r--r-- | src/build/pack.xml | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml index 05e49e5e81..90aec8e25b 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -11,6 +11,9 @@ PROPERTIES ============================================================================ --> <property name="sbaz.universe" value="http://www.scala-lang.org/downloads/packages"/> + <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" --> <!-- =========================================================================== MAIN DISTRIBUTION PACKAGING @@ -248,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"> |