author | simonis |
Wed, 10 Sep 2014 11:01:59 +0200 | |
changeset 26739 | 3d7d13b86ff0 |
parent 25862 | a5e25d68f971 |
child 26231 | c815db24a6a0 |
permissions | -rw-r--r-- |
14242 | 1 |
# |
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
2 |
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. |
14242 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
5 |
# This code is free software; you can redistribute it and/or modify it |
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
|
7 |
# published by the Free Software Foundation. Oracle designates this |
|
8 |
# particular file as subject to the "Classpath" exception as provided |
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
|
10 |
# |
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
# accompanied this code). |
|
16 |
# |
|
17 |
# You should have received a copy of the GNU General Public License version |
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
# |
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
# or visit www.oracle.com if you need additional information or have any |
|
23 |
# questions. |
|
24 |
# |
|
25 |
||
26 |
default: all |
|
27 |
||
28 |
include $(SPEC) |
|
29 |
include MakeBase.gmk |
|
30 |
include JavaCompilation.gmk |
|
31 |
include IdlCompilation.gmk |
|
32 |
||
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
33 |
include CommonCorba.gmk |
14242 | 34 |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
35 |
################################################################################ |
14242 | 36 |
|
25862 | 37 |
$(eval $(call SetupJavaCompilation,BUILD_TOOLS_CORBA, \ |
20554 | 38 |
SETUP := GENERATE_OLDBYTECODE, \ |
23067 | 39 |
SRC := $(CORBA_TOPDIR)/make/src/classes, \ |
40 |
BIN := $(CORBA_OUTPUTDIR)/tools_classes)) |
|
14242 | 41 |
|
23067 | 42 |
TOOL_LOGUTIL_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/tools_classes \ |
43 |
build.tools.logutil.MC |
|
44 |
||
20554 | 45 |
$(eval $(call SetupJavaCompilation,BUILD_IDLJ, \ |
46 |
SETUP := GENERATE_OLDBYTECODE, \ |
|
25862 | 47 |
SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \ |
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
48 |
BIN := $(CORBA_OUTPUTDIR)/idlj_classes, \ |
20554 | 49 |
COPY := .prp, \ |
50 |
INCLUDES := com/sun/tools/corba/se/idl, \ |
|
51 |
EXCLUDE_FILES := ResourceBundleUtil.java)) |
|
14242 | 52 |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
53 |
TOOL_IDLJ_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/idlj_classes \ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
54 |
com.sun.tools.corba.se.idl.toJavaPortable.Compile |
14242 | 55 |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
56 |
################################################################################ |
14242 | 57 |
|
20554 | 58 |
# Generate LogWrapper classes |
25862 | 59 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/%SystemException.java: \ |
60 |
$(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ |
|
61 |
$(BUILD_TOOLS_CORBA) |
|
14242 | 62 |
$(MKDIR) -p $(@D) |
63 |
$(RM) -f $(@D)/_the_wrappers.d |
|
20554 | 64 |
$(ECHO) $(LOG_INFO) Generating class file from $*.mc |
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
65 |
$(TOOL_LOGUTIL_CMD) make-class $< $(@D) |
14242 | 66 |
|
20554 | 67 |
# Generate LogWrapper properties file by concatening resource files |
25862 | 68 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/LogStrings.properties: \ |
20554 | 69 |
$(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ |
70 |
$(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ |
|
71 |
$(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ |
|
72 |
$(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \ |
|
73 |
$(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \ |
|
74 |
$(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ |
|
75 |
$(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ |
|
76 |
$(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource |
|
14242 | 77 |
$(MKDIR) -p $(@D) |
78 |
$(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F) |
|
79 |
$(CAT) $^ > $@ |
|
80 |
||
81 |
# The resources files are generated from lisp-like .mc files. |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
82 |
$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \ |
25862 | 83 |
$(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ |
84 |
$(BUILD_TOOLS_CORBA) |
|
14242 | 85 |
$(MKDIR) -p $(@D) |
86 |
$(RM) -f $(@D)/_the_wrappers.d |
|
20554 | 87 |
$(ECHO) $(LOG_INFO) Generating resource file from $*.mc |
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
88 |
$(TOOL_LOGUTIL_CMD) make-resource $< $(@D) |
14242 | 89 |
|
90 |
||
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
91 |
LOGWRAPPER_TARGETS := \ |
25862 | 92 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/ActivationSystemException.java \ |
93 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/IORSystemException.java \ |
|
94 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ |
|
95 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/NamingSystemException.java \ |
|
96 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/OMGSystemException.java \ |
|
97 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ |
|
98 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/POASystemException.java \ |
|
99 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/UtilSystemException.java \ |
|
100 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging/LogStrings.properties |
|
14242 | 101 |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
102 |
################################################################################ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
103 |
# Build the IDLs. |
14242 | 104 |
|
23067 | 105 |
IDL_DELETES := \ |
106 |
org/omg/DynamicAny/*POA* \ |
|
107 |
org/omg/DynamicAny/*Holder* \ |
|
108 |
org/omg/DynamicAny/DynValueBoxHelper.java \ |
|
109 |
org/omg/DynamicAny/DynValueCommonHelper.java \ |
|
110 |
org/omg/DynamicAny/_DynValueCommonStub.java \ |
|
111 |
org/omg/DynamicAny/_DynValueBoxStub.java \ |
|
112 |
org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java \ |
|
113 |
org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java \ |
|
114 |
org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java \ |
|
115 |
org/omg/IOP/BI_DIR_IIOP.java \ |
|
116 |
org/omg/IOP/ChainBypassCheck.java \ |
|
117 |
org/omg/IOP/ChainBypassInfo.java \ |
|
118 |
org/omg/IOP/FORWARDED_IDENTITY.java \ |
|
119 |
org/omg/IOP/INVOCATION_POLICIES.java \ |
|
120 |
org/omg/IOP/LogicalThreadId.java \ |
|
121 |
org/omg/IOP/SendingContextRunTime.java \ |
|
122 |
org/omg/IOP/UnknownExceptionInfo.java \ |
|
123 |
org/omg/IOP/TaggedComponentSeqHolder.java \ |
|
124 |
org/omg/PortableServer/CurrentPackage/NoContextHolder.java \ |
|
125 |
org/omg/PortableServer/ForwardRequestHolder.java \ |
|
126 |
org/omg/PortableServer/IdAssignmentPolicyValueHelper.java \ |
|
127 |
org/omg/PortableServer/IdAssignmentPolicyValueHolder.java \ |
|
128 |
org/omg/PortableServer/IdUniquenessPolicyValueHelper.java \ |
|
129 |
org/omg/PortableServer/IdUniquenessPolicyValueHolder.java \ |
|
130 |
org/omg/PortableServer/ImplicitActivationPolicyValueHelper.java \ |
|
131 |
org/omg/PortableServer/ImplicitActivationPolicyValueHolder.java \ |
|
132 |
org/omg/PortableServer/LifespanPolicyValueHelper.java \ |
|
133 |
org/omg/PortableServer/LifespanPolicyValueHolder.java \ |
|
134 |
org/omg/PortableServer/ServantRetentionPolicyValueHelper.java \ |
|
135 |
org/omg/PortableServer/ServantRetentionPolicyValueHolder.java \ |
|
136 |
org/omg/PortableServer/ObjectIdHelper.java \ |
|
137 |
org/omg/PortableServer/ObjectIdHolder.java \ |
|
138 |
org/omg/PortableServer/POAListHelper.java \ |
|
139 |
org/omg/PortableServer/POAListHolder.java \ |
|
140 |
org/omg/PortableServer/POAManagerPackage/AdapterInactiveHolder.java \ |
|
141 |
org/omg/PortableServer/POAManagerPackage/StateHelper.java \ |
|
142 |
org/omg/PortableServer/POAManagerPackage/StateHolder.java \ |
|
143 |
org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHolder.java \ |
|
144 |
org/omg/PortableServer/POAPackage/AdapterNonExistentHolder.java \ |
|
145 |
org/omg/PortableServer/POAPackage/InvalidPolicyHolder.java \ |
|
146 |
org/omg/PortableServer/POAPackage/NoServantHolder.java \ |
|
147 |
org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHolder.java \ |
|
148 |
org/omg/PortableServer/POAPackage/ObjectNotActiveHolder.java \ |
|
149 |
org/omg/PortableServer/POAPackage/ServantAlreadyActiveHolder.java \ |
|
150 |
org/omg/PortableServer/POAPackage/ServantNotActiveHolder.java \ |
|
151 |
org/omg/PortableServer/POAPackage/WrongAdapterHolder.java \ |
|
152 |
org/omg/PortableServer/POAPackage/WrongPolicyHolder.java \ |
|
153 |
org/omg/PortableServer/RequestProcessingPolicyValueHelper.java \ |
|
154 |
org/omg/PortableServer/RequestProcessingPolicyValueHolder.java \ |
|
155 |
org/omg/PortableServer/ServantActivatorHolder.java \ |
|
156 |
org/omg/PortableServer/ServantLocatorHolder.java \ |
|
157 |
org/omg/PortableServer/ThreadPolicyValueHelper.java \ |
|
158 |
org/omg/PortableServer/ThreadPolicyValueHolder.java \ |
|
159 |
org/omg/PortableInterceptor/ClientRequestInfoHelper.java \ |
|
160 |
org/omg/PortableInterceptor/ClientRequestInterceptorHelper.java \ |
|
161 |
org/omg/PortableInterceptor/IORInfoHelper.java \ |
|
162 |
org/omg/PortableInterceptor/IORInterceptorHelper.java \ |
|
163 |
org/omg/PortableInterceptor/InterceptorHelper.java \ |
|
164 |
org/omg/PortableInterceptor/ORBInitInfoHelper.java \ |
|
165 |
org/omg/PortableInterceptor/ORBInitializerHelper.java \ |
|
166 |
org/omg/PortableInterceptor/PolicyFactoryHelper.java \ |
|
167 |
org/omg/PortableInterceptor/ReplyStatusHelper.java \ |
|
168 |
org/omg/PortableInterceptor/RequestInfoHelper.java \ |
|
169 |
org/omg/PortableInterceptor/ServerRequestInfoHelper.java \ |
|
170 |
org/omg/PortableInterceptor/ServerRequestInterceptorHelper.java \ |
|
171 |
org/omg/PortableInterceptor/SlotIdHelper.java \ |
|
172 |
org/omg/PortableInterceptor/ClientRequestInfoHolder.java \ |
|
173 |
org/omg/PortableInterceptor/ClientRequestInterceptorHolder.java \ |
|
174 |
org/omg/PortableInterceptor/CurrentHolder.java \ |
|
175 |
org/omg/PortableInterceptor/ForwardRequestHolder.java \ |
|
176 |
org/omg/PortableInterceptor/IORInfoHolder.java \ |
|
177 |
org/omg/PortableInterceptor/IORInterceptorHolder.java \ |
|
178 |
org/omg/PortableInterceptor/InterceptorHolder.java \ |
|
179 |
org/omg/PortableInterceptor/InvalidSlotHolder.java \ |
|
180 |
org/omg/PortableInterceptor/ORBInitInfoHolder.java \ |
|
181 |
org/omg/PortableInterceptor/ORBInitializerHolder.java \ |
|
182 |
org/omg/PortableInterceptor/PolicyFactoryHolder.java \ |
|
183 |
org/omg/PortableInterceptor/RequestInfoHolder.java \ |
|
184 |
org/omg/PortableInterceptor/ServerRequestInfoHolder.java \ |
|
185 |
org/omg/PortableInterceptor/ServerRequestInterceptorHolder.java \ |
|
186 |
org/omg/PortableInterceptor/TaggedComponentSeqHolder.java \ |
|
187 |
org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHolder.java \ |
|
188 |
org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHolder.java \ |
|
189 |
org/omg/IOP/CodecPackage/FormatMismatchHolder.java \ |
|
190 |
org/omg/IOP/CodecPackage/InvalidTypeForEncodingHolder.java \ |
|
191 |
org/omg/IOP/CodecPackage/TypeMismatchHolder.java \ |
|
192 |
org/omg/IOP/CodecHelper.java \ |
|
193 |
org/omg/IOP/EncodingFormatHelper.java \ |
|
194 |
org/omg/IOP/EncodingHelper.java \ |
|
195 |
org/omg/IOP/CodecFactoryPackage/UnknownEncodingHolder.java \ |
|
196 |
org/omg/IOP/CodecFactoryHolder.java \ |
|
197 |
org/omg/IOP/CodecHolder.java \ |
|
198 |
org/omg/IOP/EncodingHolder.java \ |
|
199 |
org/omg/IOP/TaggedComponentSeqHelper.java \ |
|
200 |
org/omg/Dynamic/ContextListHelper.java \ |
|
201 |
org/omg/Dynamic/ExceptionListHelper.java \ |
|
202 |
org/omg/Dynamic/ParameterHolder.java \ |
|
203 |
org/omg/Dynamic/ParameterListHolder.java \ |
|
204 |
org/omg/Dynamic/ExceptionListHolder.java \ |
|
205 |
org/omg/Dynamic/ParameterHelper.java \ |
|
206 |
org/omg/Dynamic/ParameterListHelper.java \ |
|
207 |
org/omg/Dynamic/RequestContextHelper.java \ |
|
208 |
org/omg/CORBA/OctetSeqHelper.java \ |
|
209 |
org/omg/CORBA/OctetSeqHolder.java \ |
|
210 |
org/omg/CORBA/PolicyError.java \ |
|
211 |
org/omg/CORBA/RepositoryIdHelper.java \ |
|
212 |
# |
|
213 |
||
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
214 |
$(eval $(call SetupIdlCompilation,BUILD_IDLS, \ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
215 |
IDLJ := $(TOOL_IDLJ_CMD), \ |
25862 | 216 |
SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \ |
217 |
BIN := $(CORBA_OUTPUTDIR)/gensrc/java.corba, \ |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
218 |
EXCLUDES := com/sun/tools/corba/se/idl/% \ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
219 |
org/omg/CORBA/% \ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
220 |
com/sun/corba/se/GiopIDL/% \ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
221 |
org/omg/PortableServer/corba.idl, \ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
222 |
INCLUDES := %, \ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
223 |
OLDIMPLBASES := com/sun/corba/se/PortableActivationIDL/activation.idl \ |
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
224 |
com/sun/corba/se/spi/activation/activation.idl, \ |
23067 | 225 |
DELETES := $(IDL_DELETES))) |
20919
d2ffe3f63ad8
6604021: RMIC is defaulting to BOOT jdk version, needs to be rmic.jar
erikj
parents:
15408
diff
changeset
|
226 |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
227 |
$(BUILD_IDLS): $(BUILD_IDLJ) |
14242 | 228 |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
229 |
################################################################################ |
23362
da5c80c40887
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
23067
diff
changeset
|
230 |
# zh_HK is just a copy of zh_TW |
14242 | 231 |
|
25862 | 232 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \ |
233 |
$(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties |
|
23362
da5c80c40887
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
23067
diff
changeset
|
234 |
$(install-file) |
14242 | 235 |
|
22662
ddcb7ce5e63d
8026773: Failing compilation in Corba does not fail the build
erikj
parents:
21859
diff
changeset
|
236 |
################################################################################ |
14242 | 237 |
|
23362
da5c80c40887
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
23067
diff
changeset
|
238 |
all: $(BUILD_IDLS) $(LOGWRAPPER_TARGETS) \ |
25862 | 239 |
$(CORBA_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties |
23362
da5c80c40887
8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents:
23067
diff
changeset
|
240 |