corba Makefile bugs (b24)

Fri Feb 29 17:25:29 UTC 2008

While working on OpenJDK 1.7 BSD porting efforts, I noticed not all of the 
corba source was being compiled which caused failures later in the build. It 
appears to be the result of some typos in a corba Makefile:

--- corba/make/org/omg/CORBA/Makefile.orig	Sat Dec  1 00:00:00 2007
+++ corba/make/org/omg/CORBA/Makefile	Thu Feb 28 15:22:56 2008
@@ -47,8 +47,8 @@ else
 endif
 
 FILES_java = \
-        $(ORG_OMG_SENDINGCONTEXT_java) \
-        $(ORG_OMG_CORBA_2_3_java) \
+        $(org_omg_SendingContext_java) \
+        $(org_omg_CORBA_2_3_java) \
         $(ORG_OMG_CORBA_java)
 
 #

In addition when I get to the end of the jdk build during the 
initial-image-jdk target in jdk/make/common/Release.gmk, I'm hitting failures 
while executing this command:

$(JAVAC_CMD) -XDprocess.packages -proc:only \
   -processor com.sun.tools.javac.sym.CreateSymbols \
   -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
   -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
   $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)

It appears some corba source files are not getting compiled. I have patched 
some Makefiles to get them to compile but I'm unsure about which corba 
Makefile to patch to build 
corba/src/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java

Here's what the current failure looks like:

/usr/local/jdk-1.6.0/bin/java  -Xmx736m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=96m "-Xbootclasspath/p:/usr/obj/amd64/ports/jdk-1.7.0.b24/openjdk7-b24/build/bsd-amd64/langtools/dist/bootstrap/lib/javac.jar" -jar /usr/obj/amd64/ports/jdk-1.7.0.b24/openjdk7-b24/build/bsd-amd64/langtools/dist/bootstrap/lib/javac.jar  -source 
1.5 -target 5 -encoding 
ascii "-Xbootclasspath:/usr/obj/amd64/ports/jdk-1.7.0.b24/openjdk7-b24/build/bsd-amd64/classes"  -XDprocess.packages -proc:only 
\
    -processor com.sun.tools.javac.sym.CreateSymbols \
    -Acom.sun.tools.javac.sym.Jar=/usr/obj/amd64/ports/jdk-1.7.0.b24/openjdk7-b24/build/bsd-amd64/tmp/rt-orig.jar 
\
    -Acom.sun.tools.javac.sym.Dest=/usr/obj/amd64/ports/jdk-1.7.0.b24/openjdk7-b24/build/bsd-amd64/symbols/META-INF/sym/rt.jar 
\
    java.applet java.awt java.awt.color java.awt.datatransfer java.awt.dnd 
[snip]
org.omg.CORBA org.omg.CORBA.DynAnyPackage org.omg.CORBA.ORBPackage 
org.omg.CORBA.TypeCodePackage org.omg.stub.java.rmi org.omg.CORBA.portable 
org.omg.CORBA_2_3 org.omg.CORBA_2_3.portable org.omg.CosNaming 
[snip]
warning: package javax.transaction does not exist
warning: package com.sun.java.swing.plaf does not exist
Using boot class path = 
[/usr/obj/amd64/ports/jdk-1.7.0.b24/openjdk7-b24/build/bsd-amd64/tmp/rt-orig.jar, /usr/obj/amd64/ports/jdk-1.7.0.b24/openjdk7-b24/build/bsd-amd64/langtools/dist/bootstrap/lib/javac.jar, /usr/local/jdk-1.6.0/jre/lib/resources.jar, /usr/local/jdk-1.6.0/jre/lib/sunrsasign.jar, /usr/local/jdk-1.6.0/jre/lib/jsse.jar, /usr/local/jdk-1.6.0/jre/lib/jce.jar, /usr/local/jdk-1.6.0/jre/lib/charsets.jar, /usr/local/jdk-1.6.0/jre/classes, /usr/local/jdk-1.6.0/jre/lib/ext/dnsns.jar, /usr/local/jdk-1.6.0/jre/lib/ext/localedata.jar, /usr/local/jdk-1.6.0/jre/lib/ext/sunjce_provider.jar, /usr/local/jdk-1.6.0/jre/lib/ext/sunpkcs11.jar]
error: com.sun.corba.se.org.omg.CORBA.ORB: class file for 
com.sun.corba.se.org.omg.CORBA.ORB not found
error: class file for com.sun.corba.se.org.omg.CORBA.ORB not found
1 error
gmake[1]: *** [initial-image-jdk] Error 1
gmake[1]: Leaving directory 
`/usr/obj/amd64/ports/jdk-1.7.0.b24/openjdk7-b24/jdk/make'
gmake: *** [jdk-build] Error 2

The following are the patches I have so far for other missing files. Any help 
on wether or not I'm on the right track or not would be helpful. If I'm on 
the right track then a pointer as to how to get 
corba/src/share/classes/com/sun/corba/se/org/omg/CORBA/ORB.java built 
properly would be great.

Thanks,
-Kurt

--- 
corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk.orig	
Fri Feb 29 00:05:48 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk	Fri 
Feb 29 00:06:28 2008
@@ -41,4 +41,6 @@ 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/DynValueCommonImpl.java
+	


--- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig	Fri 
Feb 29 08:58:24 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk	Fri Feb 29 
08:58:45 2008
@@ -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


--- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig	
Thu Feb 28 17:17:49 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk	Thu 
Feb 28 17:18:22 2008
@@ -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 \

