One of these days I need to convert these corba Makefiles to an
ant script, anyway...
I'm also testing the attached patch. One more spelling error and a few
sources missing from the lists.
-kto
Mark Wielaard wrote:
Hi,
On Fri, 2008-08-01 at 11:44 -0700, Kelly O'Hair wrote:
Best guess is that some kind of change to javac is triggering
this failure, but I'm not convinced anything is 'wrong' with javac,
just a change in the class files created implicitly. Stay tuned...
In the corba repository I did find this problem:
diff -r 80a0f46a6203 make/org/omg/CORBA/Makefile
--- a/make/org/omg/CORBA/Makefile Thu Jul 17 11:28:32 2008 -0700
+++ b/make/org/omg/CORBA/Makefile Fri Aug 01 11:30:41 2008 -0700
@@ -48,7 +48,7 @@ endif
FILES_java = \
$(ORG_OMG_SENDINGCONTEXT_java) \
- $(ORG_OMG_CORBA_2_3_java) \
+ $(org_omg_CORBA_2_3_java) \
$(ORG_OMG_CORBA_java)
#
I'm testing it now but I still don't understand why it fails sometimes
and not others. The 2_3 sources are never explicitly listed to be
compiled so how they got compiled in the past is a puzzle.
In icedtea we have the following patches/icedtea-corba.patch:
--- openjdk.old/corba/make/org/omg/CORBA/Makefile 2007-10-12
03:49:14.000000000 -0400
+++ openjdk/corba/make/org/omg/CORBA/Makefile 2007-11-06 13:57:24.000000000
-0500
@@ -49,7 +49,10 @@
FILES_java = \
$(ORG_OMG_SENDINGCONTEXT_java) \
$(ORG_OMG_CORBA_2_3_java) \
- $(ORG_OMG_CORBA_java)
+ $(ORG_OMG_CORBA_java) \
+ $(org_omg_SENDINGCONTEXT_java) \
+ $(org_omg_CORBA_2_3_java) \
+ $(org_omg_CORBA_java)
#
It comes from a similar thread last year about corba failing to compile
in some (bootstrap) situations with alternative compilers gcj/ecj in our
case:
http://thread.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/414
Cheers,
Mark
diff -r e9dad83f035c
make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk Fri Aug
01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk Sat Aug
02 09:56:00 2008 -0700
@@ -41,4 +41,7 @@ com_sun_corba_se_impl_dynamicany_java =
com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java \
com/sun/corba/se/impl/dynamicany/DynStructImpl.java \
com/sun/corba/se/impl/dynamicany/DynUnionImpl.java \
- com/sun/corba/se/impl/dynamicany/DynValueImpl.java
+ com/sun/corba/se/impl/dynamicany/DynValueImpl.java \
+ com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java \
+ com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java
+
diff -r e9dad83f035c
make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk Fri Aug
01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk Sat Aug
02 09:56:00 2008 -0700
@@ -52,6 +52,8 @@ com_sun_corba_se_impl_encoding_java = \
com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java \
com/sun/corba/se/impl/encoding/EncapsInputStream.java \
com/sun/corba/se/impl/encoding/EncapsOutputStream.java \
+ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \
+ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java \
com/sun/corba/se/impl/encoding/MarkAndResetHandler.java \
com/sun/corba/se/impl/encoding/MarshalInputStream.java \
com/sun/corba/se/impl/encoding/MarshalOutputStream.java \
diff -r e9dad83f035c make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk Fri Aug 01
13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk Sat Aug 02
09:56:00 2008 -0700
@@ -63,6 +63,7 @@ com_sun_corba_se_impl_ior_java = \
com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java \
com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java \
com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java \
+ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \
com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java
\
com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \
com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java
diff -r e9dad83f035c
make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Fri Aug
01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Sat Aug
02 09:56:00 2008 -0700
@@ -27,6 +27,7 @@ com_sun_corba_se_impl_orbutil_java = \
com/sun/corba/se/impl/orbutil/CacheTable.java \
com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java \
com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \
+ com/sun/corba/se/impl/orbutil/GetPropertyAction.java \
com/sun/corba/se/impl/orbutil/HexOutputStream.java \
com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \
com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \
@@ -76,6 +77,7 @@ com_sun_corba_se_impl_orbutil_java = \
com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java \
com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java \
com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java \
+ com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java \
com/sun/corba/se/impl/orbutil/graph/Node.java \
com/sun/corba/se/impl/orbutil/graph/NodeData.java \
com/sun/corba/se/impl/orbutil/graph/Graph.java \
diff -r e9dad83f035c
make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk Fri Aug
01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk Sat Aug
02 09:56:00 2008 -0700
@@ -63,6 +63,7 @@ com_sun_corba_se_impl_protocol_java = \
com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java \
+
com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java \
diff -r e9dad83f035c make/com/sun/corba/minclude/org_omg_DynamicAny.jmk
--- a/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk Fri Aug 01
13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk Sat Aug 02
09:56:00 2008 -0700
@@ -47,6 +47,8 @@ DYNANY_GENERATED_java = \
org/omg/DynamicAny/DynUnionOperations.java \
org/omg/DynamicAny/DynValue.java \
org/omg/DynamicAny/DynValueOperations.java \
+ org/omg/DynamicAny/DynValueBox.java \
+ org/omg/DynamicAny/DynValueBoxOperations.java \
org/omg/DynamicAny/NameDynAnyPair.java \
org/omg/DynamicAny/NameValuePair.java \
org/omg/DynamicAny/DynAnyPackage/InvalidValue.java \
diff -r e9dad83f035c make/org/omg/CORBA/Makefile
--- a/make/org/omg/CORBA/Makefile Fri Aug 01 13:37:17 2008 -0700
+++ b/make/org/omg/CORBA/Makefile Sat Aug 02 09:56:00 2008 -0700
@@ -47,7 +47,7 @@ endif
endif
FILES_java = \
- $(ORG_OMG_SENDINGCONTEXT_java) \
+ $(org_omg_SendingContext_java) \
$(org_omg_CORBA_2_3_java) \
$(ORG_OMG_CORBA_java)
