diff options
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 42 |
1 files changed, 4 insertions, 38 deletions
@@ -249,7 +249,7 @@ INITIALISATION <!-- Resolve maven dependencies --> <target name="init.maven.jars" depends="init.maven.tasks"> <artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset"> - <dependency groupId="org.skife.com.typesafe.config" artifactId="typesafe-config" version="0.3.0"/> + <dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/> </artifact:dependencies> </target> @@ -415,7 +415,7 @@ LOCAL REFERENCE BUILD (LOCKER) classpath="${build-locker.dir}/classes/library" includes="**/*.java" target="1.5" source="1.5"> - <compilerarg line="${javac.args}"/> + <compilerarg line="${javac.args} -XDignore.symbol.file"/> </javac> <!-- NOTE: Potential problem with maximal command line length on Windows (32768 characters for XP, since executed with Java's "exec"). See @@ -643,7 +643,6 @@ QUICK BUILD (QUICK) <uptodate property="quick.lib.available" targetfile="${build-quick.dir}/library.complete"> <srcfiles dir="${src.dir}"> <include name="library/**"/> - <include name="dbc/**"/> <include name="continuations/**"/> <include name="swing/**"/> <include name="actors/**"/> @@ -660,7 +659,7 @@ QUICK BUILD (QUICK) classpath="${build-quick.dir}/classes/library" includes="**/*.java" target="1.5" source="1.5"> - <compilerarg line="${javac.args}"/> + <compilerarg line="${javac.args} -XDignore.symbol.file"/> </javac> <javac srcdir="${src.dir}/actors" @@ -693,15 +692,6 @@ QUICK BUILD (QUICK) destdir="${build-quick.dir}/classes/library" compilerpathref="locker.classpath" params="${scalac.args.quick}" - srcdir="${src.dir}/dbc" - jvmargs="${scalacfork.jvmargs}"> - <include name="**/*.scala"/> - <compilationpath refid="quick.compilation.path"/> - </scalacfork> - <scalacfork - destdir="${build-quick.dir}/classes/library" - compilerpathref="locker.classpath" - params="${scalac.args.quick}" srcdir="${src.dir}/swing" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1028,17 +1018,11 @@ PACKED QUICK BUILD (PACK) </copy> <jar destfile="${build-pack.dir}/lib/scala-library.jar"> <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> - <jar destfile="${build-pack.dir}/lib/scala-dbc.jar"> - <fileset dir="${build-quick.dir}/classes/library"> - <include name="scala/dbc/**"/> - </fileset> - </jar> <jar destfile="${build-pack.dir}/lib/scala-swing.jar"> <fileset dir="${build-quick.dir}/classes/library"> <include name="scala/swing/**"/> @@ -1201,7 +1185,6 @@ BOOTSTRAPPING BUILD (STRAP) <uptodate property="strap.lib.available" targetfile="${build-strap.dir}/library.complete"> <srcfiles dir="${src.dir}"> <include name="library/**"/> - <include name="dbc/**"/> <include name="swing/**"/> <include name="actors/**"/> </srcfiles> @@ -1217,7 +1200,7 @@ BOOTSTRAPPING BUILD (STRAP) classpath="${build-strap.dir}/classes/library" includes="**/*.java" target="1.5" source="1.5"> - <compilerarg line="${javac.args}"/> + <compilerarg line="${javac.args} -XDignore.symbol.file"/> </javac> <javac srcdir="${src.dir}/actors" @@ -1250,15 +1233,6 @@ BOOTSTRAPPING BUILD (STRAP) destdir="${build-strap.dir}/classes/library" compilerpathref="pack.classpath" params="${scalac.args.all}" - srcdir="${src.dir}/dbc" - jvmargs="${scalacfork.jvmargs}"> - <include name="**/*.scala"/> - <compilationpath refid="strap.compilation.path"/> - </scalacfork> - <scalacfork - destdir="${build-strap.dir}/classes/library" - compilerpathref="pack.classpath" - params="${scalac.args.all}" srcdir="${src.dir}/swing" jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> @@ -1645,7 +1619,6 @@ DOCUMENTATION <doc-uptodate-check name="library" srcdir="${src.dir}"> <source-includes> <include name="library/**"/> - <include name="dbc/**"/> <include name="swing/**"/> <include name="actors/**"/> </source-includes> @@ -2033,9 +2006,6 @@ DISTRIBUTION <fileset dir="${src.dir}/library"/> <fileset dir="${src.dir}/continuations/library"/> </jar> - <jar destfile="${dist.dir}/src/scala-dbc-src.jar"> - <fileset dir="${src.dir}/dbc"/> - </jar> <jar destfile="${dist.dir}/src/scala-swing-src.jar"> <fileset dir="${src.dir}/swing"/> </jar> @@ -2123,7 +2093,6 @@ STABLE REFERENCE (STARR) <fileset dir="${basedir}/src/library"/> <fileset dir="${basedir}/src/swing"/> <fileset dir="${basedir}/src/actors"/> - <fileset dir="${basedir}/src/dbc"/> </jar> </target> @@ -2226,9 +2195,6 @@ POSITIONS <param name="test.srcs" value="${src.dir}/actors"/> </antcall> <antcall target="test.positions.sub" inheritRefs="true"> - <param name="test.srcs" value="${src.dir}/dbc"/> - </antcall> - <antcall target="test.positions.sub" inheritRefs="true"> <param name="test.srcs" value="${src.dir}/swing"/> </antcall> <antcall target="test.positions.sub" inheritRefs="true"> |