Mercurial > jdk8-mips64-public > corba / changeset
changeset
Merge
Tue, 08 May 2012 07:27:46 -0700
- author
- asaha
- date
- Tue, 08 May 2012 07:27:46 -0700
- changeset 374
- 3697feea6f54
- parent 373
- a00c5c0b1f30
- parent 353
- 83fac66442cf
- child 375
- 787fb5a0602f
Merge
1.1 --- a/.hgtags Tue Apr 10 10:41:36 2012 -0700 1.2 +++ b/.hgtags Tue May 08 07:27:46 2012 -0700 1.3 @@ -155,3 +155,6 @@ 1.4 1954151dfae8f73db24e396380f7c02bdd47c486 jdk8-b31 1.5 5d820cb6b1afd75b619e7fd69e4f2b0eb1d5d6a1 jdk8-b32 1.6 1e2ac1ea3f6c32a62bf88f3fa330120c30db59cb jdk8-b33 1.7 +e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34 1.8 +e3d735914edd0a621b16bb85417423f8e6af5d51 jdk8-b35 1.9 +a5a61f259961a7f46b002e5cc50b4a9bf86927b6 jdk8-b36
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/makefiles/Makefile Tue May 08 07:27:46 2012 -0700 2.3 @@ -0,0 +1,257 @@ 2.4 +# 2.5 +# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. 2.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 +# 2.8 +# This code is free software; you can redistribute it and/or modify it 2.9 +# under the terms of the GNU General Public License version 2 only, as 2.10 +# published by the Free Software Foundation. Oracle designates this 2.11 +# particular file as subject to the "Classpath" exception as provided 2.12 +# by Oracle in the LICENSE file that accompanied this code. 2.13 +# 2.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 2.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.17 +# version 2 for more details (a copy is included in the LICENSE file that 2.18 +# accompanied this code). 2.19 +# 2.20 +# You should have received a copy of the GNU General Public License version 2.21 +# 2 along with this work; if not, write to the Free Software Foundation, 2.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.23 +# 2.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.25 +# or visit www.oracle.com if you need additional information or have any 2.26 +# questions. 2.27 +# 2.28 + 2.29 +# 2.30 +# Makefile for building the corba workspace. 2.31 +# 2.32 + 2.33 +include $(SPEC) 2.34 +include MakeBase.gmk 2.35 +include JavaCompilation.gmk 2.36 +include IdlCompilation.gmk 2.37 + 2.38 +default: all 2.39 + 2.40 +JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ 2.41 + -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 2.42 +# The Corba sources are old and generates a LOT of warnings. 2.43 +# Disable these using Xlint, until someone cares to fix them. 2.44 +DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann 2.45 + 2.46 +# The "generate old bytecode" javac setup uses the new compiler to compile for the 2.47 +# boot jdk to generate tools that need to be run with the boot jdk. 2.48 +# Thus we force the target bytecode to the boot jdk bytecode. 2.49 +$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ 2.50 + JVM:=$(JAVA),\ 2.51 + JAVAC:=$(JAVAC_JARS),\ 2.52 + FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\ 2.53 + SERVER_DIR:=$(JAVAC_SERVERS),\ 2.54 + SERVER_JVM:=$(SERVER_JAVA),\ 2.55 + MODE:=$(JAVAC_USE_MODE),\ 2.56 + USE_DEPS:=$(JAVAC_USE_DEPS))) 2.57 + 2.58 +# The "generate new bytecode" uses the new compiler to generate bytecode 2.59 +# for the new jdk that is being built. The code compiled by this setup 2.60 +# cannot necessarily be run with the boot jdk. 2.61 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ 2.62 + JVM:=$(JAVA),\ 2.63 + JAVAC:=$(JAVAC_JARS),\ 2.64 + FLAGS:=-Xprefer:source -XDignore.symbol.file=true \ 2.65 + -cp $(BOOT_JDK)/lib/tools.jar \ 2.66 + $(DISABLE_CORBA_WARNINGS),\ 2.67 + SERVER_DIR:=$(JAVAC_SERVERS),\ 2.68 + SERVER_JVM:=$(SERVER_JAVA),\ 2.69 + MODE:=$(JAVAC_USE_MODE),\ 2.70 + USE_DEPS:=$(JAVAC_USE_DEPS))) 2.71 + 2.72 +$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\ 2.73 + SETUP:=GENERATE_OLDBYTECODE,\ 2.74 + SRC:=$(CORBA_TOPDIR)/make/tools/src,\ 2.75 + BIN:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes)) 2.76 + 2.77 +$(eval $(call SetupArchive,ARCHIVE_STRIPPROP,$(BUILD_STRIPPROP),\ 2.78 + SRCS:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes,\ 2.79 + JAR:=$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar,\ 2.80 + JARMAIN:=build.tools.stripproperties.StripPropertiesCorba)) 2.81 + 2.82 +$(eval $(call SetupJavaCompilation,BUILD_IDLJ,\ 2.83 + SETUP:=GENERATE_OLDBYTECODE,\ 2.84 + SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 2.85 + BIN:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\ 2.86 + COPY:=.prp,\ 2.87 + INCLUDES:=com/sun/tools/corba/se/idl,\ 2.88 + EXCLUDE_FILES:=ResourceBundleUtil.java)) 2.89 + 2.90 +$(eval $(call SetupArchive,ARCHIVE_IDLJ,$(BUILD_IDLJ),\ 2.91 + SRCS:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\ 2.92 + SUFFIXES:=.class .prp,\ 2.93 + JAR:=$(CORBA_OUTPUTDIR)/btjars/idlj.jar,\ 2.94 + JARMAIN:=com.sun.tools.corba.se.idl.toJavaPortable.Compile)) 2.95 + 2.96 +$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL,\ 2.97 + SETUP:=GENERATE_OLDBYTECODE,\ 2.98 + SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 2.99 + BIN:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\ 2.100 + INCLUDES:=com/sun/tools/corba/se/logutil)) 2.101 + 2.102 +$(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\ 2.103 + SRCS:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\ 2.104 + JAR:=$(CORBA_OUTPUTDIR)/btjars/logutil.jar,\ 2.105 + JARMAIN:=com.sun.tools.corba.se.logutil.MC)) 2.106 + 2.107 +# Generate LogWrapper classes 2.108 +$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \ 2.109 + $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ 2.110 + $(CORBA_OUTPUTDIR)/btjars/logutil.jar 2.111 + mkdir -p $(@D) 2.112 + rm -f $(@D)/_the_wrappers.d 2.113 + echo Generating class file from $*.mc 2.114 + $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D) 2.115 + 2.116 +# Generate LogWrapper properties file by concatening resource files 2.117 +$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \ 2.118 + $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ 2.119 + $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ 2.120 + $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ 2.121 + $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \ 2.122 + $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \ 2.123 + $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ 2.124 + $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ 2.125 + $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource 2.126 + mkdir -p $(@D) 2.127 + echo Concatenating 8 resource files into $(@F) 2.128 + $(CAT) $^ > $@ 2.129 + 2.130 +# The resources files are generated from lisp-like .mc files. 2.131 +$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar 2.132 + mkdir -p $(@D) 2.133 + rm -f $(@D)/_the_wrappers.d 2.134 + echo Generating resource file from $*.mc 2.135 + $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D) 2.136 + 2.137 + 2.138 +$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 2.139 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \ 2.140 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \ 2.141 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ 2.142 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \ 2.143 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \ 2.144 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ 2.145 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \ 2.146 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \ 2.147 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties 2.148 + mkdir -p $(@D) 2.149 + echo LOGWRAPPERS_ARE_CREATED=yes > $@ 2.150 + 2.151 +# Trigger the generation of the logwrappers. After the logwrapper classes and 2.152 +# resources have been created, then the makefile will restart and the newly 2.153 +# created java files will become part of the build further along in the makefile. 2.154 +-include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d 2.155 + 2.156 +ifeq ($(LOGWRAPPERS_ARE_CREATED),yes) 2.157 + $(eval $(call SetupIdlCompilation,BUILD_IDLS,\ 2.158 + IDLJ:=$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar,\ 2.159 + SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 2.160 + BIN:=$(CORBA_OUTPUTDIR)/gensrc,\ 2.161 + EXCLUDES:=com/sun/tools/corba/se/idl/% \ 2.162 + org/omg/CORBA/% \ 2.163 + com/sun/corba/se/GiopIDL/% \ 2.164 + org/omg/PortableServer/corba.idl,\ 2.165 + INCLUDES:=%,\ 2.166 + OLDIMPLBASES:=com/sun/corba/se/PortableActivationIDL/activation.idl \ 2.167 + com/sun/corba/se/spi/activation/activation.idl,\ 2.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)) 2.169 + 2.170 + $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar 2.171 + 2.172 + $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar 2.173 + mkdir -p $(@D) 2.174 + echo IDLS_ARE_CREATED=yes > $@ 2.175 + 2.176 + -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d 2.177 + 2.178 + ifeq ($(IDLS_ARE_CREATED),yes) 2.179 + $(eval $(call SetupJavaCompilation,BUILD_CORBA,\ 2.180 + SETUP:=GENERATE_NEWBYTECODE,\ 2.181 + SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ 2.182 + EXCLUDES:=com/sun/corba/se/PortableActivationIDL\ 2.183 + com/sun/tools/corba/se/logutil,\ 2.184 + EXCLUDE_FILES:=com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ 2.185 + com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ 2.186 + com/sun/org/omg/CORBA/IDLTypeOperations.java \ 2.187 + com/sun/org/omg/CORBA/IRObjectOperations.java \ 2.188 + org/omg/PortableInterceptor/UNKNOWN.java \ 2.189 + com/sun/tools/corba/se/idl/ResourceBundleUtil.java\ 2.190 + com/sun/corba/se/impl/presentation/rmi/jndi.properties,\ 2.191 + COPY:=.prp LogStrings.properties,\ 2.192 + BIN:=$(CORBA_OUTPUTDIR)/classes)) 2.193 + 2.194 + # Separate src.zip call to include sources that were excluded in the build to 2.195 + # mimic behavior in old build system. 2.196 + $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\ 2.197 + SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ 2.198 + ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip)) 2.199 + 2.200 + $(BUILD_CORBA) : $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES) 2.201 + 2.202 + # Run stripproperties on all sunorb resource files. 2.203 + STRIP_PROP_SRC_FILES:=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties") 2.204 + STRIP_PROP_FILES:=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%,$(CORBA_OUTPUTDIR)/classes/%,\ 2.205 + $(STRIP_PROP_SRC_FILES)) 2.206 + # Simple delivery of zh_HK properties files just copies zh_TW properties files 2.207 + STRIP_PROP_FILES+=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties,\ 2.208 + $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties,\ 2.209 + $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")) 2.210 + STRIP_PROP_SRC_FILES+=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties") 2.211 + STRIP_PROP_CMDLINE:=$(subst _SPACE_,$(SPACE),\ 2.212 + $(join $(addprefix -clean_SPACE_,$(STRIP_PROP_SRC_FILES)), \ 2.213 + $(addprefix _SPACE_,$(STRIP_PROP_FILES)))) 2.214 + 2.215 + $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \ 2.216 + $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar 2.217 + $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES))) 2.218 + $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline) 2.219 + $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 2.220 + @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline 2.221 + $(TOUCH) $@ 2.222 + 2.223 + $(eval $(call SetupArchive,ARCHIVE_CORBA,\ 2.224 + $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties,\ 2.225 + SRCS:=$(CORBA_OUTPUTDIR)/classes,\ 2.226 + SUFFIXES:=.class .prp .properties,\ 2.227 + JAR:=$(CORBA_OUTPUTDIR)/dist/lib/classes.jar)) 2.228 + 2.229 + # The created classes.jar now contains Corba compiled to run on the target JDK 2.230 + # and is ready for inclusion in jdk rt.jar. 2.231 + 2.232 + # The created src.zip now contains .java and .properties files used to create the classes in classes.jar 2.233 + # and is ready for inclusion into the jdk src.zip 2.234 + 2.235 + BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/orb.idl $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/ir.idl 2.236 + 2.237 + $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar 2.238 + mkdir -p $(CORBA_OUTPUTDIR)/dist/lib 2.239 + mkdir -p $(CORBA_OUTPUTDIR)/lib 2.240 + rm -f $@ 2.241 + echo Creating `basename $@` 2.242 + cp $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/*.idl $(CORBA_OUTPUTDIR)/lib 2.243 + chmod ug+w $(CORBA_OUTPUTDIR)/lib/* 2.244 + (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) 2.245 + 2.246 + # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl 2.247 + 2.248 + all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 2.249 + $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ 2.250 + $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 2.251 + $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ 2.252 + $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ 2.253 + $(CORBA_OUTPUTDIR)/dist/lib/bin.zip 2.254 + endif 2.255 +endif 2.256 + 2.257 +clean: 2.258 + rm -rf $(CORBA_OUTPUTDIR) 2.259 + 2.260 +.PHONY: default all clean clobber
