Mercurial > jdk8-mips64-public > corba / changeset
changeset
Merge
Wed, 16 Oct 2013 11:55:46 -0700
- author
- katleman
- date
- Wed, 16 Oct 2013 11:55:46 -0700
- changeset 510
- 43cec76d1d62
- parent 508
- d7e478820c56
- parent 509
- 66fc1a749867
- child 511
- 54aa9b7d743d
Merge
1.1 --- a/makefiles/BuildCorba.gmk Thu Oct 10 10:08:52 2013 -0700 1.2 +++ b/makefiles/BuildCorba.gmk Wed Oct 16 11:55:46 2013 -0700 1.3 @@ -36,216 +36,218 @@ 1.4 include IdlCompilation.gmk 1.5 1.6 # The Corba sources are old and generates a LOT of warnings. 1.7 -# Disable these using Xlint, until someone cares to fix them. 1.8 -DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann 1.9 +# Disable these using Xlint, until someone cares to fix them. 1.10 +DISABLE_CORBA_WARNINGS := -Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann 1.11 1.12 # The "generate old bytecode" javac setup uses the new compiler to compile for the 1.13 # boot jdk to generate tools that need to be run with the boot jdk. 1.14 # Thus we force the target bytecode to the boot jdk bytecode. 1.15 -$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ 1.16 - JVM:=$(JAVA),\ 1.17 - JAVAC:=$(NEW_JAVAC),\ 1.18 - FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\ 1.19 - SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 1.20 - SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 1.21 +$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \ 1.22 + JVM := $(JAVA), \ 1.23 + JAVAC := $(NEW_JAVAC), \ 1.24 + FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS), \ 1.25 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 1.26 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 1.27 1.28 # The "generate new bytecode" uses the new compiler to generate bytecode 1.29 # for the new jdk that is being built. The code compiled by this setup 1.30 # cannot necessarily be run with the boot jdk. 1.31 -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ 1.32 - JVM:=$(JAVA),\ 1.33 - JAVAC:=$(NEW_JAVAC),\ 1.34 - FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\ 1.35 - SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 1.36 - SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 1.37 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \ 1.38 + JVM := $(JAVA), \ 1.39 + JAVAC := $(NEW_JAVAC), \ 1.40 + FLAGS := -cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS), \ 1.41 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 1.42 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 1.43 1.44 -$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\ 1.45 - SETUP:=GENERATE_OLDBYTECODE,\ 1.46 - SRC:=$(CORBA_TOPDIR)/make/tools/src,\ 1.47 - BIN:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes)) 1.48 +$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP, \ 1.49 + SETUP := GENERATE_OLDBYTECODE, \ 1.50 + SRC := $(CORBA_TOPDIR)/make/tools/src, \ 1.51 + BIN := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes)) 1.52 1.53 -$(eval $(call SetupArchive,ARCHIVE_STRIPPROP,$(BUILD_STRIPPROP),\ 1.54 - SRCS:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes,\ 1.55 - JAR:=$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar,\ 1.56 - JARMAIN:=build.tools.stripproperties.StripPropertiesCorba)) 1.57 +$(eval $(call SetupArchive,ARCHIVE_STRIPPROP, $(BUILD_STRIPPROP), \ 1.58 + SRCS := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes, \ 1.59 + JAR := $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar, \ 1.60 + JARMAIN := build.tools.stripproperties.StripPropertiesCorba)) 1.61 1.62 -$(eval $(call SetupJavaCompilation,BUILD_IDLJ,\ 1.63 - SETUP:=GENERATE_OLDBYTECODE,\ 1.64 - SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 1.65 - BIN:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\ 1.66 - COPY:=.prp,\ 1.67 - INCLUDES:=com/sun/tools/corba/se/idl,\ 1.68 - EXCLUDE_FILES:=ResourceBundleUtil.java)) 1.69 +$(eval $(call SetupJavaCompilation,BUILD_IDLJ, \ 1.70 + SETUP := GENERATE_OLDBYTECODE, \ 1.71 + SRC := $(CORBA_TOPDIR)/src/share/classes, \ 1.72 + BIN := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \ 1.73 + COPY := .prp, \ 1.74 + INCLUDES := com/sun/tools/corba/se/idl, \ 1.75 + EXCLUDE_FILES := ResourceBundleUtil.java)) 1.76 1.77 -$(eval $(call SetupArchive,ARCHIVE_IDLJ,$(BUILD_IDLJ),\ 1.78 - SRCS:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\ 1.79 - SUFFIXES:=.class .prp,\ 1.80 - JAR:=$(CORBA_OUTPUTDIR)/btjars/idlj.jar,\ 1.81 - JARMAIN:=com.sun.tools.corba.se.idl.toJavaPortable.Compile)) 1.82 +$(eval $(call SetupArchive,ARCHIVE_IDLJ, $(BUILD_IDLJ), \ 1.83 + SRCS := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \ 1.84 + SUFFIXES := .class .prp, \ 1.85 + JAR := $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \ 1.86 + JARMAIN := com.sun.tools.corba.se.idl.toJavaPortable.Compile)) 1.87 1.88 -$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL,\ 1.89 - SETUP:=GENERATE_OLDBYTECODE,\ 1.90 - SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 1.91 - BIN:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\ 1.92 - INCLUDES:=com/sun/tools/corba/se/logutil)) 1.93 +$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL, \ 1.94 + SETUP := GENERATE_OLDBYTECODE, \ 1.95 + SRC := $(CORBA_TOPDIR)/src/share/classes, \ 1.96 + BIN := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \ 1.97 + INCLUDES := com/sun/tools/corba/se/logutil)) 1.98 1.99 -$(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\ 1.100 - SRCS:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\ 1.101 - JAR:=$(CORBA_OUTPUTDIR)/btjars/logutil.jar,\ 1.102 - JARMAIN:=com.sun.tools.corba.se.logutil.MC)) 1.103 +$(eval $(call SetupArchive,ARCHIVE_LOGUTIL, $(BUILD_LOGUTIL), \ 1.104 + SRCS := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \ 1.105 + JAR := $(CORBA_OUTPUTDIR)/btjars/logutil.jar, \ 1.106 + JARMAIN := com.sun.tools.corba.se.logutil.MC)) 1.107 1.108 -# Generate LogWrapper classes 1.109 -$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \ 1.110 - $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ 1.111 - $(CORBA_OUTPUTDIR)/btjars/logutil.jar 1.112 +# Generate LogWrapper classes 1.113 +$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java: \ 1.114 + $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ 1.115 + $(CORBA_OUTPUTDIR)/btjars/logutil.jar 1.116 $(MKDIR) -p $(@D) 1.117 $(RM) -f $(@D)/_the_wrappers.d 1.118 - $(ECHO) $(LOG_INFO) Generating class file from $*.mc 1.119 + $(ECHO) $(LOG_INFO) Generating class file from $*.mc 1.120 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D) 1.121 1.122 -# Generate LogWrapper properties file by concatening resource files 1.123 +# Generate LogWrapper properties file by concatening resource files 1.124 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \ 1.125 - $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ 1.126 - $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ 1.127 - $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ 1.128 - $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \ 1.129 - $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \ 1.130 - $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ 1.131 - $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ 1.132 - $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource 1.133 + $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ 1.134 + $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ 1.135 + $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ 1.136 + $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \ 1.137 + $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \ 1.138 + $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ 1.139 + $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ 1.140 + $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource 1.141 $(MKDIR) -p $(@D) 1.142 $(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F) 1.143 $(CAT) $^ > $@ 1.144 1.145 # The resources files are generated from lisp-like .mc files. 1.146 -$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar 1.147 +$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar 1.148 $(MKDIR) -p $(@D) 1.149 $(RM) -f $(@D)/_the_wrappers.d 1.150 - $(ECHO) $(LOG_INFO) Generating resource file from $*.mc 1.151 + $(ECHO) $(LOG_INFO) Generating resource file from $*.mc 1.152 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D) 1.153 1.154 1.155 -$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 1.156 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \ 1.157 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \ 1.158 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ 1.159 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \ 1.160 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \ 1.161 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ 1.162 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \ 1.163 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \ 1.164 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties 1.165 - $(MKDIR) -p $(@D) 1.166 - $(ECHO) LOGWRAPPERS_ARE_CREATED=yes > $@ 1.167 +$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d: $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 1.168 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \ 1.169 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \ 1.170 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ 1.171 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \ 1.172 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \ 1.173 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ 1.174 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \ 1.175 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \ 1.176 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties 1.177 + $(MKDIR) -p $(@D) 1.178 + $(ECHO) LOGWRAPPERS_ARE_CREATED = yes > $@ 1.179 1.180 # Trigger the generation of the logwrappers. After the logwrapper classes and 1.181 # resources have been created, then the makefile will restart and the newly 1.182 # created java files will become part of the build further along in the makefile. 1.183 -include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d 1.184 1.185 -ifeq ($(LOGWRAPPERS_ARE_CREATED),yes) 1.186 - $(eval $(call SetupIdlCompilation,BUILD_IDLS,\ 1.187 - IDLJ:=$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar,\ 1.188 - SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 1.189 - BIN:=$(CORBA_OUTPUTDIR)/gensrc,\ 1.190 - EXCLUDES:=com/sun/tools/corba/se/idl/% \ 1.191 - org/omg/CORBA/% \ 1.192 - com/sun/corba/se/GiopIDL/% \ 1.193 - org/omg/PortableServer/corba.idl,\ 1.194 - INCLUDES:=%,\ 1.195 - OLDIMPLBASES:=com/sun/corba/se/PortableActivationIDL/activation.idl \ 1.196 - com/sun/corba/se/spi/activation/activation.idl,\ 1.197 - 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.198 +ifeq ($(LOGWRAPPERS_ARE_CREATED), yes) 1.199 1.200 - $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar 1.201 + $(eval $(call SetupIdlCompilation,BUILD_IDLS, \ 1.202 + IDLJ := $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \ 1.203 + SRC := $(CORBA_TOPDIR)/src/share/classes, \ 1.204 + BIN := $(CORBA_OUTPUTDIR)/gensrc, \ 1.205 + EXCLUDES := com/sun/tools/corba/se/idl/% \ 1.206 + org/omg/CORBA/% \ 1.207 + com/sun/corba/se/GiopIDL/% \ 1.208 + org/omg/PortableServer/corba.idl, \ 1.209 + INCLUDES := %, \ 1.210 + OLDIMPLBASES := com/sun/corba/se/PortableActivationIDL/activation.idl \ 1.211 + com/sun/corba/se/spi/activation/activation.idl, \ 1.212 + 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.213 1.214 - $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar 1.215 - $(MKDIR) -p $(@D) 1.216 - $(ECHO) IDLS_ARE_CREATED=yes > $@ 1.217 + $(BUILD_IDLS): $(CORBA_OUTPUTDIR)/btjars/idlj.jar 1.218 1.219 - -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d 1.220 + $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d: $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar 1.221 + $(MKDIR) -p $(@D) 1.222 + $(ECHO) IDLS_ARE_CREATED = yes > $@ 1.223 1.224 - ifeq ($(IDLS_ARE_CREATED),yes) 1.225 - $(eval $(call SetupJavaCompilation,BUILD_CORBA,\ 1.226 - SETUP:=GENERATE_NEWBYTECODE,\ 1.227 - SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ 1.228 - EXCLUDES:=com/sun/corba/se/PortableActivationIDL\ 1.229 - com/sun/tools/corba/se/logutil,\ 1.230 - EXCLUDE_FILES:=com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ 1.231 - com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ 1.232 - com/sun/org/omg/CORBA/IDLTypeOperations.java \ 1.233 - com/sun/org/omg/CORBA/IRObjectOperations.java \ 1.234 - org/omg/PortableInterceptor/UNKNOWN.java \ 1.235 - com/sun/tools/corba/se/idl/ResourceBundleUtil.java\ 1.236 - com/sun/corba/se/impl/presentation/rmi/jndi.properties,\ 1.237 - COPY:=.prp LogStrings.properties,\ 1.238 - BIN:=$(CORBA_OUTPUTDIR)/classes)) 1.239 + -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d 1.240 1.241 - # Separate src.zip call to include sources that were excluded in the build to 1.242 - # mimic behavior in old build system. 1.243 - $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\ 1.244 - SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ 1.245 - ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip)) 1.246 + ifeq ($(IDLS_ARE_CREATED), yes) 1.247 1.248 - $(BUILD_CORBA) : $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES) 1.249 + $(eval $(call SetupJavaCompilation,BUILD_CORBA, \ 1.250 + SETUP := GENERATE_NEWBYTECODE, \ 1.251 + SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ 1.252 + EXCLUDES := com/sun/corba/se/PortableActivationIDL \ 1.253 + com/sun/tools/corba/se/logutil, \ 1.254 + EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ 1.255 + com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ 1.256 + com/sun/org/omg/CORBA/IDLTypeOperations.java \ 1.257 + com/sun/org/omg/CORBA/IRObjectOperations.java \ 1.258 + org/omg/PortableInterceptor/UNKNOWN.java \ 1.259 + com/sun/tools/corba/se/idl/ResourceBundleUtil.java \ 1.260 + com/sun/corba/se/impl/presentation/rmi/jndi.properties, \ 1.261 + COPY := .prp LogStrings.properties, \ 1.262 + BIN := $(CORBA_OUTPUTDIR)/classes)) 1.263 1.264 - # Run stripproperties on all sunorb resource files. 1.265 - STRIP_PROP_SRC_FILES:=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties") 1.266 - STRIP_PROP_FILES:=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%,$(CORBA_OUTPUTDIR)/classes/%,\ 1.267 - $(STRIP_PROP_SRC_FILES)) 1.268 - # Simple delivery of zh_HK properties files just copies zh_TW properties files 1.269 - STRIP_PROP_FILES+=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties,\ 1.270 - $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties,\ 1.271 - $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")) 1.272 - STRIP_PROP_SRC_FILES+=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties") 1.273 - STRIP_PROP_CMDLINE:=$(subst _SPACE_,$(SPACE),\ 1.274 - $(join $(addprefix -clean_SPACE_,$(STRIP_PROP_SRC_FILES)), \ 1.275 - $(addprefix _SPACE_,$(STRIP_PROP_FILES)))) 1.276 + # Separate src.zip call to include sources that were excluded in the build to 1.277 + # mimic behavior in old build system. 1.278 + $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA, \ 1.279 + SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ 1.280 + ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip)) 1.281 1.282 - $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \ 1.283 - $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar 1.284 - $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES))) 1.285 - $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline) 1.286 - $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 1.287 - @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline 1.288 - $(TOUCH) $@ 1.289 + $(BUILD_CORBA): $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES) 1.290 1.291 - $(eval $(call SetupArchive,ARCHIVE_CORBA,\ 1.292 - $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties,\ 1.293 - SRCS:=$(CORBA_OUTPUTDIR)/classes,\ 1.294 - SUFFIXES:=.class .prp .properties,\ 1.295 - JAR:=$(CORBA_OUTPUTDIR)/dist/lib/classes.jar)) 1.296 + # Run stripproperties on all sunorb resource files. 1.297 + STRIP_PROP_SRC_FILES := $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties") 1.298 + STRIP_PROP_FILES := $(patsubst $(CORBA_TOPDIR)/src/share/classes/%, $(CORBA_OUTPUTDIR)/classes/%, \ 1.299 + $(STRIP_PROP_SRC_FILES)) 1.300 + # Simple delivery of zh_HK properties files just copies zh_TW properties files 1.301 + STRIP_PROP_FILES += $(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties, \ 1.302 + $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties, \ 1.303 + $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")) 1.304 + STRIP_PROP_SRC_FILES += $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties") 1.305 + STRIP_PROP_CMDLINE := $(subst _SPACE_, $(SPACE), \ 1.306 + $(join $(addprefix -clean_SPACE_, $(STRIP_PROP_SRC_FILES)), \ 1.307 + $(addprefix _SPACE_, $(STRIP_PROP_FILES)))) 1.308 1.309 - # The created classes.jar now contains Corba compiled to run on the target JDK 1.310 - # and is ready for inclusion in jdk rt.jar. 1.311 + $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \ 1.312 + $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar 1.313 + $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES))) 1.314 + $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline) 1.315 + $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 1.316 + @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline 1.317 + $(TOUCH) $@ 1.318 1.319 - # The created src.zip now contains .java and .properties files used to create the classes in classes.jar 1.320 - # and is ready for inclusion into the jdk src.zip 1.321 + $(eval $(call SetupArchive,ARCHIVE_CORBA, \ 1.322 + $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties, \ 1.323 + SRCS := $(CORBA_OUTPUTDIR)/classes, \ 1.324 + SUFFIXES := .class .prp .properties, \ 1.325 + JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar)) 1.326 1.327 - BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \ 1.328 - $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl 1.329 + # The created classes.jar now contains Corba compiled to run on the target JDK 1.330 + # and is ready for inclusion in jdk rt.jar. 1.331 1.332 - $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar 1.333 - $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib 1.334 - $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib 1.335 - $(RM) -f $@ 1.336 - $(ECHO) Creating `basename $@` 1.337 - $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib 1.338 - $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/* 1.339 - (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) 1.340 + # The created src.zip now contains .java and .properties files used to create the classes in classes.jar 1.341 + # and is ready for inclusion into the jdk src.zip 1.342 1.343 - # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl 1.344 + BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \ 1.345 + $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl 1.346 1.347 - all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 1.348 - $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ 1.349 - $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 1.350 - $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ 1.351 - $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ 1.352 - $(CORBA_OUTPUTDIR)/dist/lib/bin.zip 1.353 - endif 1.354 + $(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar 1.355 + $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib 1.356 + $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib 1.357 + $(RM) -f $@ 1.358 + $(ECHO) Creating `basename $@` 1.359 + $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib 1.360 + $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/* 1.361 + (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) 1.362 + 1.363 + # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl 1.364 + 1.365 + all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 1.366 + $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ 1.367 + $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 1.368 + $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ 1.369 + $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ 1.370 + $(CORBA_OUTPUTDIR)/dist/lib/bin.zip 1.371 + endif 1.372 endif 1.373 1.374 clean: 1.375 $(RM) -rf $(CORBA_OUTPUTDIR) 1.376 1.377 -.PHONY: default all clean clobber 1.378 +.PHONY: default all clean clobber
2.1 --- a/makefiles/Makefile Thu Oct 10 10:08:52 2013 -0700 2.2 +++ b/makefiles/Makefile Wed Oct 16 11:55:46 2013 -0700 2.3 @@ -24,19 +24,19 @@ 2.4 # 2.5 2.6 # Locate this Makefile 2.7 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 2.8 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.9 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 2.10 + makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.11 else 2.12 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 2.13 + makefile_path := $(lastword $(MAKEFILE_LIST)) 2.14 endif 2.15 -repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path)) 2.16 +repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path)) 2.17 2.18 # What is the name of this subsystem (langtools, corba, etc)? 2.19 -subsystem_name:=$(notdir $(repo_dir)) 2.20 +subsystem_name := $(notdir $(repo_dir)) 2.21 2.22 # Try to locate top-level makefile 2.23 -top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile 2.24 -ifneq ($(wildcard $(top_level_makefile)),) 2.25 +top_level_makefile := $(repo_dir)/../common/makefiles/Makefile 2.26 +ifneq ($(wildcard $(top_level_makefile)), ) 2.27 $(info Will run $(subsystem_name) target on top-level Makefile) 2.28 $(info WARNING: This is a non-recommended way of building!) 2.29 $(info ===================================================)
