changeset in /hg/icedtea6: Ensure Java class files have debug in...
Andrew John Hughes
gnu_andrew at member.fsf.org
Mon Oct 20 11:30:17 PDT 2008
changeset be559c26fdbc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be559c26fdbc
description:
Ensure Java class files have debug information.
2008-10-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
* HACKING: Add new patch.
* Makefile.am: Compile PulseAudio Java
files with debugging information.
* patches/icedtea-ecj.patch: Regenerated.
* patches/icedtea-javac-debuginfo.patch:
Ensure JAXWS, JAXP, CORBA and the language
tools include debugging information.
diffstat:
5 files changed, 964 insertions(+), 821 deletions(-)
ChangeLog | 10
HACKING | 1
Makefile.am | 7
patches/icedtea-ecj.patch | 1665 ++++++++++++++++-----------------
patches/icedtea-javac-debuginfo.patch | 102 ++
diffs (truncated from 1911 to 500 lines):
diff -r 2b6b9ce244bc -r be559c26fdbc ChangeLog
--- a/ChangeLog Mon Oct 20 12:47:37 2008 -0400
+++ b/ChangeLog Mon Oct 20 19:30:04 2008 +0100
@@ -1,3 +1,13 @@ 2008-10-20 Lillian Angel <langel at redha
+2008-10-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * HACKING: Add new patch.
+ * Makefile.am: Compile PulseAudio Java
+ files with debugging information.
+ * patches/icedtea-ecj.patch: Regenerated.
+ * patches/icedtea-javac-debuginfo.patch:
+ Ensure JAXWS, JAXP, CORBA and the language
+ tools include debugging information.
+
2008-10-20 Lillian Angel <langel at redhat.com>
* Makefile.am
diff -r 2b6b9ce244bc -r be559c26fdbc HACKING
--- a/HACKING Mon Oct 20 12:47:37 2008 -0400
+++ b/HACKING Mon Oct 20 19:30:04 2008 +0100
@@ -29,6 +29,7 @@ The following patches are currently appl
* icedtea-gcc-suffix.patch: Append $(GCC_SUFFIX) to end of 'gcc' binary name.
* 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-leak.patch: Fix LCMS memory leak.
diff -r 2b6b9ce244bc -r be559c26fdbc Makefile.am
--- a/Makefile.am Mon Oct 20 12:47:37 2008 -0400
+++ b/Makefile.am Mon Oct 20 19:30:04 2008 +0100
@@ -530,7 +530,8 @@ ICEDTEA_PATCHES = \
patches/icedtea-6open-6616825.patch \
patches/icedtea-6open-6651382.patch \
patches/icedtea-6open-6756202.patch \
- $(VISUALVM_PATCH)
+ $(VISUALVM_PATCH) \
+ patches/icedtea-javac-debuginfo.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -1478,14 +1479,14 @@ if ENABLE_PULSE_JAVA
if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
(cd $(PULSE_JAVA_JAVA_SRCDIR); \
- $(JAVAC) -d $(PULSE_JAVA_CLASS_DIR) \
+ $(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 -d $(PULSE_JAVA_CLASS_DIR)\
+ $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR)\
-bootclasspath \
'$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
org/classpath/icedtea/pulseaudio/*.java\
diff -r 2b6b9ce244bc -r be559c26fdbc patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Mon Oct 20 12:47:37 2008 -0400
+++ b/patches/icedtea-ecj.patch Mon Oct 20 19:30:04 2008 +0100
@@ -1,271 +1,18 @@
---- openjdk.old/hotspot/build/linux/Makefile 2007-10-12 03:46:24.000000000 -0400
-+++ openjdk-ecj/hotspot/build/linux/Makefile 2007-10-19 10:27:52.000000000 -0400
-@@ -244,28 +244,24 @@
-
- $(TARGETS_C2): $(SUBDIRS_C2)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_TIERED): $(SUBDIRS_TIERED)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_C1): $(SUBDIRS_C1)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_CORE): $(SUBDIRS_CORE)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
- endif
---- openjdk.old/jdk/make/common/BuildToolJar.gmk 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2007-10-19 10:51:47.000000000 -0400
-@@ -43,7 +43,8 @@
- @$(prep-target)
- @$(MKDIR) -p $(BUILDTOOLCLASSDIR)
- $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
-- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
-+ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \
-+ $(BUILDTOOL_MAIN_SOURCE_FILE)
- $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- $(JAR_JFLAGS) || $(RM) $@
---- iopenjdk.old/jdk/make/Makefile 2007-10-12 03:54:03.000000000 -0400
-+++ openjdk-ecj/jdk/make/Makefile 2007-10-19 13:10:02.000000000 -0400
-@@ -239,7 +239,7 @@
-
- all build:: sanity-all post-sanity-all
-
--SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers
-+SUBDIRS = tools java javax org sun sunw com jpda mksample launchers
- all build::
- $(SUBDIRS-loop)
-
---- openjdk.old/corba/make/org/omg/sources/Makefile 2007-10-12 03:49:14.000000000 -0400
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2007-10-30 11:57:03.000000000 -0400
-@@ -93,8 +93,6 @@
- POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
-
- $(POAGENERATEDFILES):: $(POA.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL)
-- $(RM) -r $(POAHELHOLFILES)
-
- poa.compile: $(POAGENERATEDFILES)
-
-@@ -110,10 +108,6 @@
-
- # Generating and deleting unused files to reduce images size
- $(DYNANYFILES): $(DYNAMIC_ANY.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL)
-- $(RM) $(DYNANY_DIR)/*POA*
-- $(RM) $(DYNANY_DIR)/*Holder*
-- $(RM) $(DYNANYDELETEFILES)
-
- dynany.compile: $(DYNANYFILES)
-
-@@ -125,12 +119,6 @@
- TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions"
-
- $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
-
- tr.compile: $(TRGENERATEDFILES)
-
-@@ -144,7 +132,6 @@
- # _NamingContextImplBase.java and _BindingIteratorImplBase.java files
- # to GENSRC directory. Note that these two classes are deprecated.
- $(NSGENERATEDFILES): $(NAMESERVICE.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL)
-
- ns.compile: $(NSGENERATEDFILES)
-
-@@ -156,8 +143,6 @@
- IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
-
- $(IOPGENERATEDFILES):: $(IOP.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL)
-- $(RM) -r $(IOPDELETEFILES)
-
- iop.compile: $(IOPGENERATEDFILES)
-
-@@ -169,8 +154,6 @@
- CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%)
-
- $(CORBAXGENERATEDFILES):: $(CORBAX.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL)
-- $(RM) $(CORBAXDUPLICATEFILES)
-
- corbax.compile: $(CORBAXGENERATEDFILES)
-
-@@ -181,7 +164,6 @@
- MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%)
-
- $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL)
-
- messaging.compile: $(MESSAGINGGENERATEDFILES)
-
-@@ -195,8 +177,6 @@
- PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
-
- $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL)
-- $(RM) $(PIHELHOLFILES)
-
- pi.compile: $(PIGENERATEDFILES)
-
---- openjdk.old/corba/make/sun/rmi/corbalogsources/Makefile 2007-10-12 03:49:14.000000000 -0400
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2007-10-30 11:57:25.000000000 -0400
-@@ -173,7 +173,6 @@
- ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
-
- $(ACTIVATIONFILES): $(ACTIVATION.IDL)
-- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
-
- activation.idl.compile: $(ACTIVATIONFILES)
-
-@@ -196,7 +195,6 @@
-
- # REVISIT: remove -oldImplBase
- $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
-- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
-
- portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
-
---- openjdk.old/jdk/make/sun/javazic/Makefile 2007-10-12 03:54:08.000000000 -0400
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2007-10-30 14:32:25.000000000 -0400
-@@ -62,7 +62,8 @@
- $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
- $(RM) -r $(@D)
- $(prep-target)
-- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
-+ $(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \
-+ build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
- @$(java-vm-cleanup)
-
- $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
---- openjdk.old/jdk/make/sun/awt/Makefile 2007-10-30 15:27:06.000000000 -0400
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2007-10-30 15:30:02.000000000 -0400
-@@ -400,10 +400,9 @@
- COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
-
- $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
-- $(COMPILEFONTCONFIG_JARFILE)
-- $(prep-target)
-- $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
-- $(CHMOD) 444 $(@)
-+ $(COMPILEFONTCONFIG_JARFILE)
-+ $(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR)
-+ $(CHMOD) 444 $(LIBDIR)/*.bfc
- @$(java-vm-cleanup)
-
- fontconfigs.clean :
---- openjdk.old/jdk/make/sun/text/Makefile 2007-10-12 03:54:08.000000000 -0400
-+++ openjdk-ecj/jdk/make/sun/text/Makefile 2007-10-30 15:32:46.000000000 -0400
-@@ -85,8 +85,9 @@
- $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
- -sourcepath $(TEXT_SRCDIR) \
- $(BIRULES) $(BIINFO)
-- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
-- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-+ $(BOOT_JAVA_CMD) \
-+ -cp $(TEXT_CLASSES):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \
-+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
- -o $(CLASSDESTDIR)/sun/text/resources \
- -spec $(UNICODEDATA)/UnicodeData.txt \
- -language th
---- openjdk.old/jdk/make/java/text/Makefile 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk-ecj/jdk/make/java/text/Makefile 2007-10-30 14:26:53.000000000 -0400
-@@ -80,8 +80,8 @@
- -sourcepath $(TEXT_SRCDIR) \
- $(TEXT_SOURCES)
- $(MKDIR) -p $(TEXT_CLASSDIR)
-- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
-- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-+ $(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ICEDTEA_CLS_DIR) \
-+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
- -o $(TEXT_CLASSDIR) \
- -spec $(UNICODEDATA)/UnicodeData.txt
- @$(java-vm-cleanup)
---- openjdk.old/jdk/make/java/nio/Makefile 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2007-10-31 16:55:26.000000000 -0400
-@@ -31,7 +31,7 @@
- PACKAGE = java.nio
- LIBRARY = nio
- PRODUCT = java
--OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial -Werror
- include $(BUILDDIR)/common/Defs.gmk
-
- NIO_SRC = $(SHARE_SRC)/classes/java/nio
---- openjdk.old/corba/make/common/Rules.gmk 2007-10-12 03:49:14.000000000 -0400
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2007-11-01 11:31:47.000000000 -0400
-@@ -197,8 +197,10 @@
- $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
- $(CAT) $(JAVA_SOURCE_LIST); \
- $(ECHO) "# Running javac:"; \
-- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
-+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
-+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- fi
- @$(java-vm-cleanup)
-
---- openjdk.old/corba/make/common/Defs.gmk 2007-10-12 03:49:14.000000000 -0400
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2007-11-01 12:24:59.000000000 -0400
-@@ -53,6 +53,13 @@
-
- _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
-
-+
-+ifdef ALT_LANGTOOLS_DIST
-+ LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-+else
-+ LANGTOOLS_DIST =
-+endif
-+
- #
- # Get platform definitions
- #
-@@ -129,8 +136,6 @@
- # for build tool jar files
- BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars
- ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
--# for generated java source files
--GENSRCDIR = $(OUTPUTDIR)/gensrc
- # for generated C source files (not javah)
- GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc
- # for imported source files
-@@ -231,7 +236,7 @@
- # We define an intermediate variable for Java files because
- # we use its value later to help define $SOURCEPATH
-
--VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-+VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
- VPATH.java = $(VPATH0.java)
- vpath %.java $(VPATH.java)
- vpath %.class $(CLASSBINDIR)
-diff -ruN openjdk.old/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
---- openjdk.old/corba/make/com/sun/corba/se/Makefile 2007-10-12 03:49:13.000000000 -0400
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2007-11-06 15:07:45.000000000 -0500
+diff -Nru openjdk-ecj.orig/control/make/make/jdk-rules.gmk openjdk-ecj/control/make/make/jdk-rules.gmk
+--- openjdk-ecj.orig/control/make/make/jdk-rules.gmk 2008-10-20 18:45:00.000000000 +0100
++++ openjdk-ecj/control/make/make/jdk-rules.gmk 2008-10-20 18:50:20.000000000 +0100
+@@ -58,7 +58,7 @@
+ endif
+
+ ifndef DEV_ONLY
+- JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
++ JDK_BUILD_TARGETS = sanity all images
+ else
+ JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
+ endif
+diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2008-08-28 09:24:03.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-10-20 18:50:20.000000000 +0100
@@ -42,7 +42,7 @@
# the rmic iiop backend needs some classes that are part of the impl/util
# package. These classes use log wrappers, so they must be built after
@@ -275,9 +22,9 @@ diff -ruN openjdk.old/corba/make/com/sun
all build clean clobber::
$(SUBDIRS-loop)
-diff -ruN openjdk.old/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
---- openjdk.old/corba/make/com/sun/corba/se/org/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2007-11-06 15:07:20.000000000 -0500
+diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2008-10-20 18:50:20.000000000 +0100
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -317,63 +64,517 @@ diff -ruN openjdk.old/corba/make/com/sun
+# Include
+#
+include $(BUILDDIR)/common/Classes.gmk
---- iopenjdk/jdk/make/common/Rules.gmk 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2007-11-07 11:02:53.000000000 -0500
-@@ -235,8 +235,9 @@
+diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile 2008-08-28 09:24:03.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 1970-01-01 01:00:00.000000000 +0100
+@@ -1,224 +0,0 @@
+-#
+-# Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Sun designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Sun in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+-# CA 95054 USA or visit www.sun.com if you need additional information or
+-# have any questions.
+-#
+-
+-BUILDDIR = ../../../../..
+-
+-PACKAGE = com.sun.corba.se
+-PRODUCT = org
+-
+-include $(BUILDDIR)/common/Defs.gmk
+-
+-#
+-# Rules
+-#
+-all: build
+-
+-build: portableactivation.idl.compile logwrapper.generate logresource.generate
+-
+-clean clobber:: portableactivation.idl.clean
+-
+-#
+-# Files
+-#
+-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
+-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
+-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
+-
+-FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java
+-
+-#
+-# Dirs
+-#
+-
+-SRC_DIR = $(SHARE_SRC)/classes
+-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
+-PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
+-
+-ACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/spi/activation
+-PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
+-LOG_GENDIRECTORY = $(GENSRCDIR)/com/sun/corba/se/impl/logging
+-
+-#
+-# IDLs
+-#
+-
+-ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
+-PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
+-
+-
+-#
+-# .mc files
+-#
+-ACTIVATION.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
+-IOR.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
+-INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
+-NAMING.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
+-OMG.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
+-ORBUTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
+-POA.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
+-UTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
+-
+-MC_GENERATE_CLASS = make-class
+-MC_GENERATE_LOG_RB = make-resource
+-
+-JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS)
+-JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB)
+-
+-
+-#
+-# Activation
+-#
+-
+-ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
+-
+-$(ACTIVATIONFILES): $(ACTIVATION.IDL)
+- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
+-
+-activation.idl.compile: $(ACTIVATIONFILES)
+-
+-activation.idl.clean:
+- $(RM) -f $(ACTIVATIONFILES)
+-
+-#
+-# PortableActivationIDL
+-#
+-
+-PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
+-
+-PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
+-
+-PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
+- -pkgPrefix PortableActivationIDL com.sun.corba.se \
+- -pkgPrefix Dynamic org.omg \
+- -pkgPrefix IOP org.omg
+-
+-# REVISIT: remove -oldImplBase
+-$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
+- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
+-
+-portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
+-
+-portableactivation.idl.clean:
+- $(RM) -f $(PORTABLEACTIVATIONFILES)
+-
+-#
+-# Generate LogWrapper classes
+-#
More information about the distro-pkg-dev
mailing list