makefiles/BuildCorba.gmk

changeset 529
1c01208087b5
parent 528
1a71d800b032
parent 509
66fc1a749867
equal deleted inserted replaced
528:1a71d800b032 529:1c01208087b5
34 include MakeBase.gmk 34 include MakeBase.gmk
35 include JavaCompilation.gmk 35 include JavaCompilation.gmk
36 include IdlCompilation.gmk 36 include IdlCompilation.gmk
37 37
38 # The Corba sources are old and generates a LOT of warnings. 38 # The Corba sources are old and generates a LOT of warnings.
39 # Disable these using Xlint, until someone cares to fix them. 39 # Disable these using Xlint, until someone cares to fix them.
40 DISABLE_CORBA_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann 40 DISABLE_CORBA_WARNINGS := -Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann
41 41
42 # The "generate old bytecode" javac setup uses the new compiler to compile for the 42 # The "generate old bytecode" javac setup uses the new compiler to compile for the
43 # boot jdk to generate tools that need to be run with the boot jdk. 43 # boot jdk to generate tools that need to be run with the boot jdk.
44 # Thus we force the target bytecode to the boot jdk bytecode. 44 # Thus we force the target bytecode to the boot jdk bytecode.
45 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ 45 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
46 JVM:=$(JAVA),\ 46 JVM := $(JAVA), \
47 JAVAC:=$(NEW_JAVAC),\ 47 JAVAC := $(NEW_JAVAC), \
48 FLAGS := $(BOOT_JDK_SOURCETARGET) \ 48 FLAGS := $(BOOT_JDK_SOURCETARGET) \
49 -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \ 49 -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \
50 $(DISABLE_CORBA_WARNINGS), \ 50 $(DISABLE_CORBA_WARNINGS), \
51 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 51 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
52 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 52 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
53 53
54 # The "generate new bytecode" uses the new compiler to generate bytecode 54 # The "generate new bytecode" uses the new compiler to generate bytecode
55 # for the new jdk that is being built. The code compiled by this setup 55 # for the new jdk that is being built. The code compiled by this setup
56 # cannot necessarily be run with the boot jdk. 56 # cannot necessarily be run with the boot jdk.
57 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ 57 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
58 JVM:=$(JAVA),\ 58 JVM := $(JAVA), \
59 JAVAC:=$(NEW_JAVAC),\ 59 JAVAC := $(NEW_JAVAC), \
60 FLAGS:=-cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS),\ 60 FLAGS := -cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS), \
61 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 61 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
62 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 62 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
63 63
64 $(eval $(call SetupJavaCompilation,BUILD_STRIPPROP,\ 64 $(eval $(call SetupJavaCompilation,BUILD_STRIPPROP, \
65 SETUP:=GENERATE_OLDBYTECODE,\ 65 SETUP := GENERATE_OLDBYTECODE, \
66 SRC:=$(CORBA_TOPDIR)/make/tools/src,\ 66 SRC := $(CORBA_TOPDIR)/make/tools/src, \
67 BIN:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes)) 67 BIN := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes))
68 68
69 $(eval $(call SetupArchive,ARCHIVE_STRIPPROP,$(BUILD_STRIPPROP),\ 69 $(eval $(call SetupArchive,ARCHIVE_STRIPPROP, $(BUILD_STRIPPROP), \
70 SRCS:=$(CORBA_OUTPUTDIR)/btclasses/stripprop_classes,\ 70 SRCS := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes, \
71 JAR:=$(CORBA_OUTPUTDIR)/btjars/stripproperties.jar,\ 71 JAR := $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar, \
72 JARMAIN:=build.tools.stripproperties.StripPropertiesCorba)) 72 JARMAIN := build.tools.stripproperties.StripPropertiesCorba))
73 73
74 $(eval $(call SetupJavaCompilation,BUILD_IDLJ,\ 74 $(eval $(call SetupJavaCompilation,BUILD_IDLJ, \
75 SETUP:=GENERATE_OLDBYTECODE,\ 75 SETUP := GENERATE_OLDBYTECODE, \
76 SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 76 SRC := $(CORBA_TOPDIR)/src/share/classes, \
77 BIN:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\ 77 BIN := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \
78 COPY:=.prp,\ 78 COPY := .prp, \
79 INCLUDES:=com/sun/tools/corba/se/idl,\ 79 INCLUDES := com/sun/tools/corba/se/idl, \
80 EXCLUDE_FILES:=ResourceBundleUtil.java)) 80 EXCLUDE_FILES := ResourceBundleUtil.java))
81 81
82 $(eval $(call SetupArchive,ARCHIVE_IDLJ,$(BUILD_IDLJ),\ 82 $(eval $(call SetupArchive,ARCHIVE_IDLJ, $(BUILD_IDLJ), \
83 SRCS:=$(CORBA_OUTPUTDIR)/btclasses/idlj_classes,\ 83 SRCS := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \
84 SUFFIXES:=.class .prp,\ 84 SUFFIXES := .class .prp, \
85 JAR:=$(CORBA_OUTPUTDIR)/btjars/idlj.jar,\ 85 JAR := $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \
86 JARMAIN:=com.sun.tools.corba.se.idl.toJavaPortable.Compile)) 86 JARMAIN := com.sun.tools.corba.se.idl.toJavaPortable.Compile))
87 87
88 $(eval $(call SetupJavaCompilation,BUILD_LOGUTIL,\ 88 $(eval $(call SetupJavaCompilation,BUILD_LOGUTIL, \
89 SETUP:=GENERATE_OLDBYTECODE,\ 89 SETUP := GENERATE_OLDBYTECODE, \
90 SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 90 SRC := $(CORBA_TOPDIR)/src/share/classes, \
91 BIN:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\ 91 BIN := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \
92 INCLUDES:=com/sun/tools/corba/se/logutil)) 92 INCLUDES := com/sun/tools/corba/se/logutil))
93 93
94 $(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\ 94 $(eval $(call SetupArchive,ARCHIVE_LOGUTIL, $(BUILD_LOGUTIL), \
95 SRCS:=$(CORBA_OUTPUTDIR)/btclasses/logutil_classes,\ 95 SRCS := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \
96 JAR:=$(CORBA_OUTPUTDIR)/btjars/logutil.jar,\ 96 JAR := $(CORBA_OUTPUTDIR)/btjars/logutil.jar, \
97 JARMAIN:=com.sun.tools.corba.se.logutil.MC)) 97 JARMAIN := com.sun.tools.corba.se.logutil.MC))
98 98
99 # Generate LogWrapper classes 99 # Generate LogWrapper classes
100 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \ 100 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java: \
101 $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ 101 $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
102 $(CORBA_OUTPUTDIR)/btjars/logutil.jar 102 $(CORBA_OUTPUTDIR)/btjars/logutil.jar
103 $(MKDIR) -p $(@D) 103 $(MKDIR) -p $(@D)
104 $(RM) -f $(@D)/_the_wrappers.d 104 $(RM) -f $(@D)/_the_wrappers.d
105 $(ECHO) $(LOG_INFO) Generating class file from $*.mc 105 $(ECHO) $(LOG_INFO) Generating class file from $*.mc
106 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D) 106 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D)
107 107
108 # Generate LogWrapper properties file by concatening resource files 108 # Generate LogWrapper properties file by concatening resource files
109 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \ 109 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \
110 $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \ 110 $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \
111 $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \ 111 $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \
112 $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \ 112 $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \
113 $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \ 113 $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \
114 $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \ 114 $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \
115 $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ 115 $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \
116 $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ 116 $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \
117 $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource 117 $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource
118 $(MKDIR) -p $(@D) 118 $(MKDIR) -p $(@D)
119 $(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F) 119 $(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F)
120 $(CAT) $^ > $@ 120 $(CAT) $^ > $@
121 121
122 # The resources files are generated from lisp-like .mc files. 122 # The resources files are generated from lisp-like .mc files.
123 $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar 123 $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar
124 $(MKDIR) -p $(@D) 124 $(MKDIR) -p $(@D)
125 $(RM) -f $(@D)/_the_wrappers.d 125 $(RM) -f $(@D)/_the_wrappers.d
126 $(ECHO) $(LOG_INFO) Generating resource file from $*.mc 126 $(ECHO) $(LOG_INFO) Generating resource file from $*.mc
127 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D) 127 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D)
128 128
129 129
130 $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 130 $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d: $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
131 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \ 131 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \
132 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \ 132 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \
133 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \ 133 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
134 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \ 134 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \
135 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \ 135 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \
136 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \ 136 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
137 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \ 137 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \
138 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \ 138 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \
139 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties 139 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties
140 $(MKDIR) -p $(@D) 140 $(MKDIR) -p $(@D)
141 $(ECHO) LOGWRAPPERS_ARE_CREATED=yes > $@ 141 $(ECHO) LOGWRAPPERS_ARE_CREATED = yes > $@
142 142
143 # Trigger the generation of the logwrappers. After the logwrapper classes and 143 # Trigger the generation of the logwrappers. After the logwrapper classes and
144 # resources have been created, then the makefile will restart and the newly 144 # resources have been created, then the makefile will restart and the newly
145 # created java files will become part of the build further along in the makefile. 145 # created java files will become part of the build further along in the makefile.
146 -include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d 146 -include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d
147 147
148 ifeq ($(LOGWRAPPERS_ARE_CREATED),yes) 148 ifeq ($(LOGWRAPPERS_ARE_CREATED), yes)
149 $(eval $(call SetupIdlCompilation,BUILD_IDLS,\ 149
150 IDLJ:=$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar,\ 150 $(eval $(call SetupIdlCompilation,BUILD_IDLS, \
151 SRC:=$(CORBA_TOPDIR)/src/share/classes,\ 151 IDLJ := $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \
152 BIN:=$(CORBA_OUTPUTDIR)/gensrc,\ 152 SRC := $(CORBA_TOPDIR)/src/share/classes, \
153 EXCLUDES:=com/sun/tools/corba/se/idl/% \ 153 BIN := $(CORBA_OUTPUTDIR)/gensrc, \
154 org/omg/CORBA/% \ 154 EXCLUDES := com/sun/tools/corba/se/idl/% \
155 com/sun/corba/se/GiopIDL/% \ 155 org/omg/CORBA/% \
156 org/omg/PortableServer/corba.idl,\ 156 com/sun/corba/se/GiopIDL/% \
157 INCLUDES:=%,\ 157 org/omg/PortableServer/corba.idl, \
158 OLDIMPLBASES:=com/sun/corba/se/PortableActivationIDL/activation.idl \ 158 INCLUDES := %, \
159 com/sun/corba/se/spi/activation/activation.idl,\ 159 OLDIMPLBASES := com/sun/corba/se/PortableActivationIDL/activation.idl \
160 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)) 160 com/sun/corba/se/spi/activation/activation.idl, \
161 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))
162 $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar 162
163 163 $(BUILD_IDLS): $(CORBA_OUTPUTDIR)/btjars/idlj.jar
164 $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar 164
165 $(MKDIR) -p $(@D) 165 $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d: $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar
166 $(ECHO) IDLS_ARE_CREATED=yes > $@ 166 $(MKDIR) -p $(@D)
167 167 $(ECHO) IDLS_ARE_CREATED = yes > $@
168 -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d 168
169 169 -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
170 ifeq ($(IDLS_ARE_CREATED),yes) 170
171 $(eval $(call SetupJavaCompilation,BUILD_CORBA,\ 171 ifeq ($(IDLS_ARE_CREATED), yes)
172 SETUP:=GENERATE_NEWBYTECODE,\ 172
173 SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ 173 $(eval $(call SetupJavaCompilation,BUILD_CORBA, \
174 EXCLUDES:=com/sun/corba/se/PortableActivationIDL\ 174 SETUP := GENERATE_NEWBYTECODE, \
175 com/sun/tools/corba/se/logutil,\ 175 SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \
176 EXCLUDE_FILES:=com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \ 176 EXCLUDES := com/sun/corba/se/PortableActivationIDL \
177 com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \ 177 com/sun/tools/corba/se/logutil, \
178 com/sun/org/omg/CORBA/IDLTypeOperations.java \ 178 EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
179 com/sun/org/omg/CORBA/IRObjectOperations.java \ 179 com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
180 org/omg/PortableInterceptor/UNKNOWN.java \ 180 com/sun/org/omg/CORBA/IDLTypeOperations.java \
181 com/sun/tools/corba/se/idl/ResourceBundleUtil.java\ 181 com/sun/org/omg/CORBA/IRObjectOperations.java \
182 com/sun/corba/se/impl/presentation/rmi/jndi.properties,\ 182 org/omg/PortableInterceptor/UNKNOWN.java \
183 COPY:=.prp LogStrings.properties,\ 183 com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
184 BIN:=$(CORBA_OUTPUTDIR)/classes)) 184 com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
185 COPY := .prp LogStrings.properties, \
186 BIN := $(CORBA_OUTPUTDIR)/classes))
185 187
186 $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \ 188 $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \
187 SETUP := GENERATE_OLDBYTECODE, \ 189 SETUP := GENERATE_OLDBYTECODE, \
188 SRC := $(BUILD_CORBA_SRC), \ 190 SRC := $(BUILD_CORBA_SRC), \
189 EXCLUDES := $(BUILD_CORBA_EXCLUDES), \ 191 EXCLUDES := $(BUILD_CORBA_EXCLUDES), \
190 EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \ 192 EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \
191 COPY := $(BUILD_CORBA_COPY), \ 193 COPY := $(BUILD_CORBA_COPY), \
192 BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \ 194 BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \
193 JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar)) 195 JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar))
194 196
195 # Separate src.zip call to include sources that were excluded in the build to 197 # Separate src.zip call to include sources that were excluded in the build to
196 # mimic behavior in old build system. 198 # mimic behavior in old build system.
197 $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\ 199 $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA, \
198 SRC:=$(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers,\ 200 SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \
199 ZIP:=$(CORBA_OUTPUTDIR)/dist/lib/src.zip)) 201 ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip))
200 202
201 $(BUILD_CORBA) : $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES) 203 $(BUILD_CORBA): $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES)
202 204
203 # Run stripproperties on all sunorb resource files. 205 # Run stripproperties on all sunorb resource files.
204 STRIP_PROP_SRC_FILES:=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties") 206 STRIP_PROP_SRC_FILES := $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties")
205 STRIP_PROP_FILES:=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%,$(CORBA_OUTPUTDIR)/classes/%,\ 207 STRIP_PROP_FILES := $(patsubst $(CORBA_TOPDIR)/src/share/classes/%, $(CORBA_OUTPUTDIR)/classes/%, \
206 $(STRIP_PROP_SRC_FILES)) 208 $(STRIP_PROP_SRC_FILES))
207 # Simple delivery of zh_HK properties files just copies zh_TW properties files 209 # Simple delivery of zh_HK properties files just copies zh_TW properties files
208 STRIP_PROP_FILES+=$(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties,\ 210 STRIP_PROP_FILES += $(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties, \
209 $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties,\ 211 $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties, \
210 $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")) 212 $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties"))
211 STRIP_PROP_SRC_FILES+=$(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties") 213 STRIP_PROP_SRC_FILES += $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")
212 STRIP_PROP_CMDLINE:=$(subst _SPACE_,$(SPACE),\ 214 STRIP_PROP_CMDLINE := $(subst _SPACE_, $(SPACE), \
213 $(join $(addprefix -clean_SPACE_,$(STRIP_PROP_SRC_FILES)), \ 215 $(join $(addprefix -clean_SPACE_, $(STRIP_PROP_SRC_FILES)), \
214 $(addprefix _SPACE_,$(STRIP_PROP_FILES)))) 216 $(addprefix _SPACE_, $(STRIP_PROP_FILES))))
215 217
216 $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \ 218 $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \
217 $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar 219 $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar
218 $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES))) 220 $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES)))
219 $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline) 221 $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline)
220 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 222 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
221 @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline 223 @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline
222 $(TOUCH) $@ 224 $(TOUCH) $@
223 225
224 $(eval $(call SetupArchive,ARCHIVE_CORBA,\ 226 $(eval $(call SetupArchive,ARCHIVE_CORBA, \
225 $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties,\ 227 $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties, \
226 SRCS:=$(CORBA_OUTPUTDIR)/classes,\ 228 SRCS := $(CORBA_OUTPUTDIR)/classes, \
227 SUFFIXES:=.class .prp .properties,\ 229 SUFFIXES := .class .prp .properties, \
228 JAR:=$(CORBA_OUTPUTDIR)/dist/lib/classes.jar)) 230 JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
229 231
230 # The created classes.jar now contains Corba compiled to run on the target JDK 232 # The created classes.jar now contains Corba compiled to run on the target JDK
231 # and is ready for inclusion in jdk rt.jar. 233 # and is ready for inclusion in jdk rt.jar.
232 234
233 # The created src.zip now contains .java and .properties files used to create the classes in classes.jar 235 # The created src.zip now contains .java and .properties files used to create the classes in classes.jar
234 # and is ready for inclusion into the jdk src.zip 236 # and is ready for inclusion into the jdk src.zip
235 237
236 BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \ 238 BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
237 $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl 239 $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
238 240
239 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar 241 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar
240 $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib 242 $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
241 $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib 243 $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
242 $(RM) -f $@ 244 $(RM) -f $@
243 $(ECHO) Creating `basename $@` 245 $(ECHO) Creating `basename $@`
244 $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib 246 $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
245 $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/* 247 $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
246 (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) 248 (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
247 249
248 # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl 250 # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl
249 251
250 all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \ 252 all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
251 $(CORBA_OUTPUTDIR)/btjars/idlj.jar \ 253 $(CORBA_OUTPUTDIR)/btjars/idlj.jar \
252 $(CORBA_OUTPUTDIR)/btjars/logutil.jar \ 254 $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
253 $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \ 255 $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \
254 $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \ 256 $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \
255 $(CORBA_OUTPUTDIR)/dist/lib/src.zip \ 257 $(CORBA_OUTPUTDIR)/dist/lib/src.zip \
256 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip 258 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip
257 endif 259 endif
258 endif 260 endif
259 261
260 clean: 262 clean:
261 $(RM) -rf $(CORBA_OUTPUTDIR) 263 $(RM) -rf $(CORBA_OUTPUTDIR)
262 264
263 .PHONY: default all clean clobber 265 .PHONY: default all clean clobber

mercurial