8049389: Move orb.idl and ir.idl to JDK include directory

Alan Bateman Alan.Bateman at oracle.com
Fri Sep 26 15:48:26 UTC 2014


As part of preparing to move to a modular image, we want to identify and 
move all files in the JDK and JRE lib trees that are intended to be 
accessed directly. This mail concerns the IDL files that are in the JDK 
lib directory. We want to move them to the include directory. The 
typically usage is #include "orb.idl" so having these in the include 
directory should not be a surprise. The proposed changes are attached.

-Alan


$ (cd corba; hg diff -g)
diff --git a/make/CompileCorba.gmk b/make/CompileCorba.gmk
--- a/make/CompileCorba.gmk
+++ b/make/CompileCorba.gmk
@@ -51,13 +51,11 @@
      JAR := $(INTERIM_CORBA_JAR)))

  ################################################################################
-# Copy idl files straight to jdk/lib. Not sure if this is the right way 
to do
-# it, but we are moving away from the one repo at a time build. Perhaps 
we should
-# scrap the 'jdk' prefix to bin, lib etc?
-$(JDK_OUTPUTDIR)/lib/%: 
$(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/%
+# Copy idl files straight to jdk/include.
+$(JDK_OUTPUTDIR)/include/%: 
$(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/%
      $(install-file)

-IDL_TARGET_FILES := $(JDK_OUTPUTDIR)/lib/orb.idl 
$(JDK_OUTPUTDIR)/lib/ir.idl
+IDL_TARGET_FILES := $(JDK_OUTPUTDIR)/include/orb.idl 
$(JDK_OUTPUTDIR)/include/ir.idl

  ################################################################################

$ (cd jdk; hg diff -g)
diff --git a/make/Images.gmk b/make/Images.gmk
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -203,8 +203,6 @@
        jconsole.jar \
        sa-jdi.jar \
        dt.jar \
-      orb.idl \
-      ir.idl \
        ct.sym

    ifeq ($(OPENJDK_TARGET_OS), windows)



More information about the build-dev mailing list