You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2006/10/17 00:01:10 UTC
svn commit: r464689 - in /incubator/harmony/enhanced/classlib/trunk/make:
build-java.xml build-test.xml properties.xml
Author: ndbeyer
Date: Mon Oct 16 15:01:08 2006
New Revision: 464689
URL: http://svn.apache.org/viewvc?view=rev&rev=464689
Log:
Set ECJ as the default compiler in the build scripts; add a check and fail missing class.
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
incubator/harmony/enhanced/classlib/trunk/make/properties.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=464689&r1=464688&r2=464689
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Mon Oct 16 15:01:08 2006
@@ -125,6 +125,13 @@
================================= -->
<target name="-compile"
depends="-copy-kernel-patternsets,-prepare-depends">
+ <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>
+ <available classname="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ </not>
+ </condition>
+ </fail>
<mkdir dir="${build.output}" />
<javac fork="yes"
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?view=diff&rev=464689&r1=464688&r2=464689
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Mon Oct 16 15:01:08 2006
@@ -91,6 +91,13 @@
<target name="compile-support" depends="copy-test-resources, check-support-jars"
description="Compile the unit test source">
+ <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>
+ <available classname="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ </not>
+ </condition>
+ </fail>
<mkdir dir="${tests.support.output}" />
<javac
destdir="${tests.support.output}"
Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=464689&r1=464688&r2=464689
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Mon Oct 16 15:01:08 2006
@@ -23,8 +23,8 @@
</description>
<!-- Javac properties -->
- <!-- Set compiler to org.eclipse.jdt.core.JDTCompilerAdapter to use ECJ. -->
- <property name="hy.javac.compiler" value="modern" />
+ <!-- Explicitly set to ECJ as the default compiler. -->
+ <property name="hy.javac.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
<property name="hy.javac.source" value="1.5" />
<property name="hy.javac.target" value="1.5" />
<property name="hy.javac.debug" value="on" />