diff options
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 38 |
1 files changed, 23 insertions, 15 deletions
@@ -266,7 +266,7 @@ INITIALISATION <property name="scalac.args.optimise" value=""/> <!-- scalac.args.quickonly are added to quick.* targets but not others (particularly, locker.) This is to facilitate testing new command line options which do not yet exist in starr. --> - <property name="scalac.args.quickonly" value=""/> + <property name="scalac.args.quickonly" value=""/> <property name="scalac.args.all" value="${scalac.args} ${scalac.args.optimise}"/> <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> <!-- Setting-up Ant contrib tasks --> @@ -282,13 +282,10 @@ INITIALISATION </condition> <exec osfamily="unix" executable="tools/get-scala-commit-sha" outputproperty="git.commit.sha" failifexecutionfails="false" /> - <exec osfamily="windows" executable="tools/get-scala-commit-sha.bat" outputproperty="git.commit.sha" failifexecutionfails="false" /> <exec osfamily="unix" executable="tools/get-scala-commit-date" outputproperty="git.commit.date" failifexecutionfails="false" /> - <exec osfamily="windows" executable="tools/get-scala-commit-date.bat" outputproperty="git.commit.date" failifexecutionfails="false" /> - <exec osfamily="unix" executable="tools/get-scala-commit-drift" outputproperty="git.commit.drift" failifexecutionfails="false" /> - <exec osfamily="windows" executable="tools/get-scala-commit-drift.bat" outputproperty="git.commit.drift" failifexecutionfails="false" /> <!-- some default in case something went wrong getting the revision --> - <property name="git.describe" value="-unknown-"/> + <property name="git.commit.sha" value="unknown"/> + <property name="git.commit.date" value="unknown"/> <!-- We use the git describe to determine the OSGi modifier for our build. --> <property @@ -296,7 +293,7 @@ INITIALISATION value="${version.major}.${version.minor}.${version.patch}${version.suffix}${maven.version.suffix}"/> <property name="version.number" - value="${maven.version.number}-${git.commit.date}-${git.commit.drift}-${git.commit.sha}"/> + value="${version.major}.${version.minor}.${version.patch}${version.suffix}-${git.commit.date}-${git.commit.sha}"/> <property name="osgi.version.number" value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${version.suffix}-${git.commit.sha}"/> @@ -331,7 +328,9 @@ INITIALISATION <echo message=" java version: ${java.vm.name} ${java.version}" /> <echo message=" java args: ${env.ANT_OPTS} ${jvm.opts}" /> <echo message=" javac args: ${javac.args}" /> - <echo message=" scalac args: ${scalac.args}" /> + <echo message=" scalac args: ${scalac.args.all}" /> + <echo message=" git date: ${git.commit.date}" /> + <echo message=" git hash: ${git.commit.sha}" /> <echo message=" maven version: ${maven.version.number}"/> <echo message=" OSGi version: ${osgi.version.number}" /> <echo message="canonical version: ${version.number}" /> @@ -610,9 +609,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> @@ -991,6 +990,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> @@ -1004,6 +1004,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"> @@ -1133,6 +1138,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"/> @@ -1156,8 +1162,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> @@ -1585,8 +1591,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> @@ -1596,7 +1602,7 @@ DOCUMENTATION <mkdir dir="${build-docs.dir}/library"/> <scaladoc destdir="${build-docs.dir}/library" - doctitle="Scala Standard Library" + doctitle="Scala Standard Library API (Scaladoc)" docversion="${version.number}" docfooter="epfl" docsourceurl="https://lampsvn.epfl.ch/trac/scala/browser/scala/trunk/src/€{FILE_PATH}.scala#L1" @@ -1604,7 +1610,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"/> @@ -1963,7 +1969,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"> @@ -1975,6 +1980,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> @@ -2051,8 +2059,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> |