Mercurial > hg > release > icedtea7-2.2
changeset 1563:70396cb4abf8
Some build fixes for IcedTea7.
2009-01-28 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Rename PULSEAUDIO_SOURCES and JTREG_SOURCES
to avoid conflict with autoconf names. Move misplaced
endif in download.stamp.
* patches/icedtea-rhino.patch:
Remove merge conflicts.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 28 Jan 2009 22:11:07 +0000 |
| parents | 52b6f4605e43 |
| children | 5a2104fb2256 |
| files | ChangeLog Makefile.am patches/icedtea-rhino.patch |
| diffstat | 3 files changed, 14 insertions(+), 123 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 27 02:27:28 2009 +0000 +++ b/ChangeLog Wed Jan 28 22:11:07 2009 +0000 @@ -1,3 +1,12 @@ +2009-01-28 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Rename PULSEAUDIO_SOURCES and JTREG_SOURCES + to avoid conflict with autoconf names. Move misplaced + endif in download.stamp. + * patches/icedtea-rhino.patch: + Remove merge conflicts. + 2009-01-26 Andrew John Hughes <ahughes@redhat.com> Bump to b44.
--- a/Makefile.am Tue Jan 27 02:27:28 2009 +0000 +++ b/Makefile.am Wed Jan 28 22:11:07 2009 +0000 @@ -1224,7 +1224,7 @@ generated/fontconfig/fontconfig.Ubuntu.bfc \ generated/fontconfig/fontconfig.bfc -JTREG_SOURCES = $(top_srcdir)/test/jtreg/com/sun/javatest/cof/i18n.properties \ +JTREG_SRCS = $(top_srcdir)/test/jtreg/com/sun/javatest/cof/i18n.properties \ $(top_srcdir)/test/jtreg/com/sun/javatest/cof/COF2_0_2.xsd \ $(top_srcdir)/test/jtreg/com/sun/javatest/cof/*.java \ $(top_srcdir)/test/jtreg/com/sun/javatest/lib/*.java \ @@ -1301,7 +1301,7 @@ $(top_srcdir)/test/jtreg/JavaTest.cmdMgrs.lst \ $(top_srcdir)/test/jtreg/excludelist.langtools.jtx -PULSEAUDIO_SOURCES = $(top_srcdir)/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/*.java \ +PULSEAUDIO_SRCS = $(top_srcdir)/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/*.java \ $(top_srcdir)/pulseaudio/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider \ $(top_srcdir)/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_UnderflowListener.h \ $(top_srcdir)/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_PlaybackStartedListener.h \ @@ -1344,9 +1344,9 @@ tools-copy contrib ports extra overlays \ javaws.png javaws.desktop visualvm.desktop \ jconsole.desktop policytool.desktop \ - $(JTREG_SOURCES) \ + $(JTREG_SRCS) \ IcedTeaPlugin.cc \ - HACKING $(PULSEAUDIO_SOURCES) fsg.sh \ + HACKING $(PULSEAUDIO_SRCS) fsg.sh \ plugin hotspot.map autogen.sh # The Binary plugs directory is called jdk1.7.0 for historical reasons. The @@ -1619,7 +1619,6 @@ else $(HG) fclone $(OPENJDK_HG_URL) openjdk; endif -endif else if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ | $(MD5SUM) --check ; \ @@ -1637,6 +1636,7 @@ endif endif endif +endif if WITH_ALT_HSBUILD hotspot_md5sum="`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) \ $(abs_top_srcdir)/hotspot.map`" ; \
--- a/patches/icedtea-rhino.patch Tue Jan 27 02:27:28 2009 +0000 +++ b/patches/icedtea-rhino.patch Wed Jan 28 22:11:07 2009 +0000 @@ -1,42 +1,17 @@ -<<<<<<< local diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp --- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2008-10-23 08:41:05.000000000 +0100 +++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-10-27 23:00:47.000000000 +0000 -======= ---- openjdk/hotspot/src/share/vm/runtime/os.cpp.orig 2008-11-22 00:11:18.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-12-03 21:16:14.000000000 +0000 ->>>>>>> other @@ -886,6 +886,7 @@ "%/lib/jsse.jar:" "%/lib/jce.jar:" "%/lib/charsets.jar:" -<<<<<<< local + "%/lib/rhino.jar:" -======= -+ "%/lib/rhino.jar:" ->>>>>>> other "%/classes"; char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); if (sysclasspath == NULL) return false; -<<<<<<< local diff -Nru openjdk.orig/jdk/make/com/sun/Makefile openjdk/jdk/make/com/sun/Makefile --- openjdk.orig/jdk/make/com/sun/Makefile 2008-10-23 08:44:04.000000000 +0100 +++ openjdk/jdk/make/com/sun/Makefile 2008-10-27 23:00:47.000000000 +0000 -======= ---- openjdk/jdk/make/com/sun/script/Makefile.orig 2008-11-25 09:01:10.000000000 +0000 -+++ openjdk/jdk/make/com/sun/script/Makefile 2008-12-03 21:13:14.000000000 +0000 -@@ -31,6 +31,8 @@ - - AUTO_FILES_JAVA_DIRS = com/sun/script - -+OTHER_JAVACFLAGS = -classpath $(RHINO_JAR) -+ - # - # Files that need to be copied - # ---- openjdk/jdk/make/com/sun/Makefile.orig 2008-11-25 09:01:09.000000000 +0000 -+++ openjdk/jdk/make/com/sun/Makefile 2008-12-03 21:14:36.000000000 +0000 ->>>>>>> other @@ -31,15 +31,8 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -51,15 +26,9 @@ # Omit mirror since it's built with the apt tool. -SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \ +SUBDIRS = script image security crypto/provider jndi jmx \ -<<<<<<< local java inputmethods org xml rowset net/httpserver net/ssl demo \ tools jarsigner tracing servicetag -======= - java inputmethods org rowset net/httpserver net/ssl demo \ - tools jarsigner ->>>>>>> other -<<<<<<< local diff -Nru openjdk.orig/jdk/make/com/sun/script/Makefile openjdk/jdk/make/com/sun/script/Makefile --- openjdk.orig/jdk/make/com/sun/script/Makefile 2008-10-23 08:44:04.000000000 +0100 +++ openjdk/jdk/make/com/sun/script/Makefile 2008-10-27 23:00:47.000000000 +0000 @@ -76,11 +45,6 @@ --- openjdk.orig/jdk/make/common/Release.gmk 2008-10-27 23:00:09.000000000 +0000 +++ openjdk/jdk/make/common/Release.gmk 2008-10-27 23:00:47.000000000 +0000 @@ -774,6 +774,7 @@ -======= ---- openjdk/jdk/make/common/Release.gmk.orig 2008-12-03 21:12:23.000000000 +0000 -+++ openjdk/jdk/make/common/Release.gmk 2008-12-03 21:13:14.000000000 +0000 -@@ -772,6 +772,7 @@ ->>>>>>> other $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar @@ -88,36 +52,9 @@ @# Generate meta-index to make boot and extension class loaders lazier $(CD) $(JRE_IMAGE_DIR)/lib && \ $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \ -<<<<<<< local diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2008-10-23 08:44:13.000000000 +0100 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2008-10-27 23:00:47.000000000 +0000 -======= ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2008-12-03 21:13:13.000000000 +0000 -@@ -25,7 +25,7 @@ - - package com.sun.script.javascript; - --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - import javax.script.*; - - /** ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java 2008-12-03 21:13:05.000000000 +0000 -@@ -26,7 +26,7 @@ - package com.sun.script.javascript; - import javax.script.*; - import java.util.*; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - import com.sun.script.util.*; - - /** ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java 2008-12-03 21:13:14.000000000 +0000 ->>>>>>> other @@ -24,7 +24,7 @@ */ @@ -127,7 +64,6 @@ import javax.script.*; import java.util.*; -<<<<<<< local diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2008-10-23 08:44:13.000000000 +0100 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2008-10-27 23:00:47.000000000 +0000 @@ -191,10 +127,6 @@ diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2008-10-23 08:44:13.000000000 +0100 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2008-10-27 23:00:47.000000000 +0000 -======= ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java 2008-12-03 21:13:05.000000000 +0000 ->>>>>>> other @@ -26,7 +26,7 @@ package com.sun.script.javascript; import com.sun.script.util.*; @@ -204,57 +136,21 @@ import java.lang.reflect.Method; import java.io.*; import java.util.*; -<<<<<<< local diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2008-10-23 08:44:13.000000000 +0100 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java 2008-10-27 23:00:47.000000000 +0000 -======= ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java 2008-12-03 21:13:05.000000000 +0000 -@@ -26,7 +26,7 @@ - package com.sun.script.javascript; - - import java.util.*; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - - /** - * This class prevents script access to certain sensitive classes. ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java 2008-12-03 21:13:14.000000000 +0000 -@@ -26,7 +26,7 @@ - package com.sun.script.javascript; - - import javax.script.Invocable; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - - /** - * This class implements Rhino-like JavaAdapter to help implement a Java ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java 2008-12-03 21:13:05.000000000 +0000 ->>>>>>> other @@ -25,7 +25,7 @@ package com.sun.script.javascript; -import sun.org.mozilla.javascript.internal.*; +import org.mozilla.javascript.*; -<<<<<<< local import javax.script.*; -======= - import java.util.*; ->>>>>>> other /** -<<<<<<< local diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java --- openjdk.orig/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2008-10-23 08:44:13.000000000 +0100 +++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2008-10-27 23:00:47.000000000 +0000 -======= ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java 2008-12-03 21:13:14.000000000 +0000 ->>>>>>> other @@ -27,7 +27,7 @@ import java.lang.reflect.*; @@ -264,17 +160,3 @@ /** * This wrap factory is used for security reasons. JSR 223 script -<<<<<<< local -======= ---- openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.orig 2008-11-25 09:02:56.000000000 +0000 -+++ openjdk/jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java 2008-12-03 21:13:05.000000000 +0000 -@@ -25,7 +25,7 @@ - - package com.sun.script.javascript; - import javax.script.*; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - - /** - * Represents compiled JavaScript code. ->>>>>>> other