Fri, 07 Sep 2018 10:21:36 +0100
8210431: Complete backport of libpng 1.6.35 TPRM
Reviewed-by: jeff, prr
ohair@413 | 1 | # |
rpatil@1692 | 2 | # Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. |
ohair@413 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ohair@413 | 4 | # |
ohair@413 | 5 | # This code is free software; you can redistribute it and/or modify it |
ohair@413 | 6 | # under the terms of the GNU General Public License version 2 only, as |
ohair@413 | 7 | # published by the Free Software Foundation. Oracle designates this |
ohair@413 | 8 | # particular file as subject to the "Classpath" exception as provided |
ohair@413 | 9 | # by Oracle in the LICENSE file that accompanied this code. |
ohair@413 | 10 | # |
ohair@413 | 11 | # This code is distributed in the hope that it will be useful, but WITHOUT |
ohair@413 | 12 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ohair@413 | 13 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ohair@413 | 14 | # version 2 for more details (a copy is included in the LICENSE file that |
ohair@413 | 15 | # accompanied this code). |
ohair@413 | 16 | # |
ohair@413 | 17 | # You should have received a copy of the GNU General Public License version |
ohair@413 | 18 | # 2 along with this work; if not, write to the Free Software Foundation, |
ohair@413 | 19 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ohair@413 | 20 | # |
ohair@413 | 21 | # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ohair@413 | 22 | # or visit www.oracle.com if you need additional information or have any |
ohair@413 | 23 | # questions. |
ohair@413 | 24 | # |
ohair@413 | 25 | |
ohair@413 | 26 | # |
ohair@413 | 27 | # Makefile for building the corba workspace. |
ohair@413 | 28 | # |
ohair@413 | 29 | |
ohair@413 | 30 | # This must be the first rule |
ohair@413 | 31 | default: all |
ohair@413 | 32 | |
ohair@413 | 33 | include $(SPEC) |
ohair@413 | 34 | include MakeBase.gmk |
ohair@413 | 35 | include JavaCompilation.gmk |
ohair@413 | 36 | include IdlCompilation.gmk |
ohair@413 | 37 | |
ohair@413 | 38 | # The Corba sources are old and generates a LOT of warnings. |
ihse@509 | 39 | # Disable these using Xlint, until someone cares to fix them. |
ihse@509 | 40 | DISABLE_CORBA_WARNINGS := -Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann |
ohair@413 | 41 | |
ohair@413 | 42 | # The "generate old bytecode" javac setup uses the new compiler to compile for the |
ohair@413 | 43 | # boot jdk to generate tools that need to be run with the boot jdk. |
ohair@413 | 44 | # Thus we force the target bytecode to the boot jdk bytecode. |
ihse@509 | 45 | $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \ |
ihse@509 | 46 | JVM := $(JAVA), \ |
ihse@509 | 47 | JAVAC := $(NEW_JAVAC), \ |
lana@529 | 48 | FLAGS := $(BOOT_JDK_SOURCETARGET) \ |
lana@529 | 49 | -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \ |
lana@529 | 50 | $(DISABLE_CORBA_WARNINGS), \ |
ihse@509 | 51 | SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
ihse@509 | 52 | SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
ohair@413 | 53 | |
ohair@413 | 54 | # The "generate new bytecode" uses the new compiler to generate bytecode |
ohair@413 | 55 | # for the new jdk that is being built. The code compiled by this setup |
ohair@413 | 56 | # cannot necessarily be run with the boot jdk. |
ihse@509 | 57 | $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \ |
ihse@509 | 58 | JVM := $(JAVA), \ |
ihse@509 | 59 | JAVAC := $(NEW_JAVAC), \ |
ihse@509 | 60 | FLAGS := -cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS), \ |
ihse@509 | 61 | SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
ihse@509 | 62 | SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
ohair@413 | 63 | |
ihse@509 | 64 | $(eval $(call SetupJavaCompilation,BUILD_STRIPPROP, \ |
ihse@509 | 65 | SETUP := GENERATE_OLDBYTECODE, \ |
ihse@509 | 66 | SRC := $(CORBA_TOPDIR)/make/tools/src, \ |
ihse@509 | 67 | BIN := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes)) |
ohair@413 | 68 | |
ihse@509 | 69 | $(eval $(call SetupArchive,ARCHIVE_STRIPPROP, $(BUILD_STRIPPROP), \ |
ihse@509 | 70 | SRCS := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes, \ |
ihse@509 | 71 | JAR := $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar, \ |
ihse@509 | 72 | JARMAIN := build.tools.stripproperties.StripPropertiesCorba)) |
ohair@413 | 73 | |
ihse@509 | 74 | $(eval $(call SetupJavaCompilation,BUILD_IDLJ, \ |
ihse@509 | 75 | SETUP := GENERATE_OLDBYTECODE, \ |
ihse@509 | 76 | SRC := $(CORBA_TOPDIR)/src/share/classes, \ |
ihse@509 | 77 | BIN := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \ |
ihse@509 | 78 | COPY := .prp, \ |
ihse@509 | 79 | INCLUDES := com/sun/tools/corba/se/idl, \ |
ihse@509 | 80 | EXCLUDE_FILES := ResourceBundleUtil.java)) |
ohair@413 | 81 | |
ihse@509 | 82 | $(eval $(call SetupArchive,ARCHIVE_IDLJ, $(BUILD_IDLJ), \ |
ihse@509 | 83 | SRCS := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \ |
ihse@509 | 84 | SUFFIXES := .class .prp, \ |
ihse@509 | 85 | JAR := $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \ |
ihse@509 | 86 | JARMAIN := com.sun.tools.corba.se.idl.toJavaPortable.Compile)) |
ohair@413 | 87 | |
ihse@509 | 88 | $(eval $(call SetupJavaCompilation,BUILD_LOGUTIL, \ |
ihse@509 | 89 | SETUP := GENERATE_OLDBYTECODE, \ |
ihse@509 | 90 | SRC := $(CORBA_TOPDIR)/src/share/classes, \ |
ihse@509 | 91 | BIN := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \ |
ihse@509 | 92 | INCLUDES := com/sun/tools/corba/se/logutil)) |
ohair@413 | 93 | |
ihse@509 | 94 | $(eval $(call SetupArchive,ARCHIVE_LOGUTIL, $(BUILD_LOGUTIL), \ |
ihse@509 | 95 | SRCS := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \ |
ihse@509 | 96 | JAR := $(CORBA_OUTPUTDIR)/btjars/logutil.jar, \ |
ihse@509 | 97 | JARMAIN := com.sun.tools.corba.se.logutil.MC)) |
ohair@413 | 98 | |
ihse@509 | 99 | # Generate LogWrapper classes |
ihse@509 | 100 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java: \ |
ihse@509 | 101 | $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ |
ihse@509 | 102 | $(CORBA_OUTPUTDIR)/btjars/logutil.jar |
ohair@413 | 103 | $(MKDIR) -p $(@D) |
ohair@413 | 104 | $(RM) -f $(@D)/_the_wrappers.d |
ihse@509 | 105 | $(ECHO) $(LOG_INFO) Generating class file from $*.mc |
ohair@413 | 106 | $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D) |
ohair@413 | 107 | |
ihse@509 | 108 | # Generate LogWrapper properties file by concatening resource files |
ohair@413 | 109 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \ |
ihse@509 | 110 | $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ |
ihse@509 | 111 | $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ |
ihse@509 | 112 | $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ |
ihse@509 | 113 | $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \ |
ihse@509 | 114 | $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \ |
ihse@509 | 115 | $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ |
ihse@509 | 116 | $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ |
ihse@509 | 117 | $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource |
ohair@413 | 118 | $(MKDIR) -p $(@D) |
ohair@413 | 119 | $(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F) |
ohair@413 | 120 | $(CAT) $^ > $@ |
ohair@413 | 121 | |
ohair@413 | 122 | # The resources files are generated from lisp-like .mc files. |
ihse@509 | 123 | $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar |
ohair@413 | 124 | $(MKDIR) -p $(@D) |
ohair@413 | 125 | $(RM) -f $(@D)/_the_wrappers.d |
ihse@509 | 126 | $(ECHO) $(LOG_INFO) Generating resource file from $*.mc |
ohair@413 | 127 | $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D) |
ohair@413 | 128 | |
ohair@413 | 129 | |
ihse@509 | 130 | $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d: $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ |
ihse@509 | 131 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \ |
ihse@509 | 132 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \ |
ihse@509 | 133 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ |
ihse@509 | 134 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \ |
ihse@509 | 135 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \ |
ihse@509 | 136 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ |
ihse@509 | 137 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \ |
ihse@509 | 138 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \ |
ihse@509 | 139 | $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties |
ihse@509 | 140 | $(MKDIR) -p $(@D) |
ihse@509 | 141 | $(ECHO) LOGWRAPPERS_ARE_CREATED = yes > $@ |
ohair@413 | 142 | |
ohair@413 | 143 | # Trigger the generation of the logwrappers. After the logwrapper classes and |
ohair@413 | 144 | # resources have been created, then the makefile will restart and the newly |
ohair@413 | 145 | # created java files will become part of the build further along in the makefile. |
ohair@413 | 146 | -include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d |
ohair@413 | 147 | |
ihse@509 | 148 | ifeq ($(LOGWRAPPERS_ARE_CREATED), yes) |
ohair@413 | 149 | |
ihse@509 | 150 | $(eval $(call SetupIdlCompilation,BUILD_IDLS, \ |
ihse@509 | 151 | IDLJ := $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \ |
ihse@509 | 152 | SRC := $(CORBA_TOPDIR)/src/share/classes, \ |
ihse@509 | 153 | BIN := $(CORBA_OUTPUTDIR)/gensrc, \ |
ihse@509 | 154 | EXCLUDES := com/sun/tools/corba/se/idl/% \ |
ihse@509 | 155 | org/omg/CORBA/% \ |
ihse@509 | 156 | com/sun/corba/se/GiopIDL/% \ |
ihse@509 | 157 | org/omg/PortableServer/corba.idl, \ |
ihse@509 | 158 | INCLUDES := %, \ |
ihse@509 | 159 | OLDIMPLBASES := com/sun/corba/se/PortableActivationIDL/activation.idl \ |
ihse@509 | 160 | com/sun/corba/se/spi/activation/activation.idl, \ |
ihse@509 | 161 | 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)) |
ohair@413 | 162 | |
ihse@509 | 163 | $(BUILD_IDLS): $(CORBA_OUTPUTDIR)/btjars/idlj.jar |
ohair@413 | 164 | |
ihse@509 | 165 | $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d: $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar |
ihse@509 | 166 | $(MKDIR) -p $(@D) |
ihse@509 | 167 | $(ECHO) IDLS_ARE_CREATED = yes > $@ |
ohair@413 | 168 | |
ihse@509 | 169 | -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d |
ohair@413 | 170 | |
ihse@509 | 171 | ifeq ($(IDLS_ARE_CREATED), yes) |
ohair@413 | 172 | |
ihse@509 | 173 | $(eval $(call SetupJavaCompilation,BUILD_CORBA, \ |
ihse@509 | 174 | SETUP := GENERATE_NEWBYTECODE, \ |
ihse@509 | 175 | SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ |
ihse@509 | 176 | EXCLUDES := com/sun/corba/se/PortableActivationIDL \ |
rpatil@1692 | 177 | com/sun/tools/corba/se/logutil \ |
rpatil@1692 | 178 | sun/misc, \ |
ihse@509 | 179 | EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ |
ihse@509 | 180 | com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ |
ihse@509 | 181 | com/sun/org/omg/CORBA/IDLTypeOperations.java \ |
ihse@509 | 182 | com/sun/org/omg/CORBA/IRObjectOperations.java \ |
ihse@509 | 183 | org/omg/PortableInterceptor/UNKNOWN.java \ |
ihse@509 | 184 | com/sun/tools/corba/se/idl/ResourceBundleUtil.java \ |
ihse@509 | 185 | com/sun/corba/se/impl/presentation/rmi/jndi.properties, \ |
ihse@509 | 186 | COPY := .prp LogStrings.properties, \ |
ihse@509 | 187 | BIN := $(CORBA_OUTPUTDIR)/classes)) |
ohair@413 | 188 | |
erikj@527 | 189 | $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \ |
erikj@527 | 190 | SETUP := GENERATE_OLDBYTECODE, \ |
erikj@527 | 191 | SRC := $(BUILD_CORBA_SRC), \ |
erikj@527 | 192 | EXCLUDES := $(BUILD_CORBA_EXCLUDES), \ |
erikj@527 | 193 | EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \ |
erikj@527 | 194 | COPY := $(BUILD_CORBA_COPY), \ |
erikj@527 | 195 | BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \ |
erikj@527 | 196 | JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar)) |
erikj@527 | 197 | |
ihse@509 | 198 | # Separate src.zip call to include sources that were excluded in the build to |
ihse@509 | 199 | # mimic behavior in old build system. |
ihse@509 | 200 | $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA, \ |
ihse@509 | 201 | SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ |
ihse@509 | 202 | ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip)) |
ohair@413 | 203 | |
ihse@509 | 204 | $(BUILD_CORBA): $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES) |
ohair@413 | 205 | |
ihse@509 | 206 | # Run stripproperties on all sunorb resource files. |
ihse@509 | 207 | STRIP_PROP_SRC_FILES := $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties") |
ihse@509 | 208 | STRIP_PROP_FILES := $(patsubst $(CORBA_TOPDIR)/src/share/classes/%, $(CORBA_OUTPUTDIR)/classes/%, \ |
ihse@509 | 209 | $(STRIP_PROP_SRC_FILES)) |
ihse@509 | 210 | # Simple delivery of zh_HK properties files just copies zh_TW properties files |
ihse@509 | 211 | STRIP_PROP_FILES += $(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties, \ |
ihse@509 | 212 | $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties, \ |
ihse@509 | 213 | $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")) |
ihse@509 | 214 | STRIP_PROP_SRC_FILES += $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties") |
ihse@509 | 215 | STRIP_PROP_CMDLINE := $(subst _SPACE_, $(SPACE), \ |
ihse@509 | 216 | $(join $(addprefix -clean_SPACE_, $(STRIP_PROP_SRC_FILES)), \ |
ihse@509 | 217 | $(addprefix _SPACE_, $(STRIP_PROP_FILES)))) |
ohair@413 | 218 | |
ihse@509 | 219 | $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \ |
ihse@509 | 220 | $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar |
ihse@509 | 221 | $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES))) |
ihse@509 | 222 | $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline) |
ihse@509 | 223 | $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ |
ihse@509 | 224 | @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline |
ihse@509 | 225 | $(TOUCH) $@ |
ohair@413 | 226 | |
ihse@509 | 227 | $(eval $(call SetupArchive,ARCHIVE_CORBA, \ |
ihse@509 | 228 | $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties, \ |
ihse@509 | 229 | SRCS := $(CORBA_OUTPUTDIR)/classes, \ |
ihse@509 | 230 | SUFFIXES := .class .prp .properties, \ |
ihse@509 | 231 | JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar)) |
ohair@413 | 232 | |
ihse@509 | 233 | # The created classes.jar now contains Corba compiled to run on the target JDK |
ihse@509 | 234 | # and is ready for inclusion in jdk rt.jar. |
ohair@413 | 235 | |
ihse@509 | 236 | # The created src.zip now contains .java and .properties files used to create the classes in classes.jar |
ihse@509 | 237 | # and is ready for inclusion into the jdk src.zip |
ohair@413 | 238 | |
ihse@509 | 239 | BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \ |
ihse@509 | 240 | $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl |
ohair@413 | 241 | |
ihse@509 | 242 | $(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar |
ihse@509 | 243 | $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib |
ihse@509 | 244 | $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib |
ihse@509 | 245 | $(RM) -f $@ |
ihse@509 | 246 | $(ECHO) Creating `basename $@` |
ihse@509 | 247 | $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib |
ihse@509 | 248 | $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/* |
ihse@509 | 249 | (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) |
ihse@509 | 250 | |
ihse@509 | 251 | # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl |
ihse@509 | 252 | |
ihse@509 | 253 | all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ |
ihse@509 | 254 | $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ |
ihse@509 | 255 | $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ |
erikj@527 | 256 | $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \ |
ihse@509 | 257 | $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ |
ihse@509 | 258 | $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ |
ihse@509 | 259 | $(CORBA_OUTPUTDIR)/dist/lib/bin.zip |
ihse@509 | 260 | endif |
ohair@413 | 261 | endif |
ohair@413 | 262 | |
ohair@413 | 263 | clean: |
ohair@413 | 264 | $(RM) -rf $(CORBA_OUTPUTDIR) |
ohair@413 | 265 | |
ihse@509 | 266 | .PHONY: default all clean clobber |