Mercurial > jdk8-mips64-public > corba / changeset
changeset
Merge
Thu, 17 Oct 2013 14:17:54 -0700
- author
- lana
- date
- Thu, 17 Oct 2013 14:17:54 -0700
- changeset 529
- 1c01208087b5
- parent 528
- 1a71d800b032
- parent 511
- 54aa9b7d743d
- child 530
- a259ff3e42d9
- child 533
- 52ad44f9a3ec
Merge
| makefiles/BuildCorba.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Wed Oct 16 23:31:16 2013 -0700 1.2 +++ b/.hgtags Thu Oct 17 14:17:54 2013 -0700 1.3 @@ -233,3 +233,4 @@ 1.4 428428cf5e06163322144cfb5367e1faa86acf20 jdk8-b109 1.5 3d2b7ce93c5c2e3db748f29c3d29620a8b3b748a jdk8-b110 1.6 85c1c94e723582f9a1dd0251502c42b73d6deea7 jdk8-b111 1.7 +43cec76d1d62587a07af07e2d9bec93aba2a506b jdk8-b112
2.1 --- a/makefiles/BuildCorba.gmk Wed Oct 16 23:31:16 2013 -0700 2.2 +++ b/makefiles/BuildCorba.gmk Thu Oct 17 14:17:54 2013 -0700 2.3 @@ -36,152 +36,154 @@ 2.4 include IdlCompilation.gmk 2.5 2.6 # The Corba sources are old and generates a LOT of warnings. 2.7 -# Disable these using Xlint, until someone cares to fix them. 2.8 -DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann 2.9 +# Disable these using Xlint, until someone cares to fix them. 2.10 +DISABLE_CORBA_WARNINGS := -Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann 2.11 2.12 # The "generate old bytecode" javac setup uses the new compiler to compile for the 2.13 # boot jdk to generate tools that need to be run with the boot jdk. 2.14 # Thus we force the target bytecode to the boot jdk bytecode. 2.15 -$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ 2.16 - JVM:=$(JAVA),\ 2.17 - JAVAC:=$(NEW_JAVAC),\ 2.18 - FLAGS := $(BOOT_JDK_SOURCETARGET) \ 2.19 - -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \ 2.20 - $(DISABLE_CORBA_WARNINGS), \ 2.21 - SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 2.22 - SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 2.23 +$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \ 2.24 + JVM := $(JAVA), \ 2.25 + JAVAC := $(NEW_JAVAC), \ 2.26 + FLAGS := $(BOOT_JDK_SOURCETARGET) \ 2.27 + -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \ 2.28 + $(DISABLE_CORBA_WARNINGS), \ 2.29 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 2.30 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 2.31 2.32 # The "generate new bytecode" uses the new compiler to generate bytecode 2.33 # for the new jdk that is being built. The code compiled by this setup 2.34 # cannot necessarily be run with the boot jdk. 2.35 -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ 2.36 - JVM:=$(JAVA),\ 2.37 - JAVAC:=$(NEW_JAVAC),\ 2.38 - FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\ 2.39 - SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 2.40 - SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 2.41 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \ 2.42 + JVM := $(JAVA), \ 2.43 + JAVAC := $(NEW_JAVAC), \ 2.44 + FLAGS := -cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS), \ 2.45 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 2.46 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 2.47 2.48 -$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\ 2.49 - SETUP:=GENERATE_OLDBYTECODE,\ 2.50 - SRC:=$(CORBA_TOPDIR)/make/tools/src,\ 2.51 - BIN:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes)) 2.52 +$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP, \ 2.53 + SETUP := GENERATE_OLDBYTECODE, \ 2.54 + SRC := $(CORBA_TOPDIR)/make/tools/src, \ 2.55 + BIN := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes)) 2.56 2.57 -$(eval $(call SetupArchive,ARCHIVE_STRIPPROP,$(BUILD_STRIPPROP),\ 2.58 - SRCS:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes,\ 2.59 - JAR:=$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar,\ 2.60 - JARMAIN:=build.tools.stripproperties.StripPropertiesCorba)) 2.61 +$(eval $(call SetupArchive,ARCHIVE_STRIPPROP, $(BUILD_STRIPPROP), \ 2.62 + SRCS := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes, \ 2.63 + JAR := $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar, \ 2.64 + JARMAIN := build.tools.stripproperties.StripPropertiesCorba)) 2.65 2.66 -$(eval $(call SetupJavaCompilation,BUILD_IDLJ,\ 2.67 - SETUP:=GENERATE_OLDBYTECODE,\ 2.68 - SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 2.69 - BIN:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\ 2.70 - COPY:=.prp,\ 2.71 - INCLUDES:=com/sun/tools/corba/se/idl,\ 2.72 - EXCLUDE_FILES:=ResourceBundleUtil.java)) 2.73 +$(eval $(call SetupJavaCompilation,BUILD_IDLJ, \ 2.74 + SETUP := GENERATE_OLDBYTECODE, \ 2.75 + SRC := $(CORBA_TOPDIR)/src/share/classes, \ 2.76 + BIN := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \ 2.77 + COPY := .prp, \ 2.78 + INCLUDES := com/sun/tools/corba/se/idl, \ 2.79 + EXCLUDE_FILES := ResourceBundleUtil.java)) 2.80 2.81 -$(eval $(call SetupArchive,ARCHIVE_IDLJ,$(BUILD_IDLJ),\ 2.82 - SRCS:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\ 2.83 - SUFFIXES:=.class .prp,\ 2.84 - JAR:=$(CORBA_OUTPUTDIR)/btjars/idlj.jar,\ 2.85 - JARMAIN:=com.sun.tools.corba.se.idl.toJavaPortable.Compile)) 2.86 +$(eval $(call SetupArchive,ARCHIVE_IDLJ, $(BUILD_IDLJ), \ 2.87 + SRCS := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \ 2.88 + SUFFIXES := .class .prp, \ 2.89 + JAR := $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \ 2.90 + JARMAIN := com.sun.tools.corba.se.idl.toJavaPortable.Compile)) 2.91 2.92 -$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL,\ 2.93 - SETUP:=GENERATE_OLDBYTECODE,\ 2.94 - SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 2.95 - BIN:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\ 2.96 - INCLUDES:=com/sun/tools/corba/se/logutil)) 2.97 +$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL, \ 2.98 + SETUP := GENERATE_OLDBYTECODE, \ 2.99 + SRC := $(CORBA_TOPDIR)/src/share/classes, \ 2.100 + BIN := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \ 2.101 + INCLUDES := com/sun/tools/corba/se/logutil)) 2.102 2.103 -$(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\ 2.104 - SRCS:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\ 2.105 - JAR:=$(CORBA_OUTPUTDIR)/btjars/logutil.jar,\ 2.106 - JARMAIN:=com.sun.tools.corba.se.logutil.MC)) 2.107 +$(eval $(call SetupArchive,ARCHIVE_LOGUTIL, $(BUILD_LOGUTIL), \ 2.108 + SRCS := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \ 2.109 + JAR := $(CORBA_OUTPUTDIR)/btjars/logutil.jar, \ 2.110 + JARMAIN := com.sun.tools.corba.se.logutil.MC)) 2.111 2.112 -# Generate LogWrapper classes 2.113 -$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \ 2.114 - $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ 2.115 - $(CORBA_OUTPUTDIR)/btjars/logutil.jar 2.116 +# Generate LogWrapper classes 2.117 +$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java: \ 2.118 + $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ 2.119 + $(CORBA_OUTPUTDIR)/btjars/logutil.jar 2.120 $(MKDIR) -p $(@D) 2.121 $(RM) -f $(@D)/_the_wrappers.d 2.122 - $(ECHO) $(LOG_INFO) Generating class file from $*.mc 2.123 + $(ECHO) $(LOG_INFO) Generating class file from $*.mc 2.124 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D) 2.125 2.126 -# Generate LogWrapper properties file by concatening resource files 2.127 +# Generate LogWrapper properties file by concatening resource files 2.128 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \ 2.129 - $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ 2.130 - $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ 2.131 - $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ 2.132 - $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \ 2.133 - $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \ 2.134 - $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ 2.135 - $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ 2.136 - $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource 2.137 + $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ 2.138 + $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ 2.139 + $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ 2.140 + $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \ 2.141 + $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \ 2.142 + $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ 2.143 + $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ 2.144 + $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource 2.145 $(MKDIR) -p $(@D) 2.146 $(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F) 2.147 $(CAT) $^ > $@ 2.148 2.149 # The resources files are generated from lisp-like .mc files. 2.150 -$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar 2.151 +$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar 2.152 $(MKDIR) -p $(@D) 2.153 $(RM) -f $(@D)/_the_wrappers.d 2.154 - $(ECHO) $(LOG_INFO) Generating resource file from $*.mc 2.155 + $(ECHO) $(LOG_INFO) Generating resource file from $*.mc 2.156 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D) 2.157 2.158 2.159 -$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 2.160 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \ 2.161 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \ 2.162 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ 2.163 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \ 2.164 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \ 2.165 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ 2.166 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \ 2.167 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \ 2.168 - $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties 2.169 - $(MKDIR) -p $(@D) 2.170 - $(ECHO) LOGWRAPPERS_ARE_CREATED=yes > $@ 2.171 +$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d: $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 2.172 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \ 2.173 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \ 2.174 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ 2.175 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \ 2.176 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \ 2.177 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ 2.178 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \ 2.179 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \ 2.180 + $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties 2.181 + $(MKDIR) -p $(@D) 2.182 + $(ECHO) LOGWRAPPERS_ARE_CREATED = yes > $@ 2.183 2.184 # Trigger the generation of the logwrappers. After the logwrapper classes and 2.185 # resources have been created, then the makefile will restart and the newly 2.186 # created java files will become part of the build further along in the makefile. 2.187 -include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d 2.188 2.189 -ifeq ($(LOGWRAPPERS_ARE_CREATED),yes) 2.190 - $(eval $(call SetupIdlCompilation,BUILD_IDLS,\ 2.191 - IDLJ:=$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar,\ 2.192 - SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 2.193 - BIN:=$(CORBA_OUTPUTDIR)/gensrc,\ 2.194 - EXCLUDES:=com/sun/tools/corba/se/idl/% \ 2.195 - org/omg/CORBA/% \ 2.196 - com/sun/corba/se/GiopIDL/% \ 2.197 - org/omg/PortableServer/corba.idl,\ 2.198 - INCLUDES:=%,\ 2.199 - OLDIMPLBASES:=com/sun/corba/se/PortableActivationIDL/activation.idl \ 2.200 - com/sun/corba/se/spi/activation/activation.idl,\ 2.201 - 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.202 +ifeq ($(LOGWRAPPERS_ARE_CREATED), yes) 2.203 2.204 - $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar 2.205 + $(eval $(call SetupIdlCompilation,BUILD_IDLS, \ 2.206 + IDLJ := $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \ 2.207 + SRC := $(CORBA_TOPDIR)/src/share/classes, \ 2.208 + BIN := $(CORBA_OUTPUTDIR)/gensrc, \ 2.209 + EXCLUDES := com/sun/tools/corba/se/idl/% \ 2.210 + org/omg/CORBA/% \ 2.211 + com/sun/corba/se/GiopIDL/% \ 2.212 + org/omg/PortableServer/corba.idl, \ 2.213 + INCLUDES := %, \ 2.214 + OLDIMPLBASES := com/sun/corba/se/PortableActivationIDL/activation.idl \ 2.215 + com/sun/corba/se/spi/activation/activation.idl, \ 2.216 + 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.217 2.218 - $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar 2.219 - $(MKDIR) -p $(@D) 2.220 - $(ECHO) IDLS_ARE_CREATED=yes > $@ 2.221 + $(BUILD_IDLS): $(CORBA_OUTPUTDIR)/btjars/idlj.jar 2.222 2.223 - -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d 2.224 + $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d: $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar 2.225 + $(MKDIR) -p $(@D) 2.226 + $(ECHO) IDLS_ARE_CREATED = yes > $@ 2.227 2.228 - ifeq ($(IDLS_ARE_CREATED),yes) 2.229 - $(eval $(call SetupJavaCompilation,BUILD_CORBA,\ 2.230 - SETUP:=GENERATE_NEWBYTECODE,\ 2.231 - SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ 2.232 - EXCLUDES:=com/sun/corba/se/PortableActivationIDL\ 2.233 - com/sun/tools/corba/se/logutil,\ 2.234 - EXCLUDE_FILES:=com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ 2.235 - com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ 2.236 - com/sun/org/omg/CORBA/IDLTypeOperations.java \ 2.237 - com/sun/org/omg/CORBA/IRObjectOperations.java \ 2.238 - org/omg/PortableInterceptor/UNKNOWN.java \ 2.239 - com/sun/tools/corba/se/idl/ResourceBundleUtil.java\ 2.240 - com/sun/corba/se/impl/presentation/rmi/jndi.properties,\ 2.241 - COPY:=.prp LogStrings.properties,\ 2.242 - BIN:=$(CORBA_OUTPUTDIR)/classes)) 2.243 + -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d 2.244 + 2.245 + ifeq ($(IDLS_ARE_CREATED), yes) 2.246 + 2.247 + $(eval $(call SetupJavaCompilation,BUILD_CORBA, \ 2.248 + SETUP := GENERATE_NEWBYTECODE, \ 2.249 + SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ 2.250 + EXCLUDES := com/sun/corba/se/PortableActivationIDL \ 2.251 + com/sun/tools/corba/se/logutil, \ 2.252 + EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ 2.253 + com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ 2.254 + com/sun/org/omg/CORBA/IDLTypeOperations.java \ 2.255 + com/sun/org/omg/CORBA/IRObjectOperations.java \ 2.256 + org/omg/PortableInterceptor/UNKNOWN.java \ 2.257 + com/sun/tools/corba/se/idl/ResourceBundleUtil.java \ 2.258 + com/sun/corba/se/impl/presentation/rmi/jndi.properties, \ 2.259 + COPY := .prp LogStrings.properties, \ 2.260 + BIN := $(CORBA_OUTPUTDIR)/classes)) 2.261 2.262 $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \ 2.263 SETUP := GENERATE_OLDBYTECODE, \ 2.264 @@ -192,72 +194,72 @@ 2.265 BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \ 2.266 JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar)) 2.267 2.268 - # Separate src.zip call to include sources that were excluded in the build to 2.269 - # mimic behavior in old build system. 2.270 - $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\ 2.271 - SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ 2.272 - ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip)) 2.273 + # Separate src.zip call to include sources that were excluded in the build to 2.274 + # mimic behavior in old build system. 2.275 + $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA, \ 2.276 + SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ 2.277 + ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip)) 2.278 2.279 - $(BUILD_CORBA) : $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES) 2.280 + $(BUILD_CORBA): $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES) 2.281 2.282 - # Run stripproperties on all sunorb resource files. 2.283 - STRIP_PROP_SRC_FILES:=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties") 2.284 - STRIP_PROP_FILES:=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%,$(CORBA_OUTPUTDIR)/classes/%,\ 2.285 - $(STRIP_PROP_SRC_FILES)) 2.286 - # Simple delivery of zh_HK properties files just copies zh_TW properties files 2.287 - STRIP_PROP_FILES+=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties,\ 2.288 - $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties,\ 2.289 - $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")) 2.290 - STRIP_PROP_SRC_FILES+=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties") 2.291 - STRIP_PROP_CMDLINE:=$(subst _SPACE_,$(SPACE),\ 2.292 - $(join $(addprefix -clean_SPACE_,$(STRIP_PROP_SRC_FILES)), \ 2.293 - $(addprefix _SPACE_,$(STRIP_PROP_FILES)))) 2.294 + # Run stripproperties on all sunorb resource files. 2.295 + STRIP_PROP_SRC_FILES := $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties") 2.296 + STRIP_PROP_FILES := $(patsubst $(CORBA_TOPDIR)/src/share/classes/%, $(CORBA_OUTPUTDIR)/classes/%, \ 2.297 + $(STRIP_PROP_SRC_FILES)) 2.298 + # Simple delivery of zh_HK properties files just copies zh_TW properties files 2.299 + STRIP_PROP_FILES += $(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties, \ 2.300 + $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties, \ 2.301 + $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")) 2.302 + STRIP_PROP_SRC_FILES += $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties") 2.303 + STRIP_PROP_CMDLINE := $(subst _SPACE_, $(SPACE), \ 2.304 + $(join $(addprefix -clean_SPACE_, $(STRIP_PROP_SRC_FILES)), \ 2.305 + $(addprefix _SPACE_, $(STRIP_PROP_FILES)))) 2.306 2.307 - $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \ 2.308 - $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar 2.309 - $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES))) 2.310 - $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline) 2.311 - $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 2.312 - @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline 2.313 - $(TOUCH) $@ 2.314 + $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \ 2.315 + $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar 2.316 + $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES))) 2.317 + $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline) 2.318 + $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 2.319 + @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline 2.320 + $(TOUCH) $@ 2.321 2.322 - $(eval $(call SetupArchive,ARCHIVE_CORBA,\ 2.323 - $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties,\ 2.324 - SRCS:=$(CORBA_OUTPUTDIR)/classes,\ 2.325 - SUFFIXES:=.class .prp .properties,\ 2.326 - JAR:=$(CORBA_OUTPUTDIR)/dist/lib/classes.jar)) 2.327 + $(eval $(call SetupArchive,ARCHIVE_CORBA, \ 2.328 + $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties, \ 2.329 + SRCS := $(CORBA_OUTPUTDIR)/classes, \ 2.330 + SUFFIXES := .class .prp .properties, \ 2.331 + JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar)) 2.332 2.333 - # The created classes.jar now contains Corba compiled to run on the target JDK 2.334 - # and is ready for inclusion in jdk rt.jar. 2.335 + # The created classes.jar now contains Corba compiled to run on the target JDK 2.336 + # and is ready for inclusion in jdk rt.jar. 2.337 2.338 - # The created src.zip now contains .java and .properties files used to create the classes in classes.jar 2.339 - # and is ready for inclusion into the jdk src.zip 2.340 + # The created src.zip now contains .java and .properties files used to create the classes in classes.jar 2.341 + # and is ready for inclusion into the jdk src.zip 2.342 2.343 - BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \ 2.344 - $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl 2.345 + BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \ 2.346 + $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl 2.347 2.348 - $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar 2.349 - $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib 2.350 - $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib 2.351 - $(RM) -f $@ 2.352 - $(ECHO) Creating `basename $@` 2.353 - $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib 2.354 - $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/* 2.355 - (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) 2.356 + $(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar 2.357 + $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib 2.358 + $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib 2.359 + $(RM) -f $@ 2.360 + $(ECHO) Creating `basename $@` 2.361 + $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib 2.362 + $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/* 2.363 + (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) 2.364 2.365 - # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl 2.366 + # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl 2.367 2.368 - all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 2.369 - $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ 2.370 - $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 2.371 + all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 2.372 + $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ 2.373 + $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 2.374 $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \ 2.375 - $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ 2.376 - $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ 2.377 - $(CORBA_OUTPUTDIR)/dist/lib/bin.zip 2.378 - endif 2.379 + $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ 2.380 + $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ 2.381 + $(CORBA_OUTPUTDIR)/dist/lib/bin.zip 2.382 + endif 2.383 endif 2.384 2.385 clean: 2.386 $(RM) -rf $(CORBA_OUTPUTDIR) 2.387 2.388 -.PHONY: default all clean clobber 2.389 +.PHONY: default all clean clobber
3.1 --- a/makefiles/Makefile Wed Oct 16 23:31:16 2013 -0700 3.2 +++ b/makefiles/Makefile Thu Oct 17 14:17:54 2013 -0700 3.3 @@ -24,19 +24,19 @@ 3.4 # 3.5 3.6 # Locate this Makefile 3.7 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 3.8 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 3.9 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 3.10 + makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 3.11 else 3.12 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 3.13 + makefile_path := $(lastword $(MAKEFILE_LIST)) 3.14 endif 3.15 -repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path)) 3.16 +repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path)) 3.17 3.18 # What is the name of this subsystem (langtools, corba, etc)? 3.19 -subsystem_name:=$(notdir $(repo_dir)) 3.20 +subsystem_name := $(notdir $(repo_dir)) 3.21 3.22 # Try to locate top-level makefile 3.23 -top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile 3.24 -ifneq ($(wildcard $(top_level_makefile)),) 3.25 +top_level_makefile := $(repo_dir)/../common/makefiles/Makefile 3.26 +ifneq ($(wildcard $(top_level_makefile)), ) 3.27 $(info Will run $(subsystem_name) target on top-level Makefile) 3.28 $(info WARNING: This is a non-recommended way of building!) 3.29 $(info ===================================================)
