diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-12 18:34:08 +0100 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-12 18:34:08 +0100 |
| commit | 27a978ab89a7e5036e55e072f7a5d09d8ea817e6 (patch) | |
| tree | cebeb6b8ea6560f649cf3d000f162cd9bed45ddb /build.xml | |
| parent | 39a88f5680c3a16bf7ca856683989a2f5481bf69 (diff) | |
| download | scala-27a978ab89a7e5036e55e072f7a5d09d8ea817e6.tar.gz scala-27a978ab89a7e5036e55e072f7a5d09d8ea817e6.tar.bz2 scala-27a978ab89a7e5036e55e072f7a5d09d8ea817e6.zip | |
Reconfigure build.xml so -Xmacros isn't lost.
For future reference, -Dscalac.args is how unknown things
pass arbitrary parameters to scalac, so you don't want to put
anything there you don't expect to lose.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 5 |
1 files changed, 3 insertions, 2 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="-Xmacros"/> + <property name="scalac.args" value=""/> <property name="javac.args" value=""/> <!-- Sets location of pre-compiled libraries --> @@ -314,12 +314,13 @@ INITIALISATION <target name="init.version.done" depends="init.version.release, init.version.snapshot"/> <target name="init" depends="init.jars, init.maven.jars, init.version.done"> + <property name="scalac.args.always" value="-Xmacros" /> <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. --> <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.all" value="${scalac.args} ${scalac.args.optimise}"/> + <property name="scalac.args.all" value="${scalac.args.always} ${scalac.args} ${scalac.args.optimise}"/> <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> <!-- Setting-up Ant contrib tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/> |