/hg/icedtea6: Move patches/javafiles to patches/ecj/javafiles.
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Tue May 17 09:20:07 PDT 2011
changeset 19cc9d976c7a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=19cc9d976c7a
author: Omair Majid <omajid at redhat.com>
date: Tue May 17 12:19:36 2011 -0400
Move patches/javafiles to patches/ecj/javafiles.
This patch is only required for bootstrapping.
2011-05-17 Omair Majid <omajid at redhat.com>
* Makefile.am (ICEDTEA_PATCHES): Move
patches/javafiles.patch to ... (ICEDTEA_ECJ_PATCHES): Add
patches/ecj/javafiles.patch.
* patches/javafiles.patch: Move to...
* patches/ecj/javafiles.patch: New file.
diffstat:
ChangeLog | 8 ++
Makefile.am | 2 +-
patches/ecj/javafiles.patch | 150 ++++++++++++++++++++++++++++++++++++++++++++
patches/javafiles.patch | 150 --------------------------------------------
4 files changed, 159 insertions(+), 151 deletions(-)
diffs (356 lines):
diff -r c59c4a788187 -r 19cc9d976c7a ChangeLog
--- a/ChangeLog Tue May 17 09:15:25 2011 +0200
+++ b/ChangeLog Tue May 17 12:19:36 2011 -0400
@@ -1,3 +1,11 @@
+2011-05-17 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am
+ (ICEDTEA_PATCHES): Move patches/javafiles.patch to ...
+ (ICEDTEA_ECJ_PATCHES): Add patches/ecj/javafiles.patch.
+ * patches/javafiles.patch: Move to...
+ * patches/ecj/javafiles.patch: New file.
+
2011-05-17 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/jtreg-6929067-fix.patch: Fix bashism.
diff -r c59c4a788187 -r 19cc9d976c7a Makefile.am
--- a/Makefile.am Tue May 17 09:15:25 2011 +0200
+++ b/Makefile.am Tue May 17 12:19:36 2011 -0400
@@ -225,7 +225,6 @@
patches/hotspot/$(HSBUILD)/gcc-suffix.patch \
patches/memory-limits.patch \
patches/libraries.patch \
- patches/javafiles.patch \
patches/jvmtiEnv.patch \
patches/lcms.patch \
patches/print_lsb_release.patch \
@@ -417,6 +416,7 @@
ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
patches/ecj/hotspot.patch \
patches/ecj/endorsed-dir-for-jvmti.patch \
+ patches/ecj/javafiles.patch \
patches/ecj/spp.patch \
patches/ecj/jopt.patch \
patches/ecj/jaxp-dependency.patch \
diff -r c59c4a788187 -r 19cc9d976c7a patches/ecj/javafiles.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/javafiles.patch Tue May 17 12:19:36 2011 -0400
@@ -0,0 +1,157 @@
+--- openjdk-ecj/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200
++++ openjdk-ecj/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-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/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-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/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-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/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-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/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-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/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-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200
++++ openjdk-ecj/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 c59c4a788187 -r 19cc9d976c7a patches/javafiles.patch
--- a/patches/javafiles.patch Tue May 17 09:15:25 2011 +0200
+++ /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
More information about the distro-pkg-dev
mailing list