changeset in /hg/icedtea: Fix PR icedtea/140 by removing depende...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Sun Jun 22 12:34:51 PDT 2008
changeset 2a13fc138cfa in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2a13fc138cfa
description:
Fix PR icedtea/140 by removing dependency on JScheme
diffstat:
5 files changed, 1506 insertions(+), 237 deletions(-)
ChangeLog | 11
Makefile.am | 5
Makefile.in | 6
patches/icedtea-ecj.patch | 461 +++++++--------
patches/icedtea-jscheme.patch | 1260 +++++++++++++++++++++++++++++++++++++++++
diffs (truncated from 1823 to 500 lines):
diff -r f1c286afb8fa -r 2a13fc138cfa ChangeLog
--- a/ChangeLog Mon Jun 09 16:15:29 2008 -0400
+++ b/ChangeLog Tue Jun 10 03:17:12 2008 +0100
@@ -1,3 +1,14 @@ 2008-06-09 Joshua Sumali <jsumali at redh
+2008-06-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR icedtea/140:
+ * Makefile.am: Add icedtea-jscheme.patch and
+ remove jscheme jar files and scripts after
+ unzipping OpenJDK.
+ * Makefile.in: Regenerated.
+ * patches/icedtea-ecj.patch: Updated for post-jscheme
+ tree.
+ * patches/icedtea-jscheme.patch: Added.
+
2008-06-09 Joshua Sumali <jsumali at redhat.com>
* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
diff -r f1c286afb8fa -r 2a13fc138cfa Makefile.am
--- a/Makefile.am Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.am Tue Jun 10 03:17:12 2008 +0100
@@ -1,6 +1,8 @@ OPENJDK_DATE = 30_may_2008
OPENJDK_DATE = 30_may_2008
OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
OPENJDK_VERSION = b10
+
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
if NETX_PLUGIN
NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -319,6 +321,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-directaudio-close-trick.patch \
patches/icedtea-sparc.patch \
patches/icedtea-override-redirect-metacity.patch \
+ patches/icedtea-jscheme.patch \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES)
@@ -333,6 +336,8 @@ stamps/extract.stamp: stamps/download.st
mkdir openjdk ; \
$(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
+ rm -rf $(JSCHEME_DIR)/lib; \
+ rm -rf $(JSCHEME_DIR)/scripts; \
fi
mkdir -p stamps
touch stamps/extract.stamp
diff -r f1c286afb8fa -r 2a13fc138cfa Makefile.in
--- a/Makefile.in Mon Jun 09 16:15:29 2008 -0400
+++ b/Makefile.in Tue Jun 10 03:17:12 2008 +0100
@@ -252,6 +252,7 @@ OPENJDK_DATE = 30_may_2008
OPENJDK_DATE = 30_may_2008
OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
OPENJDK_VERSION = b10
+JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -422,7 +423,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
patches/icedtea-sparc.patch \
- patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
+ patches/icedtea-override-redirect-metacity.patch \
+ patches/icedtea-jscheme.patch $(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
@@ -840,6 +842,8 @@ stamps/extract.stamp: stamps/download.st
mkdir openjdk ; \
$(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
+ rm -rf $(JSCHEME_DIR)/lib; \
+ rm -rf $(JSCHEME_DIR)/scripts; \
fi
mkdir -p stamps
touch stamps/extract.stamp
diff -r f1c286afb8fa -r 2a13fc138cfa patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Mon Jun 09 16:15:29 2008 -0400
+++ b/patches/icedtea-ecj.patch Tue Jun 10 03:17:12 2008 +0100
@@ -317,232 +317,6 @@ diff -ruN openjdk.old/corba/make/com/sun
+# Include
+#
+include $(BUILDDIR)/common/Classes.gmk
-diff -ruN openjdk.old/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
---- openjdk.old/corba/make/com/sun/corba/se/sources/Makefile 2007-10-12 03:49:13.000000000 -0400
-+++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 1969-12-31 19:00:00.000000000 -0500
-@@ -1,222 +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
--
--#
--# 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 = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-class
--MC_GENERATE_LOG_RB = $(SRC_DIR)/com/sun/tools/corba/se/logutil/scripts/mc.scm -main main make-resource
--
--JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) jscheme.REPL $(MC_GENERATE_CLASS)
--JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) jscheme.REPL $(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
--#
--logwrapper.generate: \
-- $(LOG_GENDIRECTORY)/ActivationSystemException.java \
-- $(LOG_GENDIRECTORY)/IORSystemException.java \
-- $(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
-- $(LOG_GENDIRECTORY)/NamingSystemException.java \
-- $(LOG_GENDIRECTORY)/OMGSystemException.java \
-- $(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
-- $(LOG_GENDIRECTORY)/POASystemException.java \
-- $(LOG_GENDIRECTORY)/UtilSystemException.java
--
--$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
--
--logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties
--
--$(LOG_GENDIRECTORY)/LogStrings.properties: \
-- $(LOG_GENDIRECTORY)/ActivationSystemException.resource \
-- $(LOG_GENDIRECTORY)/IORSystemException.resource \
-- $(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \
-- $(LOG_GENDIRECTORY)/NamingSystemException.resource \
-- $(LOG_GENDIRECTORY)/OMGSystemException.resource \
-- $(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \
-- $(LOG_GENDIRECTORY)/POASystemException.resource \
-- $(LOG_GENDIRECTORY)/UtilSystemException.resource
-- $(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties
--
--$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
--
--$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC)
-- $(prep-target)
-- $(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
--
--
--.PHONY: all build clean clobber \
-- activation.idl.compile activation.idl.clean \
-- portableactivation.idl.compile portableactivation.idl.clean
--
--#
--# Include
--#
--include $(BUILDDIR)/common/Rules.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 @@
@@ -781,16 +555,6 @@ diff -ru openjdk-ecj.orig/langtools/make
/**
* Maximum exponent a finite {@code double} variable may have.
---- openjdk.old/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2007-12-10 15:46:46.000000000 -0500
-+++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2007-12-19 09:53:07.000000000 -0500
-@@ -332,7 +332,6 @@
- (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
- (.println pw "//")
- (.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
-- (.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
- (.println pw)))
-
- (define (write-factory-method class-name exception-group-name pw)
--- openjdk.old/langtools/make/Makefile 2008-01-16 10:23:52.000000000 -0500
+++ openjdk-ecj/langtools/make/Makefile 2008-01-16 10:42:51.000000000 -0500
@@ -113,7 +113,7 @@
@@ -1023,3 +787,228 @@ diff -ru openjdk-ecj.orig/langtools/make
#
# We want to privatize JVM symbols on Solaris. This is so the user can
+--- openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 2008-06-09 03:12:48.000000000 +0100
++++ /dev/null 2008-05-17 00:35:13.224001676 +0100
+@@ -1,222 +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
+-
+-#
+-# 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
+-#
+-logwrapper.generate: \
+- $(LOG_GENDIRECTORY)/ActivationSystemException.java \
+- $(LOG_GENDIRECTORY)/IORSystemException.java \
+- $(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
+- $(LOG_GENDIRECTORY)/NamingSystemException.java \
+- $(LOG_GENDIRECTORY)/OMGSystemException.java \
+- $(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
+- $(LOG_GENDIRECTORY)/POASystemException.java \
+- $(LOG_GENDIRECTORY)/UtilSystemException.java
+-
+-$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
+- $(prep-target)
+- $(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
+- $(prep-target)
+- $(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
+- $(prep-target)
+- $(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
+- $(prep-target)
+- $(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
+- $(prep-target)
+- $(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
+- $(prep-target)
+- $(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
+-
+-$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
+- $(prep-target)
+- $(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
More information about the distro-pkg-dev
mailing list