diff options
| author | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-03-19 17:14:21 +0100 |
|---|---|---|
| committer | Vojin Jovanovic <vojin.jovanovic@epfl.ch> | 2012-03-19 17:14:21 +0100 |
| commit | a38fd5c324899eeafe725f5499d53a14c8766ce7 (patch) | |
| tree | c802d89ad4d402fb281b35d3bde7c5aca6a98029 /src/build/pack.xml | |
| parent | 78c15103d54e58b0ecd193b90e2d56b967967d6c (diff) | |
| download | scala-a38fd5c324899eeafe725f5499d53a14c8766ce7.tar.gz scala-a38fd5c324899eeafe725f5499d53a14c8766ce7.tar.bz2 scala-a38fd5c324899eeafe725f5499d53a14c8766ce7.zip | |
Separating Scala Actors from the Scala Library.
Scala actors are now in scala-actors.jar. Changes that were done are:
- Fixed partest to include actors library for various test usages
- Created the entry for the new jar in build.xml
- Added maven entries for scala actors
Review by: @jsuereth
Diffstat (limited to 'src/build/pack.xml')
| -rw-r--r-- | src/build/pack.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/build/pack.xml b/src/build/pack.xml index e79895e3a8..c12cfa44bf 100644 --- a/src/build/pack.xml +++ b/src/build/pack.xml @@ -114,8 +114,8 @@ MAIN DISTRIBUTION SBAZ version="${version.number}" desc="The Scala library. This is the minimal requirement to run any Scala program." link="${sbaz.universe}/scala-library-${version.number}.sbp"> - <libset dir="${dist.dir}/lib" includes="scala-library.jar,scala-dbc.jar,scala-swing.jar"/> - <srcset dir="${dist.dir}/src" includes="scala-library-src.jar,scala-dbc-src.jar,scala-swing-src.jar"/> + <libset dir="${dist.dir}/lib" includes="scala-library.jar,scala-dbc.jar,scala-swing.jar,scala-actors.jar"/> + <srcset dir="${dist.dir}/src" includes="scala-library-src.jar,scala-dbc-src.jar,scala-swing-src.jar,scala-actors-src.jar"/> <looseset destination="doc"> <fileset dir="${dist.dir}/doc" includes="LICENSE,README"/> </looseset> @@ -228,6 +228,7 @@ MAIN DISTRIBUTION SBAZ <mvn-copy-lib mvn.artifact.name="scala-compiler"/> <mvn-copy-lib mvn.artifact.name="scala-dbc"/> <mvn-copy-lib mvn.artifact.name="scala-swing"/> + <mvn-copy-lib mvn.artifact.name="scala-actors"/> <mvn-copy-lib mvn.artifact.name="scala-partest"/> <mvn-copy-lib mvn.artifact.name="scalap"/> </target> @@ -290,11 +291,13 @@ MAIN DISTRIBUTION SBAZ basedir="${build-docs.dir}/continuations-plugin"> <include name="**/*"/> </jar> - <!-- TODO - Scala swing, dbc should maybe have thier own jar, but creating it is SLOW. --> + <!-- TODO - Scala swing, dbc and actors 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"/> + <copy tofile="${dists.dir}/maven/${version.number}/scala-actors/scala-actors-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"> |