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 /build.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 'build.xml')
-rw-r--r-- | build.xml | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -614,9 +614,9 @@ QUICK BUILD (QUICK) <srcfiles dir="${src.dir}"> <include name="library/**"/> <include name="dbc/**"/> - <include name="actors/**"/> <include name="continuations/**"/> <include name="swing/**"/> + <include name="actors/**"/> </srcfiles> </uptodate> </target> @@ -995,6 +995,7 @@ PACKED QUICK BUILD (PACK) <fileset dir="${build-quick.dir}/classes/library"> <exclude name="scala/dbc/**"/> <exclude name="scala/swing/**"/> + <exclude name="scala/actors/**"/> </fileset> <zipfileset dirmode="755" filemode="644" src="${forkjoin.jar}"/> </jar> @@ -1008,6 +1009,11 @@ PACKED QUICK BUILD (PACK) <include name="scala/swing/**"/> </fileset> </jar> + <jar destfile="${build-pack.dir}/lib/scala-actors.jar"> + <fileset dir="${build-quick.dir}/classes/library"> + <include name="scala/actors/**"/> + </fileset> + </jar> </target> <target name="pack.pre-comp" depends="pack.lib"> @@ -1137,6 +1143,7 @@ PACKED QUICK BUILD (PACK) <pathelement location="${build-pack.dir}/lib/scala-compiler.jar"/> <pathelement location="${build-pack.dir}/lib/scala-partest.jar"/> <pathelement location="${build-pack.dir}/lib/scalap.jar"/> + <pathelement location="${build-pack.dir}/lib/scala-actors.jar"/> <pathelement location="${ant.jar}"/> <pathelement location="${jline.jar}"/> <path refid="lib.extra"/> @@ -1160,8 +1167,8 @@ BOOTSTRAPPING BUILD (STRAP) <srcfiles dir="${src.dir}"> <include name="library/**"/> <include name="dbc/**"/> - <include name="actors/**"/> <include name="swing/**"/> + <include name="actors/**"/> </srcfiles> </uptodate> </target> @@ -1589,8 +1596,8 @@ DOCUMENTATION <source-includes> <include name="library/**"/> <include name="dbc/**"/> - <include name="actors/**"/> <include name="swing/**"/> + <include name="actors/**"/> </source-includes> </doc-uptodate-check> </target> @@ -1608,7 +1615,7 @@ DOCUMENTATION sourcepath="${src.dir}" classpathref="pack.classpath" addparams="${scalac.args.all}" - docRootContent="${src.dir}/library/rootdoc.txt"> + docRootContent="${src.dir}/library/rootdoc.txt"> <src> <files includes="${src.dir}/actors"/> <files includes="${src.dir}/library/scala"/> @@ -1967,7 +1974,6 @@ DISTRIBUTION <mkdir dir="${dist.dir}/src"/> <jar destfile="${dist.dir}/src/scala-library-src.jar"> <fileset dir="${src.dir}/library"/> - <fileset dir="${src.dir}/actors"/> <fileset dir="${src.dir}/continuations/library"/> </jar> <jar destfile="${dist.dir}/src/scala-dbc-src.jar"> @@ -1979,6 +1985,9 @@ DISTRIBUTION <jar destfile="${dist.dir}/src/scala-compiler-src.jar"> <fileset dir="${src.dir}/compiler"/> </jar> + <jar destfile="${dist.dir}/src/scala-actors-src.jar"> + <fileset dir="${src.dir}/actors"/> + </jar> <jar destfile="${dist.dir}/src/scalap-src.jar"> <fileset dir="${src.dir}/scalap"/> </jar> @@ -2055,8 +2064,8 @@ STABLE REFERENCE (STARR) <target name="starr.src" depends="starr.comp"> <jar destfile="${basedir}/lib/scala-library-src.jar"> <fileset dir="${basedir}/src/library"/> - <fileset dir="${basedir}/src/actors"/> <fileset dir="${basedir}/src/swing"/> + <fileset dir="${basedir}/src/actors"/> <fileset dir="${basedir}/src/dbc"/> </jar> </target> |