7074397: Build infrastructure changes (makefile re-write)

Tue, 10 Apr 2012 08:14:57 -0700

author
ohair
date
Tue, 10 Apr 2012 08:14:57 -0700
changeset 349
a1b6b8f33d86
parent 347
1e2ac1ea3f6c
child 350
e24c5cc8b0f7

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>

makefiles/Makefile file | annotate | diff | comparison | revisions
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/makefiles/Makefile	Tue Apr 10 08:14:57 2012 -0700
     1.3 @@ -0,0 +1,257 @@
     1.4 +#
     1.5 +# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.7 +#
     1.8 +# This code is free software; you can redistribute it and/or modify it
     1.9 +# under the terms of the GNU General Public License version 2 only, as
    1.10 +# published by the Free Software Foundation.  Oracle designates this
    1.11 +# particular file as subject to the "Classpath" exception as provided
    1.12 +# by Oracle in the LICENSE file that accompanied this code.
    1.13 +#
    1.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
    1.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.16 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.17 +# version 2 for more details (a copy is included in the LICENSE file that
    1.18 +# accompanied this code).
    1.19 +#
    1.20 +# You should have received a copy of the GNU General Public License version
    1.21 +# 2 along with this work; if not, write to the Free Software Foundation,
    1.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.23 +#
    1.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.25 +# or visit www.oracle.com if you need additional information or have any
    1.26 +# questions.
    1.27 +#
    1.28 +
    1.29 +#
    1.30 +# Makefile for building the corba workspace.
    1.31 +#
    1.32 +
    1.33 +include $(SPEC)
    1.34 +include MakeBase.gmk
    1.35 +include JavaCompilation.gmk
    1.36 +include IdlCompilation.gmk
    1.37 +
    1.38 +default: all
    1.39 +
    1.40 +JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
    1.41 +		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
    1.42 +# The Corba sources are old and generates a LOT of warnings.
    1.43 +# Disable these using Xlint, until someone cares to fix them. 
    1.44 +DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann
    1.45 +
    1.46 +# The "generate old bytecode" javac setup uses the new compiler to compile for the
    1.47 +# boot jdk to generate tools that need to be run with the boot jdk.
    1.48 +# Thus we force the target bytecode to the boot jdk bytecode.
    1.49 +$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
    1.50 +     JVM:=$(JAVA),\
    1.51 +     JAVAC:=$(JAVAC_JARS),\
    1.52 +     FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\
    1.53 +     SERVER_DIR:=$(JAVAC_SERVERS),\
    1.54 +     SERVER_JVM:=$(SERVER_JAVA),\
    1.55 +     MODE:=$(JAVAC_USE_MODE),\
    1.56 +     USE_DEPS:=$(JAVAC_USE_DEPS)))
    1.57 +
    1.58 +# The "generate new bytecode" uses the new compiler to generate bytecode
    1.59 +# for the new jdk that is being built. The code compiled by this setup
    1.60 +# cannot necessarily be run with the boot jdk.
    1.61 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\
    1.62 +     JVM:=$(JAVA),\
    1.63 +     JAVAC:=$(JAVAC_JARS),\
    1.64 +     FLAGS:=-Xprefer:source -XDignore.symbol.file=true \
    1.65 +		-cp $(BOOT_JDK)/lib/tools.jar \
    1.66 +		$(DISABLE_CORBA_WARNINGS),\
    1.67 +     SERVER_DIR:=$(JAVAC_SERVERS),\
    1.68 +     SERVER_JVM:=$(SERVER_JAVA),\
    1.69 +     MODE:=$(JAVAC_USE_MODE),\
    1.70 +     USE_DEPS:=$(JAVAC_USE_DEPS)))
    1.71 +
    1.72 +$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\
    1.73 +		SETUP:=GENERATE_OLDBYTECODE,\
    1.74 +		SRC:=$(CORBA_TOPDIR)/make/tools/src,\
    1.75 +		BIN:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes))
    1.76 +
    1.77 +$(eval $(call SetupArchive,ARCHIVE_STRIPPROP,$(BUILD_STRIPPROP),\
    1.78 +		SRCS:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes,\
    1.79 +		JAR:=$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar,\
    1.80 +		JARMAIN:=build.tools.stripproperties.StripPropertiesCorba))
    1.81 +
    1.82 +$(eval $(call SetupJavaCompilation,BUILD_IDLJ,\
    1.83 +		SETUP:=GENERATE_OLDBYTECODE,\
    1.84 +		SRC:=$(CORBA_TOPDIR)/src/share/classes,\
    1.85 +		BIN:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\
    1.86 +		COPY:=.prp,\
    1.87 +		INCLUDES:=com/sun/tools/corba/se/idl,\
    1.88 +		EXCLUDE_FILES:=ResourceBundleUtil.java))
    1.89 +
    1.90 +$(eval $(call SetupArchive,ARCHIVE_IDLJ,$(BUILD_IDLJ),\
    1.91 +		SRCS:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\
    1.92 +		SUFFIXES:=.class .prp,\
    1.93 +		JAR:=$(CORBA_OUTPUTDIR)/btjars/idlj.jar,\
    1.94 +		JARMAIN:=com.sun.tools.corba.se.idl.toJavaPortable.Compile))
    1.95 +
    1.96 +$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL,\
    1.97 +		SETUP:=GENERATE_OLDBYTECODE,\
    1.98 +		SRC:=$(CORBA_TOPDIR)/src/share/classes,\
    1.99 +		BIN:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\
   1.100 +		INCLUDES:=com/sun/tools/corba/se/logutil))
   1.101 +
   1.102 +$(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\
   1.103 +		SRCS:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\
   1.104 +		JAR:=$(CORBA_OUTPUTDIR)/btjars/logutil.jar,\
   1.105 +		JARMAIN:=com.sun.tools.corba.se.logutil.MC))
   1.106 +
   1.107 +# Generate LogWrapper classes 
   1.108 +$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \
   1.109 +			$(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
   1.110 +			$(CORBA_OUTPUTDIR)/btjars/logutil.jar
   1.111 +	mkdir -p $(@D)
   1.112 +	rm -f $(@D)/_the_wrappers.d
   1.113 +	echo Generating class file from $*.mc
   1.114 +	$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D)
   1.115 +
   1.116 +# Generate LogWrapper properties file by concatening resource files 
   1.117 +$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \
   1.118 +		$(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \
   1.119 +		$(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \
   1.120 +		$(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \
   1.121 +		$(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \
   1.122 +		$(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \
   1.123 +		$(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \
   1.124 +		$(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \
   1.125 +		$(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource
   1.126 +	mkdir -p $(@D)
   1.127 +	echo Concatenating 8 resource files into $(@F)
   1.128 +	$(CAT) $^ > $@
   1.129 +
   1.130 +# The resources files are generated from lisp-like .mc files.
   1.131 +$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar
   1.132 +	mkdir -p $(@D)
   1.133 +	rm -f $(@D)/_the_wrappers.d
   1.134 +	echo Generating resource file from $*.mc
   1.135 +	$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D)
   1.136 +
   1.137 +
   1.138 +$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
   1.139 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \
   1.140 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \
   1.141 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
   1.142 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \
   1.143 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \
   1.144 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
   1.145 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \
   1.146 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \
   1.147 +	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties
   1.148 +	mkdir -p $(@D) 
   1.149 +	echo LOGWRAPPERS_ARE_CREATED=yes > $@
   1.150 +
   1.151 +# Trigger the generation of the logwrappers. After the logwrapper classes and
   1.152 +# resources have been created, then the makefile will restart and the newly
   1.153 +# created java files will become part of the build further along in the makefile.
   1.154 +-include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d
   1.155 +
   1.156 +ifeq ($(LOGWRAPPERS_ARE_CREATED),yes)
   1.157 +        $(eval $(call SetupIdlCompilation,BUILD_IDLS,\
   1.158 +                IDLJ:=$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar,\
   1.159 +		SRC:=$(CORBA_TOPDIR)/src/share/classes,\
   1.160 +		BIN:=$(CORBA_OUTPUTDIR)/gensrc,\
   1.161 +		EXCLUDES:=com/sun/tools/corba/se/idl/% \
   1.162 +			org/omg/CORBA/% \
   1.163 +			com/sun/corba/se/GiopIDL/% \
   1.164 +			org/omg/PortableServer/corba.idl,\
   1.165 +		INCLUDES:=%,\
   1.166 +		OLDIMPLBASES:=com/sun/corba/se/PortableActivationIDL/activation.idl \
   1.167 +			      com/sun/corba/se/spi/activation/activation.idl,\
   1.168 +		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)) 
   1.169 +
   1.170 +        $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar
   1.171 +
   1.172 +        $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar
   1.173 +		mkdir -p $(@D)
   1.174 +		echo IDLS_ARE_CREATED=yes > $@
   1.175 +
   1.176 +        -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
   1.177 +
   1.178 +        ifeq ($(IDLS_ARE_CREATED),yes)
   1.179 +                $(eval $(call SetupJavaCompilation,BUILD_CORBA,\
   1.180 +		    SETUP:=GENERATE_NEWBYTECODE,\
   1.181 +		    SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\
   1.182 +		    EXCLUDES:=com/sun/corba/se/PortableActivationIDL\
   1.183 +			      com/sun/tools/corba/se/logutil,\
   1.184 +		    EXCLUDE_FILES:=com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
   1.185 +				   com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
   1.186 +				   com/sun/org/omg/CORBA/IDLTypeOperations.java \
   1.187 +				   com/sun/org/omg/CORBA/IRObjectOperations.java \
   1.188 +				   org/omg/PortableInterceptor/UNKNOWN.java \
   1.189 +				   com/sun/tools/corba/se/idl/ResourceBundleUtil.java\
   1.190 +				   com/sun/corba/se/impl/presentation/rmi/jndi.properties,\
   1.191 +		    COPY:=.prp LogStrings.properties,\
   1.192 +		    BIN:=$(CORBA_OUTPUTDIR)/classes))
   1.193 +
   1.194 +                # Separate src.zip call to include sources that were excluded in the build to 
   1.195 +                # mimic behavior in old build system.
   1.196 +                $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\
   1.197 +		    SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\
   1.198 +		    ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip))
   1.199 +
   1.200 +                $(BUILD_CORBA) : $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES)
   1.201 +
   1.202 +                # Run stripproperties on all sunorb resource files.
   1.203 +                STRIP_PROP_SRC_FILES:=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties")
   1.204 +                STRIP_PROP_FILES:=$(patsubst  $(CORBA_TOPDIR)/src/share/classes/%,$(CORBA_OUTPUTDIR)/classes/%,\
   1.205 +			$(STRIP_PROP_SRC_FILES))
   1.206 +                # Simple delivery of zh_HK properties files just copies zh_TW properties files
   1.207 +                STRIP_PROP_FILES+=$(patsubst  $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties,\
   1.208 +			$(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties,\
   1.209 +			$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties"))
   1.210 +                STRIP_PROP_SRC_FILES+=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")
   1.211 +		STRIP_PROP_CMDLINE:=$(subst _SPACE_,$(SPACE),\
   1.212 +			$(join $(addprefix -clean_SPACE_,$(STRIP_PROP_SRC_FILES)), \
   1.213 +			$(addprefix _SPACE_,$(STRIP_PROP_FILES))))
   1.214 +
   1.215 +                $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \
   1.216 +					$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar
   1.217 +			$(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES)))
   1.218 +			$(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline)
   1.219 +			$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
   1.220 +				@$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline
   1.221 +			$(TOUCH) $@
   1.222 +
   1.223 +                $(eval $(call SetupArchive,ARCHIVE_CORBA,\
   1.224 +		     $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties,\
   1.225 +		     SRCS:=$(CORBA_OUTPUTDIR)/classes,\
   1.226 +		     SUFFIXES:=.class .prp .properties,\
   1.227 +		     JAR:=$(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
   1.228 +
   1.229 +                # The created classes.jar now contains Corba compiled to run on the target JDK
   1.230 +                # and is ready for inclusion in jdk rt.jar.
   1.231 +
   1.232 +                # The created src.zip now contains .java and .properties files used to create the classes in classes.jar
   1.233 +                # and is ready for inclusion into the jdk src.zip
   1.234 +
   1.235 +                BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/orb.idl $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/ir.idl
   1.236 +
   1.237 +                $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar
   1.238 +			mkdir -p $(CORBA_OUTPUTDIR)/dist/lib
   1.239 +			mkdir -p $(CORBA_OUTPUTDIR)/lib
   1.240 +			rm -f $@
   1.241 +			echo Creating `basename $@`
   1.242 +			cp $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/*.idl $(CORBA_OUTPUTDIR)/lib
   1.243 +			chmod ug+w $(CORBA_OUTPUTDIR)/lib/*
   1.244 +			(cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
   1.245 +
   1.246 +                # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl
   1.247 +
   1.248 +                all: 	$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
   1.249 +			$(CORBA_OUTPUTDIR)/btjars/idlj.jar \
   1.250 +			$(CORBA_OUTPUTDIR)/btjars/logutil.jar \
   1.251 +			$(CORBA_OUTPUTDIR)/dist/lib/classes.jar \
   1.252 +			$(CORBA_OUTPUTDIR)/dist/lib/src.zip \
   1.253 +			$(CORBA_OUTPUTDIR)/dist/lib/bin.zip
   1.254 +        endif
   1.255 +endif
   1.256 +
   1.257 +clean:
   1.258 +	rm -rf $(CORBA_OUTPUTDIR)
   1.259 +
   1.260 +.PHONY: default all clean clobber 

mercurial