8054834: Modular Source Code
Co-authored-by: Alan Bateman <alan.bateman@oracle.com> Co-authored-by: Alex Buckley <alex.buckley@oracle.com> Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com> Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com> Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com> Co-authored-by: Magnus Ihse Bursie <magnus.ihse.bursie@oracle.com> Co-authored-by: Mandy Chung <mandy.chung@oracle.com> Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com> Co-authored-by: Paul Sandoz <paul.sandoz@oracle.com> Reviewed-by: alanb, chegar, ihse, mduigou
This commit is contained in:
Chris Hegarty
parent
b719714b5f
commit
ed916b30bb
@ -1,45 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2007, 2014, Oracle and/or its affiliates. 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. Oracle designates this
|
||||
# particular file as subject to the "Classpath" exception as provided
|
||||
# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
#
|
||||
# Makefile for building the corba workspace.
|
||||
#
|
||||
|
||||
# This must be the first rule
|
||||
default: all
|
||||
|
||||
include $(SPEC)
|
||||
|
||||
gensrc-corba:
|
||||
+$(MAKE) -f $(CORBA_TOPDIR)/make/GensrcCorba.gmk
|
||||
|
||||
compile-corba: gensrc-corba
|
||||
+$(MAKE) -f $(CORBA_TOPDIR)/make/CompileCorba.gmk
|
||||
|
||||
all: compile-corba
|
||||
|
||||
|
||||
.PHONY: default all
|
||||
.PHONY: gensrc-corba compile-corba
|
||||
@ -34,53 +34,31 @@ include CommonCorba.gmk
|
||||
|
||||
################################################################################
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_CORBA, \
|
||||
SETUP := GENERATE_NEWBYTECODE, \
|
||||
SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \
|
||||
$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
|
||||
SETUP := GENERATE_OLDBYTECODE, \
|
||||
SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes \
|
||||
$(CORBA_TOPDIR)/src/jdk.rmic/share/classes \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba, \
|
||||
EXCLUDES := com/sun/corba/se/PortableActivationIDL, \
|
||||
EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
|
||||
com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
|
||||
com/sun/org/omg/CORBA/IDLTypeOperations.java \
|
||||
com/sun/org/omg/CORBA/IRObjectOperations.java \
|
||||
org/omg/PortableInterceptor/UNKNOWN.java \
|
||||
com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
|
||||
com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
|
||||
COPY := .prp, \
|
||||
CLEAN := .properties, \
|
||||
BIN := $(CORBA_OUTPUTDIR)/classes, \
|
||||
JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
|
||||
|
||||
# For the interim version, don't bother cleaning the properties.
|
||||
$(eval $(call SetupJavaCompilation,BUILD_INTERIM_CORBA, \
|
||||
SETUP := GENERATE_OLDBYTECODE, \
|
||||
SRC := $(BUILD_CORBA_SRC), \
|
||||
EXCLUDES := $(BUILD_CORBA_EXCLUDES), \
|
||||
EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \
|
||||
COPY := $(BUILD_CORBA_COPY) $(BUILD_CORBA_CLEAN), \
|
||||
BIN := $(CORBA_OUTPUTDIR)/interim_classes, \
|
||||
JAR := $(INTERIM_CORBA_JAR)))
|
||||
|
||||
# Separate src.zip call to include sources that were excluded in the build to
|
||||
# mimic behavior in old build system.
|
||||
$(eval $(call SetupZipArchive,ARCHIVE_CORBA_SRC, \
|
||||
SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc, \
|
||||
ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip))
|
||||
|
||||
################################################################################
|
||||
# Create bin.zip containing the corba specific binaries: orb.idl, ir.idl
|
||||
BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
|
||||
$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
|
||||
# Copy idl files straight to jdk/lib. Not sure if this is the right way to do
|
||||
# it, but we are moving away from the one repo at a time build. Perhaps we should
|
||||
# scrap the 'jdk' prefix to bin, lib etc?
|
||||
$(JDK_OUTPUTDIR)/lib/%: $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/%
|
||||
$(install-file)
|
||||
|
||||
$(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES)
|
||||
$(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
|
||||
$(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
|
||||
$(RM) -f $@
|
||||
$(ECHO) Creating `basename $@`
|
||||
$(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
|
||||
$(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
|
||||
(cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
|
||||
IDL_TARGET_FILES := $(JDK_OUTPUTDIR)/lib/orb.idl $(JDK_OUTPUTDIR)/lib/ir.idl
|
||||
|
||||
################################################################################
|
||||
|
||||
all: $(BUILD_CORBA) $(BUILD_INTERIM_CORBA) $(ARCHIVE_CORBA_SRC) \
|
||||
$(CORBA_OUTPUTDIR)/dist/lib/bin.zip
|
||||
all: $(BUILD_INTERIM_CORBA) $(IDL_TARGET_FILES)
|
||||
|
||||
@ -34,7 +34,7 @@ include CommonCorba.gmk
|
||||
|
||||
################################################################################
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
|
||||
$(eval $(call SetupJavaCompilation,BUILD_TOOLS_CORBA, \
|
||||
SETUP := GENERATE_OLDBYTECODE, \
|
||||
SRC := $(CORBA_TOPDIR)/make/src/classes, \
|
||||
BIN := $(CORBA_OUTPUTDIR)/tools_classes))
|
||||
@ -44,7 +44,7 @@ TOOL_LOGUTIL_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/tools_classes \
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_IDLJ, \
|
||||
SETUP := GENERATE_OLDBYTECODE, \
|
||||
SRC := $(CORBA_TOPDIR)/src/share/classes, \
|
||||
SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \
|
||||
BIN := $(CORBA_OUTPUTDIR)/idlj_classes, \
|
||||
COPY := .prp, \
|
||||
INCLUDES := com/sun/tools/corba/se/idl, \
|
||||
@ -56,16 +56,16 @@ TOOL_IDLJ_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/idlj_classes \
|
||||
################################################################################
|
||||
|
||||
# Generate LogWrapper classes
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/%SystemException.java: \
|
||||
$(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
|
||||
$(BUILD_TOOLS)
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/%SystemException.java: \
|
||||
$(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
|
||||
$(BUILD_TOOLS_CORBA)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $(@D)/_the_wrappers.d
|
||||
$(ECHO) $(LOG_INFO) Generating class file from $*.mc
|
||||
$(TOOL_LOGUTIL_CMD) make-class $< $(@D)
|
||||
|
||||
# Generate LogWrapper properties file by concatening resource files
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties: \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/LogStrings.properties: \
|
||||
$(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \
|
||||
$(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \
|
||||
$(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \
|
||||
@ -80,8 +80,8 @@ $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties: \
|
||||
|
||||
# The resources files are generated from lisp-like .mc files.
|
||||
$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \
|
||||
$(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
|
||||
$(BUILD_TOOLS)
|
||||
$(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
|
||||
$(BUILD_TOOLS_CORBA)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -f $(@D)/_the_wrappers.d
|
||||
$(ECHO) $(LOG_INFO) Generating resource file from $*.mc
|
||||
@ -89,15 +89,15 @@ $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \
|
||||
|
||||
|
||||
LOGWRAPPER_TARGETS := \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/ActivationSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/IORSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/NamingSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/OMGSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/POASystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/UtilSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/LogStrings.properties
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/ActivationSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/IORSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/NamingSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/OMGSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/POASystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/UtilSystemException.java \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/LogStrings.properties
|
||||
|
||||
################################################################################
|
||||
# Build the IDLs.
|
||||
@ -213,8 +213,8 @@ IDL_DELETES := \
|
||||
|
||||
$(eval $(call SetupIdlCompilation,BUILD_IDLS, \
|
||||
IDLJ := $(TOOL_IDLJ_CMD), \
|
||||
SRC := $(CORBA_TOPDIR)/src/share/classes, \
|
||||
BIN := $(CORBA_OUTPUTDIR)/gensrc, \
|
||||
SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \
|
||||
BIN := $(CORBA_OUTPUTDIR)/gensrc/java.corba, \
|
||||
EXCLUDES := com/sun/tools/corba/se/idl/% \
|
||||
org/omg/CORBA/% \
|
||||
com/sun/corba/se/GiopIDL/% \
|
||||
@ -229,12 +229,12 @@ $(BUILD_IDLS): $(BUILD_IDLJ)
|
||||
################################################################################
|
||||
# zh_HK is just a copy of zh_TW
|
||||
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \
|
||||
$(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \
|
||||
$(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
|
||||
$(install-file)
|
||||
|
||||
################################################################################
|
||||
|
||||
all: $(BUILD_IDLS) $(LOGWRAPPER_TARGETS) \
|
||||
$(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties
|
||||
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user