/hg/icedtea: 2 new changesets
cpdev-commits at icedtea.classpath.org
cpdev-commits at icedtea.classpath.org
Mon Aug 24 17:24:45 PDT 2009
changeset 92838f870914 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=92838f870914
summary: Cleanup #07: Remove source/target from javac.in, unset JAVA_HOME and QUIETLY.
changeset 26c1a149107b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=26c1a149107b
summary: Bump to b70.
diffstat:
7 files changed, 136 insertions(+), 211 deletions(-)
ChangeLog | 27 ++++
Makefile.am | 158 ++++++++++-------------------
javac.in | 8 -
patches/ecj/icedtea-hotspot-default.patch | 48 +++++---
patches/ecj/icedtea-sbcs.patch | 22 ++--
patches/icedtea-graphics.patch | 60 -----------
patches/icedtea-testenv.patch | 24 +---
diffs (truncated from 544 to 500 lines):
diff -r 939e978ee73a -r 26c1a149107b ChangeLog
--- a/ChangeLog Mon Aug 17 16:34:18 2009 +0100
+++ b/ChangeLog Tue Aug 25 01:27:11 2009 +0100
@@ -1,3 +1,30 @@ 2009-08-17 Andrew John Hughes <ahughes
+2009-08-24 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-graphics.patch:
+ Removed; applied upstream.
+ * Makefile.am: Bump to b70.
+ * patches/ecj/icedtea-sbcs.patch,
+ * patches/icedtea-testenv.patch:
+ Recreated.
+
+2009-08-21 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Add variables for source, target and other
+ javac settings so they are standardised across
+ the build. Set JAVA_HOME and JDK_HOME to ""
+ to avoid build failures. Set QUIETLY to ""
+ to display HotSpot javac invocations. Remove
+ duplicate javac invocations now targets depend
+ on INITIAL_BOOTSTRAP_LINK_STAMP.
+ * javac.in:
+ Remove 1.7 setting. Add ecj_parms so same
+ parameters are used for all ecj invocations.
+ * patches/ecj/icedtea-hotspot-default.patch:
+ Make SA_CLASSPATH contain the whole CLASSPATH
+ and use SA_TOOLS_JAR and SA_RT_JAR for the individual
+ files.
+
2009-08-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 939e978ee73a -r 26c1a149107b Makefile.am
--- a/Makefile.am Mon Aug 17 16:34:18 2009 +0100
+++ b/Makefile.am Tue Aug 25 01:27:11 2009 +0100
@@ -1,20 +1,20 @@ OPENJDK_VERSION = b69
-OPENJDK_VERSION = b69
-
-OPENJDK_CHANGESET = 2914e1cb084e
-CORBA_CHANGESET = a0eefb08a314
-JAXP_CHANGESET = fa81a375c19a
-JAXWS_CHANGESET = bcf234d82efa
-JDK_CHANGESET = bd5e610df2e8
-LANGTOOLS_CHANGESET = ce9bcdcb7859
-HOTSPOT_CHANGESET = 12b81df6076d
-
-OPENJDK_MD5SUM = 37c6c85e9bfc58ee4f0312f32cdfc524
-CORBA_MD5SUM = 8e800563935f4a8603585d182204286d
-JAXP_MD5SUM = fc6c3556e5932ce1155498e894d85b93
-JAXWS_MD5SUM = 6b7ba2f3b438e8c71ba7ad380c7b15bf
-JDK_MD5SUM = 0e4c01b569edb101c8a2f3f0b1933fd6
-LANGTOOLS_MD5SUM = 0df12414550c8022b85f3106b303f0c5
-HOTSPOT_MD5SUM = eb455e08a9a305714a971abecbdb78db
+OPENJDK_VERSION = b70
+
+OPENJDK_CHANGESET = 1bbbd5c42f3a
+CORBA_CHANGESET = 309d97756352
+JAXP_CHANGESET = df9569f46ae8
+JAXWS_CHANGESET = c33dece1b2b3
+JDK_CHANGESET = 1b0f308e49c3
+LANGTOOLS_CHANGESET = 742987f2c0d2
+HOTSPOT_CHANGESET = 468ea732650d
+
+OPENJDK_MD5SUM = 84dabfc7b592490dcd4b2a232bde44ef
+CORBA_MD5SUM = ec0de438056ee14c48deb510c0d583dc
+JAXP_MD5SUM = 732708e633ffef87fb4095ecbbf4add0
+JAXWS_MD5SUM = 492e61bf7f96d3832b3246c01c716aa8
+JDK_MD5SUM = f286fbed4ffb4bb5d368e8cab11b50fd
+LANGTOOLS_MD5SUM = a0a13535ef6eec2292daa14f4cfe849d
+HOTSPOT_MD5SUM = 9e2a49be9371abe80c6fb1bd4ad3de3e
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -75,6 +75,11 @@ OPENJDK_SOURCEPATH_DIRS = \
$(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
+
+IT_LANGUAGE_SOURCE_VERSION=5
+IT_CLASS_TARGET_VERSION=5
+IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS)
+IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
# Top-Level Targets
# =================
@@ -1567,6 +1572,9 @@ ICEDTEA_ENV = \
ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
JAVAC="" \
+ JAVA_HOME="" \
+ JDK_HOME="" \
+ QUIETLY="" \
ANT_RESPECT_JAVA_HOME="TRUE" \
RHINO_JAR="$(RHINO_JAR)" \
DISTRIBUTION_ID="$(DIST_ID)" \
@@ -1651,6 +1659,9 @@ ICEDTEA_ENV_ECJ = \
ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
JAVAC="" \
+ JAVA_HOME="" \
+ JDK_HOME="" \
+ QUIETLY="" \
RHINO_JAR="$(RHINO_JAR)" \
JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
@@ -1999,7 +2010,6 @@ ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-version.patch \
patches/icedtea-copy-plugs.patch \
patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \
- patches/icedtea-graphics.patch \
patches/icedtea-ssl.patch \
$(PLUGIN_PATCH) \
patches/icedtea-webstart.patch \
@@ -3003,19 +3013,11 @@ hotspot-tools-source-files.txt: stamps/g
stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \
$(INITIAL_BOOTSTRAP_LINK_STAMP)
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
- -sourcepath \
- 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
- -bootclasspath \'\' @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
- -d lib/hotspot-tools \
- -sourcepath \
- 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
- -bootclasspath \'\' @$< ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \
+ -d lib/hotspot-tools \
+ -sourcepath \
+ 'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
+ -bootclasspath \'\' @$< ;
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -3028,17 +3030,10 @@ clean-hotspot-tools:
# tools.jar
bootstrap/jdk1.7.0/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/lib/
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
- -C lib/hotspot-tools org -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com \
- -C lib/hotspot-tools sun \
- -C lib/hotspot-tools org -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com \
+ -C lib/hotspot-tools sun \
+ -C lib/hotspot-tools org -C lib/hotspot-tools java \
+ -C lib/hotspot-tools javax ;
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -3053,18 +3048,10 @@ rt-source-files.txt: stamps/extract.stam
stamps/rt-class-files.stamp: rt-source-files.txt stamps/hotspot-tools.stamp
mkdir -p lib/rt
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
- -classpath $(abs_top_builddir)/lib/hotspot-tools \
- -sourcepath '$(SOURCEPATH_DIRS)' \
- -bootclasspath \'\' @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
- -classpath $(abs_top_builddir)/lib/hotspot-tools \
- -sourcepath '$(SOURCEPATH_DIRS)' \
- -bootclasspath \'\' @$< ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d lib/rt \
+ -classpath $(abs_top_builddir)/lib/hotspot-tools \
+ -sourcepath '$(SOURCEPATH_DIRS)' \
+ -bootclasspath \'\' @$< ;
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -3076,14 +3063,8 @@ clean-rt:
# rt-closed.jar.
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAR) cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt sun ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt sun ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
+ -C lib/rt javax -C lib/rt sun ;
if test -d bootstrap/ecj/jre/lib ; \
then \
cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
@@ -3096,20 +3077,11 @@ extra-source-files.txt:
stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp
mkdir -p extra-lib
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
- -classpath $(abs_top_builddir)/lib/hotspot-tools \
- -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
- -bootclasspath \'\' \
- @extra-source-files.txt ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
- -classpath $(abs_top_builddir)/lib/hotspot-tools \
- -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
- -bootclasspath \'\' \
- @extra-source-files.txt ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) -d extra-lib \
+ -classpath $(abs_top_builddir)/lib/hotspot-tools \
+ -sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
+ -bootclasspath \'\' \
+ @extra-source-files.txt ; \
cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
extra-lib/net/sourceforge/jnlp/about
find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \
@@ -3139,7 +3111,7 @@ netx-source-files.txt:
stamps/netx.stamp: netx-source-files.txt stamps/hotspot-tools.stamp
mkdir -p $(abs_top_builddir)/netx.build
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) $(IT_JAVACFLAGS) \
-d $(abs_top_builddir)/netx.build \
-classpath $(abs_top_builddir)/lib/hotspot-tools \
-sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \
@@ -3308,12 +3280,7 @@ stamps/pulse-java-jar.stamp: stamps/puls
stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
if ENABLE_PULSE_JAVA
mkdir -p $(PULSE_JAVA_CLASS_DIR);
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- $(JAR) cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .;
endif
mkdir -p stamps
touch stamps/pulse-java-jar.stamp
@@ -3321,22 +3288,11 @@ stamps/pulse-java-class.stamp: $(INITIAL
stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
if ENABLE_PULSE_JAVA
mkdir -p $(PULSE_JAVA_CLASS_DIR)
- if ! test -d $(ICEDTEA_BOOT_DIR) ; \
- then \
- (cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(JAVAC) -g -d $(PULSE_JAVA_CLASS_DIR) \
- -bootclasspath \
- '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_builddir)/generated' \
- org/classpath/icedtea/pulseaudio/*.java\
- ) \
- else \
- (cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR)\
- -bootclasspath \
- '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
- org/classpath/icedtea/pulseaudio/*.java\
- ) \
- fi
+ (cd $(PULSE_JAVA_JAVA_SRCDIR); \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR)\
+ -bootclasspath '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
+ org/classpath/icedtea/pulseaudio/*.java\
+ )
cp -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
endif
@@ -3487,8 +3443,8 @@ stamps/jtreg.stamp: stamps/icedtea.stamp
stamps/jtreg.stamp: stamps/icedtea.stamp
rm -rf test/jtreg/classes
mkdir -p test/jtreg/classes
- $(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
- -encoding iso-8859-1 `find $(abs_top_srcdir)/test/jtreg/com -name '*.java'`
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \
+ `find $(abs_top_srcdir)/test/jtreg/com -name '*.java'`
(cd $(abs_top_srcdir)/test/jtreg; \
$(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
META-INF/MANIFEST.MF \
diff -r 939e978ee73a -r 26c1a149107b javac.in
--- a/javac.in Mon Aug 17 16:34:18 2009 +0100
+++ b/javac.in Tue Aug 25 01:27:11 2009 +0100
@@ -19,6 +19,7 @@ my @bcoption;
my @bcoption;
push @bcoption, '-bootclasspath', glob '@SYSTEM_JDK_DIR@/jre/lib/rt.jar'
unless grep {$_ eq '-bootclasspath'} @ARGV;
+my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
# Work around ecj's inability to handle duplicate command-line
# options.
@@ -47,14 +48,14 @@ if ( -e "@abs_top_builddir@/native-ecj"
if ( -e "@abs_top_builddir@/native-ecj" )
{
my @ecj_args = gen_ecj_opts( \@ARGV );
- exec '@abs_top_builddir@/native-ecj', '-1.7', $ECJ_WARNINGS, @bcoption, @ecj_args ;
+ exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ;
}
elsif ( -e "@JAVAC@" )
{
if ("@USING_ECJ@" eq "yes")
{
my @ecj_args = gen_ecj_opts( \@ARGV );
- exec '@JAVAC@', '-1.7', $ECJ_WARNINGS, @bcoption, @ecj_args ;
+ exec '@JAVAC@', @ecj_parms, @ecj_args ;
}
else
{
@@ -67,6 +68,5 @@ else
my @CLASSPATH = ('@ECJ_JAR@');
push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
- exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', '-1.7',
- $ECJ_WARNINGS, @bcoption, @ecj_args;
+ exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
}
diff -r 939e978ee73a -r 26c1a149107b patches/ecj/icedtea-hotspot-default.patch
--- a/patches/ecj/icedtea-hotspot-default.patch Mon Aug 17 16:34:18 2009 +0100
+++ b/patches/ecj/icedtea-hotspot-default.patch Tue Aug 25 01:27:11 2009 +0100
@@ -1,7 +1,7 @@ diff -Nru openjdk-ecj.orig/hotspot/make/
diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100
-@@ -263,28 +263,24 @@
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2009-08-18 17:44:09.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile 2009-08-18 18:56:52.000000000 +0100
+@@ -274,28 +274,24 @@
$(TARGETS_C2): $(SUBDIRS_C2)
cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -31,18 +31,32 @@ diff -Nru openjdk-ecj.orig/hotspot/make/
cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
endif
diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100
-@@ -74,8 +74,8 @@
- mkdir -p $(SA_CLASSDIR); \
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2009-08-18 17:35:29.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2009-08-18 19:54:42.000000000 +0100
+@@ -38,7 +38,9 @@
+ GENERATED = $(TOPDIR)/../generated
+
+ # tools.jar is needed by the JDI - SA binding
+-SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
++SA_TOOLS_JAR = $(BOOT_JAVA_HOME)/lib/tools.jar
++SA_RT_JAR = $(BOOT_JAVA_HOME)/jre/lib/rt.jar
++SA_CLASSPATH = $(SA_TOOLS_JAR):$(SA_RT_JAR)
+
+ # gnumake 3.78.1 does not accept the *s that
+ # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
+@@ -65,8 +67,13 @@
+ echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
+ exit 1; \
fi
-
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
-
-
+- $(QUIETLY) if [ ! -f $(SA_CLASSPATH) ] ; then \
+- echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
++ $(QUIETLY) if [ ! -f $(SA_TOOLS_JAR) ] ; then \
++ echo "Missing $(SA_TOOLS_JAR) file. Use 1.6.0 or later version of JDK";\
++ echo ""; \
++ exit 1; \
++ fi
++ $(QUIETLY) if [ ! -f $(SA_RT_JAR) ] ; then \
++ echo "Missing $(SA_RT_JAR) file. Use 1.6.0 or later version of JDK";\
+ echo ""; \
+ exit 1; \
+ fi
diff -r 939e978ee73a -r 26c1a149107b patches/ecj/icedtea-sbcs.patch
--- a/patches/ecj/icedtea-sbcs.patch Mon Aug 17 16:34:18 2009 +0100
+++ b/patches/ecj/icedtea-sbcs.patch Tue Aug 25 01:27:11 2009 +0100
@@ -1,15 +1,15 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-07-01 11:39:50.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-07-01 12:24:04.000000000 +0100
-@@ -27,7 +27,6 @@
-
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-08-24 15:47:02.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-08-24 16:07:07.000000000 +0100
+@@ -28,7 +28,6 @@
import java.io.*;
+ import java.util.Arrays;
import java.util.ArrayList;
-import java.util.Scanner;
import java.util.Formatter;
import java.util.regex.*;
import java.nio.charset.*;
-@@ -37,9 +36,8 @@
+@@ -38,9 +37,8 @@
public static void genSBCS(String args[]) throws Exception {
@@ -21,15 +21,15 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
if (line.startsWith("#") || line.length() == 0)
continue;
String[] fields = line.split("\\s+");
-@@ -198,12 +196,10 @@
- int c2blen)
- throws Exception
- {
+@@ -208,12 +206,11 @@
+ String b2cNR = b2cNRSB.toString();
+ String c2bNR = c2bNRSB.toString();
+
- Scanner s = new Scanner(new File(srcDir, template));
-+ BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template)));
++ BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template)));
PrintStream out = new PrintStream(new FileOutputStream(
new File(dstDir, clzName + ".java")));
--
+
- while (s.hasNextLine()) {
- String line = s.nextLine();
+ for (String line = s.readLine(); line != null; line = s.readLine()) {
diff -r 939e978ee73a -r 26c1a149107b patches/icedtea-graphics.patch
--- a/patches/icedtea-graphics.patch Mon Aug 17 16:34:18 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
---- ../opienjdkb23/openjdk/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java 2007-10-30 04:37:06.000000000 -0400
-+++ openjdk/jdk/src/share/classes/javax/swing/text/WrappedPlainView.java 2007-11-13 12:50:52.000000000 -0500
-@@ -236,9 +236,6 @@
- Segment segment = SegmentCache.getSharedSegment();
- loadText(segment, p0, p1);
- int currentWidth = getWidth();
-- if (currentWidth == Integer.MAX_VALUE) {
-- currentWidth = (int) getDefaultSpan(View.X_AXIS);
-- }
- if (wordWrap) {
- p = p0 + Utilities.getBreakLocation(segment, metrics,
- tabBase, tabBase + currentWidth,
-@@ -324,20 +321,6 @@
- tabSize = getTabSize() * metrics.charWidth('m');
- }
-
-- /**
-- * Return reasonable default values for the view dimensions. The standard
-- * text terminal size 80x24 is pretty suitable for the wrapped plain view.
-- */
-- private float getDefaultSpan(int axis) {
-- switch (axis) {
-- case View.X_AXIS:
-- return 80 * metrics.getWidths()['M'];
-- case View.Y_AXIS:
-- return 24 * metrics.getHeight();
-- default:
-- throw new IllegalArgumentException("Invalid axis: " + axis);
-- }
-- }
-
- // --- TabExpander methods ------------------------------------------
-
-@@ -573,19 +556,16 @@
- if (width == Integer.MAX_VALUE) {
- // We have been initially set to MAX_VALUE, but we don't
- // want this as our preferred.
-- width = getDefaultSpan(axis);
-+ return 100f;
- }
- return width;
- case View.Y_AXIS:
-- if (getDocument().getLength() > 0) {
-- if ((lineCount < 0) || widthChanging) {
-- breakLines(getStartOffset());
-- }
-- return lineCount * metrics.getHeight();
-- } else {
-- return getDefaultSpan(axis);
-- }
-- default:
-+ if (lineCount < 0 || widthChanging) {
-+ breakLines(getStartOffset());
-+ }
-+ int h = lineCount * metrics.getHeight();
-+ return h;
-+ default:
- throw new IllegalArgumentException("Invalid axis: " + axis);
- }
- }
diff -r 939e978ee73a -r 26c1a149107b patches/icedtea-testenv.patch
--- a/patches/icedtea-testenv.patch Mon Aug 17 16:34:18 2009 +0100
+++ b/patches/icedtea-testenv.patch Tue Aug 25 01:27:11 2009 +0100
More information about the distro-pkg-dev
mailing list