# HG changeset patch # User Lillian Angel # Date 1242409524 14400 # Node ID 5c5cc538bd1002bd672e512ea2dadebbc58bdd31 # Parent 1278042da95f7961274a2710092c6b5a6360829c 2009-05-15 Lillian Angel * Makefile.am (ICEDTEA_PATCHES): patches/icedtea-tools.patch and patches/icedtea-javafiles.patch removed from list. * patches/icedtea-tools.patch, patches/icedtea-javafiles.patch: Removed. * HACKING: Updated. diff -r 1278042da95f -r 5c5cc538bd10 ChangeLog --- a/ChangeLog Fri May 15 12:42:54 2009 -0400 +++ b/ChangeLog Fri May 15 13:45:24 2009 -0400 @@ -1,3 +1,12 @@ +2009-05-15 Lillian Angel + + * Makefile.am + (ICEDTEA_PATCHES): patches/icedtea-tools.patch and + patches/icedtea-javafiles.patch removed from list. + * patches/icedtea-tools.patch, + patches/icedtea-javafiles.patch: Removed. + * HACKING: Updated. + 2009-05-15 Lillian Angel * configure.ac: Bumped version to 1.6pre. diff -r 1278042da95f -r 5c5cc538bd10 HACKING --- a/HACKING Fri May 15 12:42:54 2009 -0400 +++ b/HACKING Fri May 15 13:45:24 2009 -0400 @@ -30,7 +30,6 @@ * icedtea-graphics.patch: Fix word wrap in JTextArea (PR57/S6593649) * icedtea-ia64-fdlibm.patch: Fix name of ia64 architecture from _M_IA64 to ia64. * icedtea-javac-debuginfo.patch: Ensure debugging information is generated for all class files. -* icedtea-javafiles.patch: Add missing Java files to list. * icedtea-jpegclasses.patch: Add com.sun.image.codec.jpeg support. * icedtea-lcms: Applies security patch. * icedtea-lcms-2.patch: Temporary fix for https://bugs.openjdk.java.net/show_bug.cgi?id=100050. @@ -51,7 +50,6 @@ * icedtea-sunsrc.patch: Remove service property files from TOOLS list. * icedtea-text-relocations.patch: Use correct -fPIC/-fpic flag on all platforms. * icedtea-timerqueue.patch: Fix setting of running variable (PR87). -* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti. * icedtea-use-system-tzdata.patch: Use timezone data from the system (PR70/S6593486). * icedtea-version.patch: Replace name and bug URL with IcedTea versions. * icedtea-webservices.patch: Add applet support. @@ -163,3 +161,5 @@ * icedtea-core-zero-build.patch: Not required with HS14. * icedtea-bytecodeInterpreterWithChecks.patch: Same as icedtea-xslfix.patch (OpenJDK6 only, S6707485); not required with HS14. * icedtea-eclipse-hotspot-6614100-7b24.patch: Fix Eclipse crash (S6614100). Fixed in OpenJDK7 b29/hs13. Not required with HS14. +* icedtea-javafiles.patch: Add missing Java files to list. +* icedtea-tools.patch: Remove DebugHelperHelper and add sources in make/java/awt/Makefile to fix build of jvmti. diff -r 1278042da95f -r 5c5cc538bd10 Makefile.am --- a/Makefile.am Fri May 15 12:42:54 2009 -0400 +++ b/Makefile.am Fri May 15 13:45:24 2009 -0400 @@ -494,7 +494,6 @@ patches/icedtea-webstart.patch \ patches/icedtea-webstart-umask.patch \ patches/icedtea-rmi_amd64.patch \ - patches/icedtea-tools.patch \ patches/icedtea-demos.patch \ patches/icedtea-timezone.patch \ patches/icedtea-use-system-tzdata.patch \ @@ -508,7 +507,6 @@ patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ patches/icedtea-sunsrc.patch \ patches/icedtea-libraries.patch \ - patches/icedtea-javafiles.patch \ patches/icedtea-core-build.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-lcms.patch \ diff -r 1278042da95f -r 5c5cc538bd10 patches/icedtea-javafiles.patch --- a/patches/icedtea-javafiles.patch Fri May 15 12:42:54 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ ---- openjdk/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200 -+++ openjdk/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200 -@@ -29,6 +29,80 @@ - # will generate header files - # - JAVA_JAVA_java = \ -+ java/lang/reflect/AccessibleObject.java \ -+ java/lang/reflect/AnnotatedElement.java \ -+ java/lang/reflect/Array.java \ -+ java/lang/reflect/Constructor.java \ -+ java/lang/reflect/Field.java \ -+ java/lang/reflect/GenericArrayType.java \ -+ java/lang/reflect/GenericDeclaration.java \ -+ java/lang/reflect/GenericSignatureFormatError.java \ -+ java/lang/reflect/InvocationHandler.java \ -+ java/lang/reflect/InvocationTargetException.java \ -+ java/lang/reflect/MalformedParameterizedTypeException.java \ -+ java/lang/reflect/Member.java \ -+ java/lang/reflect/Method.java \ -+ java/lang/reflect/Modifier.java \ -+ java/lang/reflect/package-info.java \ -+ java/lang/reflect/ParameterizedType.java \ -+ java/lang/reflect/Proxy.java \ -+ java/lang/reflect/ReflectAccess.java \ -+ java/lang/reflect/ReflectPermission.java \ -+ java/lang/reflect/Type.java \ -+ java/lang/reflect/TypeVariable.java \ -+ java/lang/reflect/UndeclaredThrowableException.java \ -+ java/lang/reflect/WildcardType.java \ -+ java/lang/ref/Finalizer.java \ -+ java/lang/ref/FinalReference.java \ -+ java/lang/ref/PhantomReference.java \ -+ java/lang/ref/Reference.java \ -+ java/lang/ref/ReferenceQueue.java \ -+ java/lang/ref/SoftReference.java \ -+ java/lang/ref/WeakReference.java \ -+ java/lang/management/ClassLoadingMXBean.java \ -+ java/lang/management/CompilationMXBean.java \ -+ java/lang/management/GarbageCollectorMXBean.java \ -+ java/lang/management/LockInfo.java \ -+ java/lang/management/ManagementFactory.java \ -+ java/lang/management/ManagementPermission.java \ -+ java/lang/management/MemoryManagerMXBean.java \ -+ java/lang/management/MemoryMXBean.java \ -+ java/lang/management/MemoryNotificationInfo.java \ -+ java/lang/management/MemoryPoolMXBean.java \ -+ java/lang/management/MemoryType.java \ -+ java/lang/management/MemoryUsage.java \ -+ java/lang/management/MonitorInfo.java \ -+ java/lang/management/OperatingSystemMXBean.java \ -+ java/lang/management/RuntimeMXBean.java \ -+ java/lang/management/ThreadInfo.java \ -+ java/lang/management/ThreadMXBean.java \ -+ java/lang/instrument/ClassDefinition.java \ -+ java/lang/instrument/ClassFileTransformer.java \ -+ java/lang/instrument/IllegalClassFormatException.java \ -+ java/lang/instrument/Instrumentation.java \ -+ java/lang/instrument/UnmodifiableClassException.java \ -+ java/lang/annotation/AnnotationFormatError.java \ -+ java/lang/annotation/Annotation.java \ -+ java/lang/annotation/AnnotationTypeMismatchException.java \ -+ java/lang/annotation/Documented.java \ -+ java/lang/annotation/ElementType.java \ -+ java/lang/annotation/IncompleteAnnotationException.java \ -+ java/lang/annotation/Inherited.java \ -+ java/lang/annotation/package-info.java \ -+ java/lang/annotation/Retention.java \ -+ java/lang/annotation/RetentionPolicy.java \ -+ java/lang/annotation/Target.java \ -+ java/io/IOError.java \ -+ java/lang/Deprecated.java \ -+ java/lang/Iterable.java \ -+ java/util/RandomAccess.java \ -+ java/lang/CharacterData00.java \ -+ java/lang/CharacterData01.java \ -+ java/lang/CharacterData02.java \ -+ java/lang/CharacterData0E.java \ -+ java/lang/CharacterDataLatin1.java \ -+ java/lang/CharacterDataPrivateUse.java \ -+ java/lang/CharacterDataUndefined.java \ - java/lang/Object.java \ - java/lang/Class.java \ - java/lang/Thread.java \ -@@ -135,13 +209,6 @@ - java/lang/Readable.java \ - java/lang/Override.java \ - java/lang/SuppressWarnings.java \ -- java/lang/ref/Reference.java \ -- java/lang/ref/SoftReference.java \ -- java/lang/ref/WeakReference.java \ -- java/lang/ref/FinalReference.java \ -- java/lang/ref/PhantomReference.java \ -- java/lang/ref/ReferenceQueue.java \ -- java/lang/ref/Finalizer.java \ - java/util/BitSet.java \ - java/util/Calendar.java \ - java/util/GregorianCalendar.java \ ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -62,7 +62,6 @@ - com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \ - com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \ - com/sun/corba/se/impl/encoding/TypeCodeReader.java \ -- com/sun/corba/se/impl/encoding/WrapperInputStream.java -- -- -- -+ com/sun/corba/se/impl/encoding/WrapperInputStream.java \ -+ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ -+ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -29,5 +29,6 @@ - com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ - com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ - com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ -+ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ - com/sun/corba/se/spi/presentation/rmi/StubAdapter.java - ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -81,5 +81,5 @@ - com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \ - com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \ - com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \ -- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java -- -+ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \ -+ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -30,6 +30,7 @@ - com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \ - com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \ - com/sun/corba/se/spi/monitoring/MonitoringFactories.java \ -+ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ - com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \ - com/sun/corba/se/spi/monitoring/MonitoredObject.java \ - com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -66,4 +66,5 @@ - com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ - com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ - com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ -- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java -+ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \ -+ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -81,4 +81,5 @@ - com/sun/corba/se/impl/orbutil/graph/Node.java \ - com/sun/corba/se/impl/orbutil/graph/NodeData.java \ - com/sun/corba/se/impl/orbutil/graph/Graph.java \ -- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java -+ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \ -+ com/sun/corba/se/impl/orbutil/GetPropertyAction.java diff -r 1278042da95f -r 5c5cc538bd10 patches/icedtea-tools.patch --- a/patches/icedtea-tools.patch Fri May 15 12:42:54 2009 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.linux openjdk/jdk/make/tools/sharing/classlist.linux ---- openjdk-ecj/jdk/make/tools/sharing/classlist.linux 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.linux 2007-09-04 13:33:52.000000000 -0400 -@@ -330,7 +330,6 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction - java/awt/GraphicsEnvironment -@@ -341,7 +340,6 @@ - java/lang/ProcessEnvironment$Value - java/lang/ProcessEnvironment$StringEnvironment - java/util/Collections$UnmodifiableMap --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.solaris openjdk/jdk/make/tools/sharing/classlist.solaris ---- openjdk-ecj/jdk/make/tools/sharing/classlist.solaris 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.solaris 2007-09-04 13:34:17.000000000 -0400 -@@ -332,7 +332,6 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction - java/awt/GraphicsEnvironment -@@ -343,7 +342,6 @@ - java/lang/ProcessEnvironment$Value - java/lang/ProcessEnvironment$StringEnvironment - java/util/Collections$UnmodifiableMap --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.windows openjdk/jdk/make/tools/sharing/classlist.windows ---- openjdk-ecj/jdk/make/tools/sharing/classlist.windows 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.windows 2007-09-04 13:34:05.000000000 -0400 -@@ -333,10 +333,8 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl ---- openjdk.orig/jdk/make/java/awt/Makefile 2008-02-28 04:39:42.000000000 -0500 -+++ openjdk/jdk/make/java/awt/Makefile 2008-02-29 14:58:50.000000000 -0500 -@@ -34,7 +34,7 @@ - # - AUTO_FILES_JAVA_DIRS = java/awt sun/awt/geom - --build: properties cursors -+build: sources properties cursors - - # - # Resources -@@ -47,9 +47,11 @@ - # - include $(BUILDDIR)/common/Classes.gmk - -+sources: - - clean:: properties.clean sun.geom.clean cursors.clean - -+ - _LIBPROPS = \ - flavormap.properties - -@@ -102,6 +104,6 @@ - cursors.clean : - $(RM) -r $(CURSORDIR) - --.PHONY: properties properties.clean \ -+.PHONY: sources properties properties.clean \ - cursors sun.geom.clean cursors.clean -