You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/11/28 13:48:18 UTC
svn commit: r480026 - /harmony/enhanced/classlib/trunk/make/build-java.xml
Author: mloenko
Date: Tue Nov 28 04:48:17 2006
New Revision: 480026
URL: http://svn.apache.org/viewvc?view=rev&rev=480026
Log:
replay r479762 with some changes allowing to take only necessary jar files
Modified:
harmony/enhanced/classlib/trunk/make/build-java.xml
Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=480026&r1=480025&r2=480026
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Tue Nov 28 04:48:17 2006
@@ -108,7 +108,7 @@
<!-- =================================
target: -compile
================================= -->
- <target name="-compile" depends="-prepare-depends">
+ <target name="-compile" depends="-prepare-depends, -layout">
<fail message="The Eclipse compiler class for Ant could not be found. Please place the ECJ JAR in ANT_HOME/lib. The JAR can copied from CLASSLIB_TRUNK/depends/jars/ecj_3.2 folder after the fetch-depends target has been run.">
<condition>
<not>
@@ -118,13 +118,12 @@
</fail>
<mkdir dir="${build.output}" />
- <javac fork="yes"
- compiler="${hy.javac.compiler}"
- memoryMaximumSize="${hy.javac.maxmem}"
+ <javac compiler="${hy.javac.compiler}"
destdir="${build.output}"
source="${hy.javac.source}"
target="${hy.javac.target}"
- debug="${hy.javac.debug}">
+ debug="${hy.javac.debug}"
+ includeAntRuntime="no">
<compilerarg line="${build.compilerarg}" />
@@ -168,10 +167,19 @@
<src path="modules/x-net/src/main/java/" />
<classpath>
- <fileset dir="${depends.jars}">
+ <fileset dir="${hy.jdk}/jre/lib/boot">
<include name="**/*.jar" />
</fileset>
</classpath>
+
+ <!-- We need to set some BCP to avoid the compiler picking
+ up the JRE's JARs -->
+ <bootclasspath>
+ <fileset dir="${depends.jars}">
+ <!-- FIXME: picked mx4j arbitrarily, needs to be non-empty set -->
+ <include name="**/mx4j.jar" />
+ </fileset>
+ </bootclasspath>
</javac>
<call-modules target="build" />