corba/makefiles/Makefile
author ohair
Tue, 10 Apr 2012 08:14:57 -0700
changeset 12321 2ed7e5ce2d04
child 12897 9aa652f13e63
permissions -rw-r--r--
7074397: Build infrastructure changes (makefile re-write) Summary: New makefiles transition, old and new living side by side for now. Reviewed-by: ohair, jjg, dholmes, ohrstrom, erikj, ihse, tgranat, ykantser Contributed-by: ohrstrom <fredrik.ohrstrom@oracle.com>, erikj <erik.joelsson@oracle.com>, ihse <magnus.ihse.bursie@oracle.com>, tgranat <torbjorn.granat@oracle.com>, ykantser <yekaterina.kantserova@oracle.com>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12321
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
#
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
# Makefile for building the corba workspace.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
#
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
include $(SPEC)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
include MakeBase.gmk
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
include JavaCompilation.gmk
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
include IdlCompilation.gmk
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    35
default: all
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    37
JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    38
		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    39
# The Corba sources are old and generates a LOT of warnings.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    40
# Disable these using Xlint, until someone cares to fix them. 
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    41
DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
# The "generate old bytecode" javac setup uses the new compiler to compile for the
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
# boot jdk to generate tools that need to be run with the boot jdk.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    45
# Thus we force the target bytecode to the boot jdk bytecode.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
     JVM:=$(JAVA),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    48
     JAVAC:=$(JAVAC_JARS),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    49
     FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    50
     SERVER_DIR:=$(JAVAC_SERVERS),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    51
     SERVER_JVM:=$(SERVER_JAVA),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    52
     MODE:=$(JAVAC_USE_MODE),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    53
     USE_DEPS:=$(JAVAC_USE_DEPS)))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    54
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    55
# The "generate new bytecode" uses the new compiler to generate bytecode
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    56
# for the new jdk that is being built. The code compiled by this setup
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    57
# cannot necessarily be run with the boot jdk.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    58
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    59
     JVM:=$(JAVA),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    60
     JAVAC:=$(JAVAC_JARS),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    61
     FLAGS:=-Xprefer:source -XDignore.symbol.file=true \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    62
		-cp $(BOOT_JDK)/lib/tools.jar \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    63
		$(DISABLE_CORBA_WARNINGS),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    64
     SERVER_DIR:=$(JAVAC_SERVERS),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    65
     SERVER_JVM:=$(SERVER_JAVA),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    66
     MODE:=$(JAVAC_USE_MODE),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    67
     USE_DEPS:=$(JAVAC_USE_DEPS)))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    68
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    69
$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    70
		SETUP:=GENERATE_OLDBYTECODE,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    71
		SRC:=$(CORBA_TOPDIR)/make/tools/src,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    72
		BIN:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    73
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    74
$(eval $(call SetupArchive,ARCHIVE_STRIPPROP,$(BUILD_STRIPPROP),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    75
		SRCS:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    76
		JAR:=$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    77
		JARMAIN:=build.tools.stripproperties.StripPropertiesCorba))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    78
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    79
$(eval $(call SetupJavaCompilation,BUILD_IDLJ,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    80
		SETUP:=GENERATE_OLDBYTECODE,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
		SRC:=$(CORBA_TOPDIR)/src/share/classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    82
		BIN:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    83
		COPY:=.prp,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    84
		INCLUDES:=com/sun/tools/corba/se/idl,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    85
		EXCLUDE_FILES:=ResourceBundleUtil.java))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    86
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    87
$(eval $(call SetupArchive,ARCHIVE_IDLJ,$(BUILD_IDLJ),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    88
		SRCS:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    89
		SUFFIXES:=.class .prp,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    90
		JAR:=$(CORBA_OUTPUTDIR)/btjars/idlj.jar,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    91
		JARMAIN:=com.sun.tools.corba.se.idl.toJavaPortable.Compile))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    92
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    93
$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    94
		SETUP:=GENERATE_OLDBYTECODE,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    95
		SRC:=$(CORBA_TOPDIR)/src/share/classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    96
		BIN:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    97
		INCLUDES:=com/sun/tools/corba/se/logutil))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    98
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    99
$(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   100
		SRCS:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   101
		JAR:=$(CORBA_OUTPUTDIR)/btjars/logutil.jar,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   102
		JARMAIN:=com.sun.tools.corba.se.logutil.MC))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   103
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   104
# Generate LogWrapper classes 
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   105
$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   106
			$(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   107
			$(CORBA_OUTPUTDIR)/btjars/logutil.jar
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   108
	mkdir -p $(@D)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   109
	rm -f $(@D)/_the_wrappers.d
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   110
	echo Generating class file from $*.mc
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   111
	$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   112
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   113
# Generate LogWrapper properties file by concatening resource files 
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   114
$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   115
		$(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   116
		$(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   117
		$(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   118
		$(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   119
		$(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   120
		$(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   121
		$(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   122
		$(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   123
	mkdir -p $(@D)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   124
	echo Concatenating 8 resource files into $(@F)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   125
	$(CAT) $^ > $@
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   126
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   127
# The resources files are generated from lisp-like .mc files.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   128
$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   129
	mkdir -p $(@D)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   130
	rm -f $(@D)/_the_wrappers.d
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   131
	echo Generating resource file from $*.mc
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   132
	$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   133
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   134
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   135
$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   136
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   137
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   138
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   139
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   140
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   141
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   142
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   143
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   144
	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   145
	mkdir -p $(@D) 
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   146
	echo LOGWRAPPERS_ARE_CREATED=yes > $@
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   147
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   148
# Trigger the generation of the logwrappers. After the logwrapper classes and
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   149
# resources have been created, then the makefile will restart and the newly
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   150
# created java files will become part of the build further along in the makefile.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   151
-include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   152
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   153
ifeq ($(LOGWRAPPERS_ARE_CREATED),yes)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   154
        $(eval $(call SetupIdlCompilation,BUILD_IDLS,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   155
                IDLJ:=$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   156
		SRC:=$(CORBA_TOPDIR)/src/share/classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   157
		BIN:=$(CORBA_OUTPUTDIR)/gensrc,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   158
		EXCLUDES:=com/sun/tools/corba/se/idl/% \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   159
			org/omg/CORBA/% \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   160
			com/sun/corba/se/GiopIDL/% \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   161
			org/omg/PortableServer/corba.idl,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   162
		INCLUDES:=%,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   163
		OLDIMPLBASES:=com/sun/corba/se/PortableActivationIDL/activation.idl \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   164
			      com/sun/corba/se/spi/activation/activation.idl,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   165
		DELETES:=DYNANYDELETEFILES org/omg/DynamicAny/*POA* org/omg/DynamicAny/*Holder* org/omg/DynamicAny/DynValueBoxHelper.java org/omg/DynamicAny/DynValueCommonHelper.java org/omg/DynamicAny/_DynValueCommonStub.java org/omg/DynamicAny/_DynValueBoxStub.java org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java IOPDELETEFILES org/omg/IOP/BI_DIR_IIOP.java org/omg/IOP/ChainBypassCheck.java org/omg/IOP/ChainBypassInfo.java org/omg/IOP/FORWARDED_IDENTITY.java org/omg/IOP/INVOCATION_POLICIES.java org/omg/IOP/LogicalThreadId.java org/omg/IOP/SendingContextRunTime.java org/omg/IOP/UnknownExceptionInfo.java org/omg/IOP/TaggedComponentSeqHolder.java POAHELHOLFILES org/omg/PortableServer/CurrentPackage/NoContextHolder.java org/omg/PortableServer/ForwardRequestHolder.java org/omg/PortableServer/IdAssignmentPolicyValueHelper.java org/omg/PortableServer/IdAssignmentPolicyValueHolder.java org/omg/PortableServer/IdUniquenessPolicyValueHelper.java org/omg/PortableServer/IdUniquenessPolicyValueHolder.java org/omg/PortableServer/ImplicitActivationPolicyValueHelper.java org/omg/PortableServer/ImplicitActivationPolicyValueHolder.java org/omg/PortableServer/LifespanPolicyValueHelper.java org/omg/PortableServer/LifespanPolicyValueHolder.java org/omg/PortableServer/ServantRetentionPolicyValueHelper.java org/omg/PortableServer/ServantRetentionPolicyValueHolder.java org/omg/PortableServer/ObjectIdHelper.java org/omg/PortableServer/ObjectIdHolder.java org/omg/PortableServer/POAListHelper.java org/omg/PortableServer/POAListHolder.java org/omg/PortableServer/POAManagerPackage/AdapterInactiveHolder.java org/omg/PortableServer/POAManagerPackage/StateHelper.java org/omg/PortableServer/POAManagerPackage/StateHolder.java org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHolder.java org/omg/PortableServer/POAPackage/AdapterNonExistentHolder.java org/omg/PortableServer/POAPackage/InvalidPolicyHolder.java org/omg/PortableServer/POAPackage/NoServantHolder.java org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHolder.java org/omg/PortableServer/POAPackage/ObjectNotActiveHolder.java org/omg/PortableServer/POAPackage/ServantAlreadyActiveHolder.java org/omg/PortableServer/POAPackage/ServantNotActiveHolder.java org/omg/PortableServer/POAPackage/WrongAdapterHolder.java org/omg/PortableServer/POAPackage/WrongPolicyHolder.java org/omg/PortableServer/RequestProcessingPolicyValueHelper.java org/omg/PortableServer/RequestProcessingPolicyValueHolder.java org/omg/PortableServer/ServantActivatorHolder.java org/omg/PortableServer/ServantLocatorHolder.java org/omg/PortableServer/ThreadPolicyValueHelper.java org/omg/PortableServer/ThreadPolicyValueHolder.java PIHELHOLFILES org/omg/PortableInterceptor/ClientRequestInfoHelper.java org/omg/PortableInterceptor/ClientRequestInterceptorHelper.java org/omg/PortableInterceptor/IORInfoHelper.java org/omg/PortableInterceptor/IORInterceptorHelper.java org/omg/PortableInterceptor/InterceptorHelper.java org/omg/PortableInterceptor/ORBInitInfoHelper.java org/omg/PortableInterceptor/ORBInitializerHelper.java org/omg/PortableInterceptor/PolicyFactoryHelper.java org/omg/PortableInterceptor/ReplyStatusHelper.java org/omg/PortableInterceptor/RequestInfoHelper.java org/omg/PortableInterceptor/ServerRequestInfoHelper.java org/omg/PortableInterceptor/ServerRequestInterceptorHelper.java org/omg/PortableInterceptor/SlotIdHelper.java org/omg/PortableInterceptor/ClientRequestInfoHolder.java org/omg/PortableInterceptor/ClientRequestInterceptorHolder.java org/omg/PortableInterceptor/CurrentHolder.java org/omg/PortableInterceptor/ForwardRequestHolder.java org/omg/PortableInterceptor/IORInfoHolder.java org/omg/PortableInterceptor/IORInterceptorHolder.java org/omg/PortableInterceptor/InterceptorHolder.java org/omg/PortableInterceptor/InvalidSlotHolder.java org/omg/PortableInterceptor/ORBInitInfoHolder.java org/omg/PortableInterceptor/ORBInitializerHolder.java org/omg/PortableInterceptor/PolicyFactoryHolder.java org/omg/PortableInterceptor/RequestInfoHolder.java org/omg/PortableInterceptor/ServerRequestInfoHolder.java org/omg/PortableInterceptor/ServerRequestInterceptorHolder.java org/omg/PortableInterceptor/TaggedComponentSeqHolder.java org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHolder.java org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHolder.java org/omg/IOP/CodecPackage/FormatMismatchHolder.java org/omg/IOP/CodecPackage/InvalidTypeForEncodingHolder.java org/omg/IOP/CodecPackage/TypeMismatchHolder.java org/omg/IOP/CodecHelper.java org/omg/IOP/EncodingFormatHelper.java org/omg/IOP/EncodingHelper.java org/omg/IOP/CodecFactoryPackage/UnknownEncodingHolder.java org/omg/IOP/CodecFactoryHolder.java org/omg/IOP/CodecHolder.java org/omg/IOP/EncodingHolder.java org/omg/IOP/TaggedComponentSeqHelper.java org/omg/Dynamic/ContextListHelper.java org/omg/Dynamic/ExceptionListHelper.java org/omg/Dynamic/ParameterHolder.java org/omg/Dynamic/ParameterListHolder.java org/omg/Dynamic/ExceptionListHolder.java org/omg/Dynamic/ParameterHelper.java org/omg/Dynamic/ParameterListHelper.java org/omg/Dynamic/RequestContextHelper.java CORBAX org/omg/CORBA/OctetSeqHelper.java org/omg/CORBA/OctetSeqHolder.java org/omg/CORBA/PolicyError.java org/omg/CORBA/RepositoryIdHelper.java)) 
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   166
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   167
        $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   168
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   169
        $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   170
		mkdir -p $(@D)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   171
		echo IDLS_ARE_CREATED=yes > $@
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   172
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   173
        -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   174
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   175
        ifeq ($(IDLS_ARE_CREATED),yes)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   176
                $(eval $(call SetupJavaCompilation,BUILD_CORBA,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   177
		    SETUP:=GENERATE_NEWBYTECODE,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   178
		    SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   179
		    EXCLUDES:=com/sun/corba/se/PortableActivationIDL\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   180
			      com/sun/tools/corba/se/logutil,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   181
		    EXCLUDE_FILES:=com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   182
				   com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   183
				   com/sun/org/omg/CORBA/IDLTypeOperations.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   184
				   com/sun/org/omg/CORBA/IRObjectOperations.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   185
				   org/omg/PortableInterceptor/UNKNOWN.java \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   186
				   com/sun/tools/corba/se/idl/ResourceBundleUtil.java\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   187
				   com/sun/corba/se/impl/presentation/rmi/jndi.properties,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   188
		    COPY:=.prp LogStrings.properties,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   189
		    BIN:=$(CORBA_OUTPUTDIR)/classes))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   190
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   191
                # Separate src.zip call to include sources that were excluded in the build to 
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   192
                # mimic behavior in old build system.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   193
                $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   194
		    SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   195
		    ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   196
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   197
                $(BUILD_CORBA) : $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   198
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   199
                # Run stripproperties on all sunorb resource files.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   200
                STRIP_PROP_SRC_FILES:=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties")
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   201
                STRIP_PROP_FILES:=$(patsubst  $(CORBA_TOPDIR)/src/share/classes/%,$(CORBA_OUTPUTDIR)/classes/%,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   202
			$(STRIP_PROP_SRC_FILES))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   203
                # Simple delivery of zh_HK properties files just copies zh_TW properties files
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   204
                STRIP_PROP_FILES+=$(patsubst  $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   205
			$(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   206
			$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties"))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   207
                STRIP_PROP_SRC_FILES+=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   208
		STRIP_PROP_CMDLINE:=$(subst _SPACE_,$(SPACE),\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   209
			$(join $(addprefix -clean_SPACE_,$(STRIP_PROP_SRC_FILES)), \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   210
			$(addprefix _SPACE_,$(STRIP_PROP_FILES))))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   211
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   212
                $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   213
					$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   214
			$(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES)))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   215
			$(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   216
			$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   217
				@$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   218
			$(TOUCH) $@
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   219
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   220
                $(eval $(call SetupArchive,ARCHIVE_CORBA,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   221
		     $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   222
		     SRCS:=$(CORBA_OUTPUTDIR)/classes,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   223
		     SUFFIXES:=.class .prp .properties,\
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   224
		     JAR:=$(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   225
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   226
                # The created classes.jar now contains Corba compiled to run on the target JDK
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   227
                # and is ready for inclusion in jdk rt.jar.
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   228
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   229
                # The created src.zip now contains .java and .properties files used to create the classes in classes.jar
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   230
                # and is ready for inclusion into the jdk src.zip
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   231
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   232
                BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/orb.idl $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/ir.idl
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   233
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   234
                $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   235
			mkdir -p $(CORBA_OUTPUTDIR)/dist/lib
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   236
			mkdir -p $(CORBA_OUTPUTDIR)/lib
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   237
			rm -f $@
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   238
			echo Creating `basename $@`
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   239
			cp $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/*.idl $(CORBA_OUTPUTDIR)/lib
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   240
			chmod ug+w $(CORBA_OUTPUTDIR)/lib/*
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   241
			(cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   242
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   243
                # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   244
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   245
                all: 	$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   246
			$(CORBA_OUTPUTDIR)/btjars/idlj.jar \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   247
			$(CORBA_OUTPUTDIR)/btjars/logutil.jar \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   248
			$(CORBA_OUTPUTDIR)/dist/lib/classes.jar \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   249
			$(CORBA_OUTPUTDIR)/dist/lib/src.zip \
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   250
			$(CORBA_OUTPUTDIR)/dist/lib/bin.zip
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   251
        endif
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   252
endif
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   253
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   254
clean:
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   255
	rm -rf $(CORBA_OUTPUTDIR)
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   256
2ed7e5ce2d04 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   257
.PHONY: default all clean clobber