changeset in /hg/icedtea: 2008-01-16 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Wed Jan 16 08:11:58 PST 2008
changeset 258f1268bd5e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=258f1268bd5e
description:
2008-01-16 Lillian Angel <langel at redhat.com>
* patches/icedtea-ecj.patch
(langtools/make/Makefile): Removed JAVAC, and added javac.executable
to ANT_OPTIONS. The correct javac is now used when ant is run.
(jaxws/make/Makefile): Likewise.
(jaxp/make/Makefile): Likewise.
(langtools/make/build.xml): Added executable arg to all javac
instances.
(jaxp/make/build.xml): Likewise.
(jaxws/make/build.xml): Likewise.
diffstat:
2 files changed, 189 insertions(+), 164 deletions(-)
ChangeLog | 12 +
patches/icedtea-ecj.patch | 341 +++++++++++++++++++++++----------------------
diffs (404 lines):
diff -r 23b096c586ef -r 258f1268bd5e ChangeLog
--- a/ChangeLog Mon Jan 14 00:41:35 2008 -0500
+++ b/ChangeLog Wed Jan 16 11:07:41 2008 -0500
@@ -1,3 +1,15 @@ 2008-01-14 Lillian Angel <langel at redha
+2008-01-16 Lillian Angel <langel at redhat.com>
+
+ * patches/icedtea-ecj.patch
+ (langtools/make/Makefile): Removed JAVAC, and added javac.executable
+ to ANT_OPTIONS. The correct javac is now used when ant is run.
+ (jaxws/make/Makefile): Likewise.
+ (jaxp/make/Makefile): Likewise.
+ (langtools/make/build.xml): Added executable arg to all javac
+ instances.
+ (jaxp/make/build.xml): Likewise.
+ (jaxws/make/build.xml): Likewise.
+
2008-01-14 Lillian Angel <langel at redhat.com>
* patches/icedtea-libraries.patch
diff -r 23b096c586ef -r 258f1268bd5e patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Mon Jan 14 00:41:35 2008 -0500
+++ b/patches/icedtea-ecj.patch Wed Jan 16 11:07:41 2008 -0500
@@ -91,28 +91,6 @@
$(ECHO) "}; }" >> $$classname; \
done
$(TOUCH) $@
---- openjdk.old/langtools/make/Makefile 2007-10-29 10:51:24.000000000 -0400
-+++ openjdk-ecj/langtools/make/Makefile 2007-10-29 10:56:14.000000000 -0400
-@@ -113,7 +113,7 @@
-
- ifdef ALT_BOOTDIR
- ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+ ANT_JAVA_HOME = JAVAC=$(ALT_BOOTDIR)/bin/javac
- endif
-
- ifdef ALT_OUTPUTDIR
---- openjdk.old/jaxp/make/Makefile 2007-10-29 10:51:24.000000000 -0400
-+++ openjdk-ecj/jaxp/make/Makefile 2007-10-29 10:57:29.000000000 -0400
-@@ -80,7 +80,7 @@
- endif
-
- ifdef ALT_BOOTDIR
-- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+ ANT_JAVA_HOME = JAVAC=$(ALT_BOOTDIR)/bin/javac
- endif
-
- ifdef ALT_OUTPUTDIR
--- openjdk.old/corba/make/org/omg/sources/Makefile 2007-10-12 03:49:14.000000000 -0400
+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2007-10-30 11:57:03.000000000 -0400
@@ -93,8 +93,6 @@
@@ -650,63 +628,6 @@ diff -ru openjdk-ecj.orig/langtools/make
# options for the <javadoc> task for javac
javadoc.jls3.url=http://java.sun.com/docs/books/jls/
-diff -ru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
---- openjdk-ecj.orig/jaxp/make/build.xml 2007-10-12 08:50:26.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2007-11-09 10:25:54.000000000 +0000
-@@ -71,7 +71,8 @@
- <mkdir dir="${build.toolclasses.dir}"/>
- <javac srcdir="${make.tools.dir}/StripProperties"
- destdir="${build.toolclasses.dir}/"
-- classpath="${ant.home}/lib/ant.jar"/>
-+ classpath="${ant.home}/lib/ant.jar"
-+ source="1.5"/>
- <taskdef name="pstrip"
- classname="StripPropertiesTask"
- classpath="${build.toolclasses.dir}/"/>
-@@ -85,7 +86,8 @@
- destdir="${build.classes.dir}"
- memoryInitialSize="${javac.memoryInitialSize}"
- memoryMaximumSize="${javac.memoryMaximumSize}"
-- target="${javac.target}">
-+ target="${javac.target}"
-+ source="1.5">
- <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
- <compilerarg line="${javac.version.opt}"/>
- </javac>
---- openjdk.old/langtools/make/build.xml 2007-10-12 03:47:30.000000000 -0400
-+++ openjdk-ecj/langtools/make/build.xml 2007-11-12 10:30:47.000000000 -0500
-@@ -497,7 +497,9 @@
- includes="@{includes}"
- sourcepath=""
- includeAntRuntime="no"
-- target="@{javac.target}">
-+ target="@{javac.target}"
-+ source="1.5">
-+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
- <compilerarg line="${javac.version.opt}"/>
- <compilerarg line="-Xlint"/>
-@@ -511,7 +513,9 @@
- includeAntRuntime="no"
- target="@{javac.target}"
- debug="${javac.debug}"
-- debuglevel="${javac.debuglevel}">
-+ debuglevel="${javac.debuglevel}"
-+ source="1.5">
-+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
- <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
- <compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -563,7 +567,8 @@
- <mkdir dir="${build.toolclasses.dir}"/>
- <javac srcdir="${make.tools.dir}/CompileProperties"
- destdir="${build.toolclasses.dir}/"
-- classpath="${ant.home}/lib/ant.jar"/>
-+ classpath="${ant.home}/lib/ant.jar"
-+ source="1.5"/>
- <taskdef name="pcompile"
- classname="CompilePropertiesTask"
- classpath="${build.toolclasses.dir}/"/>
--- openjdk.old/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2007-10-12 03:54:09.000000000 -0400
+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2007-11-13 10:29:46.000000000 -0500
@@ -647,9 +647,6 @@
@@ -749,19 +670,6 @@ diff -ru openjdk-ecj.orig/jaxp/make/buil
# Langtools
ifdef LANGTOOLS_DIST
---- oiipenjdk/jaxws/make/Makefile 2007-11-13 11:02:07.000000000 -0500
-+++ openjdk-ecj/jaxws/make/Makefile 2007-11-13 10:09:36.000000000 -0500
-@@ -80,8 +80,8 @@
- endif
-
- ifdef ALT_BOOTDIR
-- ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
-- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-+ ANT_JAVA_HOME = JAVAC=$(ALT_BOOTDIR)/bin/javac
- endif
-
- ifdef ALT_OUTPUTDIR
--- oipenjdk/make/jdk-rules.gmk 2007-10-30 04:00:10.000000000 -0400
+++ openjdk-ecj/make/jdk-rules.gmk 2007-11-13 14:54:50.000000000 -0500
@@ -63,7 +63,7 @@
@@ -876,19 +784,168 @@ diff -ru openjdk-ecj.orig/jaxp/make/buil
ifneq ($(PLATFORM), windows)
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
endif # !windows
---- opeinjdk//jaxws/make/build.xml 2007-11-13 16:47:23.000000000 -0500
-+++ openjdk-ecj/jaxws/make/build.xml 2007-11-13 16:48:08.000000000 -0500
-@@ -84,7 +84,8 @@
+--- opeiinjdk/jdk/src/share/classes/java/lang/Float.java 2007-10-30 04:36:02.000000000 -0400
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2007-11-13 16:53:02.000000000 -0500
+@@ -76,7 +76,7 @@
+ * {@code 0x1.fffffeP+127f} and also equal to
+ * {@code Float.intBitsToFloat(0x7f7fffff)}.
+ */
+- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
++ public static final float MAX_VALUE = 3.4028235e+38f;
+
+ /**
+ * A constant holding the smallest positive normal value of type
+@@ -86,7 +86,7 @@
+ *
+ * @since 1.6
+ */
+- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
++ public static final float MIN_NORMAL = 1.17549435E-38f;
+
+ /**
+ * A constant holding the smallest positive nonzero value of type
+@@ -94,7 +94,7 @@
+ * hexadecimal floating-point literal {@code 0x0.000002P-126f}
+ * and also equal to {@code Float.intBitsToFloat(0x1)}.
+ */
+- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
++ public static final float MIN_VALUE = 1.4e-45f;
+
+ /**
+ * Maximum exponent a finite {@code float} variable may have. It
+--- opienjdk/jdk/src/share/classes/java/lang/Double.java 2007-10-30 04:36:02.000000000 -0400
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2007-11-13 16:53:02.000000000 -0500
+@@ -76,7 +76,7 @@
+ * {@code 0x1.fffffffffffffP+1023} and also equal to
+ * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
+ */
+- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
++ public static final double MAX_VALUE = 1.7976931348623157e+308;
+
+ /**
+ * A constant holding the smallest positive normal value of type
+@@ -86,7 +86,7 @@
+ *
+ * @since 1.6
+ */
+- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
++ public static final double MIN_NORMAL = 2.2250738585072014E-308;
+
+ /**
+ * A constant holding the smallest positive nonzero value of type
+@@ -95,7 +95,7 @@
+ * {@code 0x0.0000000000001P-1022} and also equal to
+ * {@code Double.longBitsToDouble(0x1L)}.
+ */
+- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
++ public static final double MIN_VALUE = 4.9e-324;
+
+ /**
+ * Maximum exponent a finite {@code double} variable may have.
+--- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2007-12-10 15:46:46.000000000 -0500
++++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2007-12-19 09:53:07.000000000 -0500
+@@ -332,7 +332,6 @@
+ (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
+ (.println pw "//")
+ (.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
+- (.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
+ (.println pw)))
+
+ (define (write-factory-method class-name exception-group-name pw)
+--- openjdk.old/langtools/make/Makefile 2008-01-16 10:23:52.000000000 -0500
++++ openjdk-ecj/langtools/make/Makefile 2008-01-16 10:42:51.000000000 -0500
+@@ -113,7 +113,7 @@
+
+ ifdef ALT_BOOTDIR
+ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
+- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+
+ ifdef ALT_OUTPUTDIR
+--- openjdk.old/langtools/make/build.xml 2008-01-07 10:12:20.000000000 -0500
++++ openjdk-ecj/langtools/make/build.xml 2008-01-16 10:40:54.000000000 -0500
+@@ -497,7 +497,10 @@
+ includes="@{includes}"
+ sourcepath=""
+ includeAntRuntime="no"
+- target="@{javac.target}">
++ target="@{javac.target}"
++ executable="${javac.executable}"
++ source="1.5">
++ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
+ <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+ <compilerarg line="${javac.version.opt}"/>
+ <compilerarg line="-Xlint"/>
+@@ -511,7 +514,10 @@
+ includeAntRuntime="no"
+ target="@{javac.target}"
+ debug="${javac.debug}"
+- debuglevel="${javac.debuglevel}">
++ executable="${javac.executable}"
++ debuglevel="${javac.debuglevel}"
++ source="1.5">
++ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
+ <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+ <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
+ <compilerarg line="${javac.no.jdk.warnings}"/>
+@@ -562,8 +568,11 @@
+ <target name="-def-pcompile">
+ <mkdir dir="${build.toolclasses.dir}"/>
+ <javac srcdir="${make.tools.dir}/CompileProperties"
++ fork="true"
+ destdir="${build.toolclasses.dir}/"
+- classpath="${ant.home}/lib/ant.jar"/>
++ classpath="${ant.home}/lib/ant.jar"
++ executable="${javac.executable}"
++ source="1.5"/>
+ <taskdef name="pcompile"
+ classname="CompilePropertiesTask"
+ classpath="${build.toolclasses.dir}/"/>
+--- openjdk.old/jaxp/make/build.xml 2008-01-07 10:07:02.000000000 -0500
++++ openjdk-ecj/jaxp/make/build.xml 2008-01-16 10:59:22.000000000 -0500
+@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
destdir="${build.toolclasses.dir}/"
- classpath="${ant.home}/lib/ant.jar"/>
+ classpath="${ant.home}/lib/ant.jar"
++ fork="true"
++ executable="${javac.executable}"
+ source="1.5"/>
<taskdef name="pstrip"
classname="StripPropertiesTask"
classpath="${build.toolclasses.dir}/"/>
-@@ -99,9 +100,10 @@
+@@ -85,7 +88,9 @@
+ destdir="${build.classes.dir}"
+ memoryInitialSize="${javac.memoryInitialSize}"
+ memoryMaximumSize="${javac.memoryMaximumSize}"
+- target="${javac.target}">
++ target="${javac.target}"
++ executable="${javac.executable}"
++ source="1.5">
+ <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
+ <compilerarg line="${javac.version.opt}"/>
+ </javac>
+--- openjdk.old/jaxws/make/build.xml 2008-01-16 10:23:52.000000000 -0500
++++ openjdk-ecj/jaxws/make/build.xml 2008-01-16 11:01:00.000000000 -0500
+@@ -84,7 +84,10 @@
+ <mkdir dir="${build.toolclasses.dir}"/>
+ <javac srcdir="${make.tools.dir}/StripProperties"
+ destdir="${build.toolclasses.dir}/"
+- classpath="${ant.home}/lib/ant.jar"/>
++ fork="true"
++ executable="${javac.executable}"
++ classpath="${ant.home}/lib/ant.jar"
++ source="1.5"/>
+ <taskdef name="pstrip"
+ classname="StripPropertiesTask"
+ classpath="${build.toolclasses.dir}/"/>
+@@ -96,12 +99,14 @@
+ <javac fork="true"
+ srcdir="${src.classes.dir}"
+ destdir="${build.classes.dir}"
++ executable="${javac.executable}"
memoryInitialSize="${javac.memoryInitialSize}"
memoryMaximumSize="${javac.memoryMaximumSize}"
target="${javac.target}"
@@ -902,71 +959,27 @@ diff -ru openjdk-ecj.orig/jaxp/make/buil
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
</javac>
---- opeiinjdk/jdk/src/share/classes/java/lang/Float.java 2007-10-30 04:36:02.000000000 -0400
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2007-11-13 16:53:02.000000000 -0500
-@@ -76,7 +76,7 @@
- * {@code 0x1.fffffeP+127f} and also equal to
- * {@code Float.intBitsToFloat(0x7f7fffff)}.
- */
-- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
-+ public static final float MAX_VALUE = 3.4028235e+38f;
-
- /**
- * A constant holding the smallest positive normal value of type
-@@ -86,7 +86,7 @@
- *
- * @since 1.6
- */
-- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
-+ public static final float MIN_NORMAL = 1.17549435E-38f;
-
- /**
- * A constant holding the smallest positive nonzero value of type
-@@ -94,7 +94,7 @@
- * hexadecimal floating-point literal {@code 0x0.000002P-126f}
- * and also equal to {@code Float.intBitsToFloat(0x1)}.
- */
-- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
-+ public static final float MIN_VALUE = 1.4e-45f;
-
- /**
- * Maximum exponent a finite {@code float} variable may have. It
---- opienjdk/jdk/src/share/classes/java/lang/Double.java 2007-10-30 04:36:02.000000000 -0400
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2007-11-13 16:53:02.000000000 -0500
-@@ -76,7 +76,7 @@
- * {@code 0x1.fffffffffffffP+1023} and also equal to
- * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
- */
-- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
-+ public static final double MAX_VALUE = 1.7976931348623157e+308;
-
- /**
- * A constant holding the smallest positive normal value of type
-@@ -86,7 +86,7 @@
- *
- * @since 1.6
- */
-- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
-+ public static final double MIN_NORMAL = 2.2250738585072014E-308;
-
- /**
- * A constant holding the smallest positive nonzero value of type
-@@ -95,7 +95,7 @@
- * {@code 0x0.0000000000001P-1022} and also equal to
- * {@code Double.longBitsToDouble(0x1L)}.
- */
-- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
-+ public static final double MIN_VALUE = 4.9e-324;
-
- /**
- * Maximum exponent a finite {@code double} variable may have.
---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2007-12-10 15:46:46.000000000 -0500
-+++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2007-12-19 09:53:07.000000000 -0500
-@@ -332,7 +332,6 @@
- (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
- (.println pw "//")
- (.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
-- (.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
- (.println pw)))
-
- (define (write-factory-method class-name exception-group-name pw)
+--- openjdk.old/jaxp/make/Makefile 2008-01-16 10:23:52.000000000 -0500
++++ openjdk-ecj/jaxp/make/Makefile 2008-01-16 11:02:39.000000000 -0500
+@@ -80,7 +80,7 @@
+ endif
+
+ ifdef ALT_BOOTDIR
+- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+
+ ifdef ALT_OUTPUTDIR
+--- openjdk.old/jaxws/make/Makefile 2008-01-16 10:23:52.000000000 -0500
++++ openjdk-ecj/jaxws/make/Makefile 2008-01-16 11:03:10.000000000 -0500
+@@ -80,8 +80,8 @@
+ endif
+
+ ifdef ALT_BOOTDIR
+- ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
+- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+
+ ifdef ALT_OUTPUTDIR
More information about the distro-pkg-dev
mailing list