changeset in /hg/icedtea: 2007-11-12 Lillian Angel <langel at red...

[Lillian Angel]

changeset 316d327a6198 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=316d327a6198
description:
	2007-11-12  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-ecj.patch: Updated. Added bootclasspath to
	        langtools/make/build.xml. Resolves EnumSet error.

diffstat:

2 files changed, 39 insertions(+), 33 deletions(-)
ChangeLog                 |    5 +++
patches/icedtea-ecj.patch |   67 ++++++++++++++++++++++-----------------------

diffs (93 lines):

diff -r 43613182340c -r 316d327a6198 ChangeLog
--- a/ChangeLog	Mon Nov 12 06:37:43 2007 -0500
+++ b/ChangeLog	Mon Nov 12 11:08:12 2007 -0500
@@ -1,3 +1,8 @@ 2007-11-12  Gary Benson  <gbenson at redhat
+2007-11-12  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-ecj.patch: Updated. Added bootclasspath to
+	langtools/make/build.xml. Resolves EnumSet error.
+
 2007-11-12  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/build/linux/platform_ppc: New file.
diff -r 43613182340c -r 316d327a6198 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Mon Nov 12 06:37:43 2007 -0500
+++ b/patches/icedtea-ecj.patch	Mon Nov 12 11:08:12 2007 -0500
@@ -810,39 +810,6 @@ diff -ruN openjdk.old/corba/make/com/sun
  
  # Langtools
  ifdef LANGTOOLS_DIST
-diff -ru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
---- openjdk-ecj.orig/langtools/make/build.xml	2007-10-12 08:47:30.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml	2007-11-09 10:25:54.000000000 +0000
-@@ -497,7 +497,8 @@
-                        includes="@{includes}"
-                        sourcepath=""
-                        includeAntRuntime="no"
--                       target="@{javac.target}">
-+                       target="@{javac.target}"
-+                       source="1.5">
-                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
-                     <compilerarg line="${javac.version.opt}"/>
-                     <compilerarg line="-Xlint"/>
-@@ -511,7 +512,8 @@
-                        includeAntRuntime="no"
-                        target="@{javac.target}"
-                        debug="${javac.debug}" 
--                       debuglevel="${javac.debuglevel}">
-+                       debuglevel="${javac.debuglevel}"
-+                       source="1.5">
-                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
-                     <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
-                     <compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -563,7 +565,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}/"/>
 diff -ru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
 --- openjdk-ecj.orig/langtools/make/build.properties	2007-10-12 08:47:30.000000000 +0100
 +++ openjdk-ecj/langtools/make/build.properties	2007-11-09 10:25:54.000000000 +0000
@@ -878,3 +845,37 @@ diff -ru openjdk-ecj.orig/jaxp/make/buil
           <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}/"/>