Try the attached patch. There was more to change that I thought.
If you have other corba changes you should save them.
So may need to:
cd corba
hg diff > ~/saved.corba.patch
hg update -C
hg import corba.patch
quit editor
-kto
Florian Weimer wrote:
* Kelly O'Hair:
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.
With this patch, I get another error:
/bin/mkdir -p /home/fw/src/java/jdk7/build/linux-amd64/symbols/META-INF/sym
/opt/jdk1.6.0_07/bin/java -Xmx896m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m
"-Xbootclasspath/p:/home/fw/src/java/jdk7/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar"
-jar /home/fw/src/java/jdk7/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar -source 1.5
-target 5 -encoding ascii
"-Xbootclasspath:/home/fw/src/java/jdk7/build/linux-amd64/classes" -XDprocess.packages
-proc:only \
-processor com.sun.tools.javac.sym.CreateSymbols \
-Acom.sun.tools.javac.sym.Jar=/home/fw/src/java/jdk7/build/linux-amd64/tmp/rt-orig.jar
\
-Acom.sun.tools.javac.sym.Dest=/home/fw/src/java/jdk7/build/linux-amd64/symbols/META-INF/sym/rt.jar
\
java.applet java.awt java.awt.color java.awt.datatransfer
java.awt.dnd java.awt.event java.awt.font java.awt.geom java.awt.im
java.awt.im.spi java.awt.image java.awt.image.renderable java.awt.print
java.beans java.beans.beancontext java.io java.lang java.lang.annotation
java.lang.instrument java.lang.management java.lang.ref java.lang.reflect
java.math java.net java.nio java.nio.channels java.nio.channels.spi
java.nio.charset java.nio.charset.spi java.rmi java.rmi.activation java.rmi.dgc
java.rmi.registry java.rmi.server java.security java.security.acl
java.security.cert java.security.interfaces java.security.spec java.sql
java.text java.text.spi java.util java.util.concurrent
java.util.concurrent.atomic java.util.concurrent.locks java.util.jar
java.util.logging java.util.prefs java.util.regex java.util.spi java.util.zip
javax.accessibility javax.activation javax.activity javax.annotation
javax.annotation.processing javax.crypto javax.crypto.interfaces javax.cry
pto.spec javax.imageio javax.imageio.event javax.imageio.metadata
javax.imageio.plugins.jpeg javax.imageio.plugins.bmp javax.imageio.spi
javax.imageio.stream javax.jws javax.jws.soap javax.lang.model
javax.lang.model.element javax.lang.model.type javax.lang.model.util
javax.management javax.management.loading javax.management.monitor
javax.management.relation javax.management.openmbean javax.management.timer
javax.management.modelmbean javax.management.remote javax.management.remote.rmi
javax.naming javax.naming.directory javax.naming.event javax.naming.ldap
javax.naming.spi javax.net javax.net.ssl javax.print javax.print.attribute
javax.print.attribute.standard javax.print.event javax.rmi javax.rmi.CORBA
javax.rmi.ssl javax.script javax.security.auth javax.security.auth.callback
javax.security.auth.kerberos javax.security.auth.login javax.security.auth.spi
javax.security.auth.x500 javax.security.cert javax.security.sasl
javax.sound.sampled javax.sound.sampled.spi javax.sound
.midi javax.sound.midi.spi javax.sql javax.sql.rowset javax.sql.rowset.serial
javax.sql.rowset.spi javax.swing javax.swing.border javax.swing.colorchooser
javax.swing.filechooser javax.swing.event javax.swing.table javax.swing.text
javax.swing.text.html javax.swing.text.html.parser javax.swing.text.rtf
javax.swing.tree javax.swing.undo javax.swing.plaf javax.swing.plaf.basic
javax.swing.plaf.metal javax.swing.plaf.multi javax.swing.plaf.synth
javax.tools javax.transaction javax.transaction.xa javax.xml.parsers
javax.xml.bind javax.xml.bind.annotation javax.xml.bind.annotation.adapters
javax.xml.bind.attachment javax.xml.bind.helpers javax.xml.bind.util
javax.xml.soap javax.xml.ws javax.xml.ws.handler javax.xml.ws.handler.soap
javax.xml.ws.http javax.xml.ws.soap javax.xml.ws.spi javax.xml.transform
javax.xml.transform.sax javax.xml.transform.dom javax.xml.transform.stax
javax.xml.transform.stream javax.xml javax.xml.crypto javax.xml.crypto.dom
javax.xml.crypto.dsig javax.xml.c
rypto.dsig.dom javax.xml.crypto.dsig.keyinfo javax.xml.crypto.dsig.spec
javax.xml.datatype javax.xml.validation javax.xml.namespace javax.xml.xpath
javax.xml.stream javax.xml.stream.events javax.xml.stream.util org.ietf.jgss
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
org.omg.CosNaming.NamingContextExtPackage
org.omg.CosNaming.NamingContextPackage org.omg.SendingContext
org.omg.PortableServer org.omg.PortableServer.CurrentPackage
org.omg.PortableServer.POAPackage org.omg.PortableServer.POAManagerPackage
org.omg.PortableServer.ServantLocatorPackage org.omg.PortableServer.portable
org.omg.PortableInterceptor org.omg.PortableInterceptor.ORBInitInfoPackage
org.omg.Messaging org.omg.IOP org.omg.IOP.CodecFactoryPackage
org.omg.IOP.CodecPackage org.omg.Dynamic org.omg.DynamicAny
org.omg.DynamicAny.DynAnyPackage org.omg.Dynam
icAny.DynAnyFactoryPackage org.w3c.dom org.w3c.dom.events org.w3c.dom.bootstrap
org.w3c.dom.ls org.xml.sax org.xml.sax.ext org.xml.sax.helpers
com.sun.java.browser.dom org.w3c.dom org.w3c.dom.bootstrap org.w3c.dom.ls
org.w3c.dom.ranges org.w3c.dom.traversal org.w3c.dom.html
org.w3c.dom.stylesheets org.w3c.dom.css org.w3c.dom.events org.w3c.dom.views
com.sun.management com.sun.security.auth com.sun.security.auth.callback
com.sun.security.auth.login com.sun.security.auth.module com.sun.security.jgss
com.sun.net.ssl com.sun.net.httpserver com.sun.net.httpserver.spi
javax.smartcardio com.sun.tracing com.sun.tracing.dtrace
com.sun.java.swing.plaf com.sun.java.swing.plaf.windows
com.sun.java.swing.plaf.motif com.sun.java.swing.plaf.gtk
warning: package javax.transaction does not exist
warning: package com.sun.java.swing.plaf does not exist
Using boot class path =
[/home/fw/src/java/jdk7/build/linux-amd64/tmp/rt-orig.jar,
/home/fw/src/java/jdk7/build/linux-amd64/langtools/dist/bootstrap/lib/javac.jar,
/opt/jdk1.6.0_07/jre/lib/resources.jar,
/opt/jdk1.6.0_07/jre/lib/sunrsasign.jar, /opt/jdk1.6.0_07/jre/lib/jsse.jar,
/opt/jdk1.6.0_07/jre/lib/jce.jar, /opt/jdk1.6.0_07/jre/lib/charsets.jar,
/opt/jdk1.6.0_07/jre/classes, /opt/jdk1.6.0_07/jre/lib/ext/dnsns.jar,
/opt/jdk1.6.0_07/jre/lib/ext/localedata.jar,
/opt/jdk1.6.0_07/jre/lib/ext/sunpkcs11.jar,
/opt/jdk1.6.0_07/jre/lib/ext/sunjce_provider.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
make[1]: *** [initial-image-jdk] Error 1
make[1]: Leaving directory `/home/fw/src/java/jdk7/jdk/make'
make: *** [jdk-build] Error 2
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 Mon Aug
04 17:42:50 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 Mon Aug
04 17:42:50 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 Mon Aug 04
17:42:50 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 Mon Aug
04 17:42:50 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 Mon Aug
04 17:42:50 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/com_sun_corba_se_spi_legacy_interceptor.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk
Fri Aug 01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk
Mon Aug 04 17:42:50 2008 -0700
@@ -29,6 +29,7 @@
com_sun_corba_se_spi_legacy_interceptor_java = \
com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java \
+ com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java \
com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java \
com/sun/corba/se/spi/legacy/interceptor/UnknownType.java
diff -r e9dad83f035c
make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk Fri Aug
01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk Mon Aug
04 17:42:50 2008 -0700
@@ -35,5 +35,6 @@ FILES_java = \
com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \
com/sun/corba/se/spi/monitoring/MonitoredAttribute.java \
com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java \
+ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \
com/sun/corba/se/spi/monitoring/MonitoringManager.java \
com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java
diff -r e9dad83f035c
make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk
Fri Aug 01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk
Mon Aug 04 17:42:50 2008 -0700
@@ -27,6 +27,7 @@ com_sun_corba_se_spi_presentation_rmi_ja
com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java \
com/sun/corba/se/spi/presentation/rmi/DynamicStub.java \
com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \
+ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \
com/sun/corba/se/spi/presentation/rmi/StubAdapter.java
diff -r e9dad83f035c
make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk Fri Aug
01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk Mon Aug
04 17:42:50 2008 -0700
@@ -26,6 +26,7 @@ com_sun_corba_se_spi_transport_java = \
com_sun_corba_se_spi_transport_java = \
com/sun/corba/se/spi/transport/CorbaAcceptor.java \
com/sun/corba/se/spi/transport/CorbaConnection.java \
+ com/sun/corba/se/spi/transport/CorbaConnectionCache.java \
com/sun/corba/se/spi/transport/CorbaContactInfo.java \
com/sun/corba/se/spi/transport/CorbaContactInfoList.java \
com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java \
diff -r e9dad83f035c make/com/sun/corba/minclude/org_omg_CosNaming.jmk
--- a/make/com/sun/corba/minclude/org_omg_CosNaming.jmk Fri Aug 01 13:37:17
2008 -0700
+++ b/make/com/sun/corba/minclude/org_omg_CosNaming.jmk Mon Aug 04 17:42:50
2008 -0700
@@ -47,6 +47,7 @@ NS_GENERATED_java = \
org/omg/CosNaming/NamingContext.java \
org/omg/CosNaming/NamingContextHelper.java \
org/omg/CosNaming/NamingContextHolder.java \
+ org/omg/CosNaming/NamingContextOperations.java \
org/omg/CosNaming/_NamingContextStub.java \
org/omg/CosNaming/NamingContextPackage/AlreadyBound.java \
org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.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 Mon Aug 04
17:42:50 2008 -0700
@@ -47,6 +47,10 @@ 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/DynValueCommon.java \
+ org/omg/DynamicAny/DynValueCommonOperations.java \
org/omg/DynamicAny/NameDynAnyPair.java \
org/omg/DynamicAny/NameValuePair.java \
org/omg/DynamicAny/DynAnyPackage/InvalidValue.java \
@@ -70,8 +74,16 @@ DYNANY_GENERATED_java = \
org/omg/DynamicAny/DynSequenceHelper.java \
org/omg/DynamicAny/NameDynAnyPairSeqHelper.java \
org/omg/DynamicAny/NameValuePairHelper.java \
- org/omg/DynamicAny/NameValuePairSeqHelper.java
-
+ org/omg/DynamicAny/NameValuePairSeqHelper.java \
+ org/omg/DynamicAny/_DynAnyFactoryStub.java \
+ org/omg/DynamicAny/_DynAnyStub.java \
+ org/omg/DynamicAny/_DynArrayStub.java \
+ org/omg/DynamicAny/_DynEnumStub.java \
+ org/omg/DynamicAny/_DynFixedStub.java \
+ org/omg/DynamicAny/_DynSequenceStub.java \
+ org/omg/DynamicAny/_DynStructStub.java \
+ org/omg/DynamicAny/_DynUnionStub.java \
+ org/omg/DynamicAny/_DynValueStub.java
DYNANY_HELP_HOLD_java = \
org/omg/DynamicAny/AnySeqHolder.java \
diff -r e9dad83f035c make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk
--- a/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk Fri Aug
01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk Mon Aug
04 17:42:50 2008 -0700
@@ -106,6 +106,7 @@ PI_GENERATED_java = \
org/omg/IOP/CodecPackage/TypeMismatchHelper.java \
org/omg/IOP/ENCODING_CDR_ENCAPS.java \
org/omg/IOP/Encoding.java \
+ org/omg/IOP/ExceptionDetailMessage.java \
org/omg/Dynamic/Parameter.java
# Helper and Holder files to be removed:
diff -r e9dad83f035c make/com/sun/corba/se/sources/Makefile
--- a/make/com/sun/corba/se/sources/Makefile Fri Aug 01 13:37:17 2008 -0700
+++ b/make/com/sun/corba/se/sources/Makefile Mon Aug 04 17:42:50 2008 -0700
@@ -45,6 +45,8 @@ CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/s
CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk
include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
+
+FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java
#
# Dirs
diff -r e9dad83f035c make/javax/xa/Makefile
--- a/make/javax/xa/Makefile Fri Aug 01 13:37:17 2008 -0700
+++ b/make/javax/xa/Makefile Mon Aug 04 17:42:50 2008 -0700
@@ -35,7 +35,7 @@ include $(BUILDDIR)/common/Defs.gmk
#
# Files to compile
#
-AUTO_FILES_JAVA_DIRS = javax/transaction/xa
+AUTO_FILES_JAVA_DIRS = javax/transaction
#
# Rules
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 Mon Aug 04 17:42:50 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)
