diff options
| author | Martin Odersky <odersky@gmail.com> | 2012-04-12 18:55:13 -0700 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2012-04-12 18:55:13 -0700 |
| commit | 6061a22fcd3480e18e60254ad06c8a46b2f1ce53 (patch) | |
| tree | 12e7d3a1798a186d641e3de21430fc6de0470727 /build.xml | |
| parent | f7a0558059559305a88ffa2c28506b29b2bc57f2 (diff) | |
| parent | 39a88f5680c3a16bf7ca856683989a2f5481bf69 (diff) | |
| download | scala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.tar.gz scala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.tar.bz2 scala-6061a22fcd3480e18e60254ad06c8a46b2f1ce53.zip | |
Merge branch 'master' into topic/sip18
Conflicts:
src/compiler/scala/reflect/internal/Definitions.scala
Various improvements to SIP 18 reporting. Made scala library and compiler feature-clean.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -170,7 +170,7 @@ PROPERTIES <property file="${basedir}/build.number"/> <!-- Additional command line arguments for scalac. They are added to all build targets --> - <property name="scalac.args" value=""/> + <property name="scalac.args" value="-Xmacros"/> <property name="javac.args" value=""/> <!-- Sets location of pre-compiled libraries --> @@ -283,7 +283,9 @@ 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" /> <!-- some default in case something went wrong getting the revision --> <property name="git.commit.sha" value="unknown"/> <property name="git.commit.date" value="unknown"/> @@ -824,7 +826,7 @@ QUICK BUILD (QUICK) <scalacfork destdir="${build-quick.dir}/classes/library" compilerpathref="quick.classpath" - params="${scalac.args.quick} -Xplugin-require:continuations" + params="${scalac.args.quick} -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1361,7 +1363,7 @@ BOOTSTRAPPING BUILD (STRAP) <scalacfork destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" - params="${scalac.args.all} -Xplugin-require:continuations" + params="${scalac.args.all} -Xplugin-require:continuations -P:continuations:enable" srcdir="${src.dir}/continuations/library" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1935,7 +1937,7 @@ BOOTRAPING TEST AND TEST SUITE <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" timeout="2400000" srcdir="${partest.srcdir}" - scalacopts="${scalac.args.optimise} -Xplugin-require:continuations"> + scalacopts="${scalac.args.optimise} -Xplugin-require:continuations -P:continuations:enable"> <compilerarg value="-Xpluginsdir"/> <compilerarg file="${build-quick.dir}/misc/scala-devel/plugins"/> <compilationpath> |