OpenJDK / jigsaw / jake / corba
changeset 823:2cc9f6df4e50
Reverting unneeded jigsaw specific changes
| author | erikj |
|---|---|
| date | Wed, 18 Nov 2015 12:52:31 +0100 |
| parents | 355803ae4e8a |
| children | 5bb265a8aef1 |
| files | make/copy/Copy-java.corba.gmk make/gensrc/Gensrc-java.corba.gmk |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/copy/Copy-java.corba.gmk Tue Nov 17 16:38:11 2015 +0100 +++ b/make/copy/Copy-java.corba.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -27,7 +27,7 @@ # Copy idl files to jdk/lib. $(eval $(call SetupCopyFiles,COPY_IDL, \ SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl, \ - DEST := $(MODULES_INCLUDE_OUTPUTDIR)/$(MODULE), \ + DEST := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE), \ FILES := $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl \ $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl))
--- a/make/gensrc/Gensrc-java.corba.gmk Tue Nov 17 16:38:11 2015 +0100 +++ b/make/gensrc/Gensrc-java.corba.gmk Wed Nov 18 12:52:31 2015 +0100 @@ -55,8 +55,8 @@ ################################################################################ -EXCEPTION_DIR := $(GENSRC_OUTPUTDIR)/java.corba/com/sun/corba/se/impl/logging -LOGWRAPPER_DIR := $(GENSRC_OUTPUTDIR)/java.corba/_logwrappers +EXCEPTION_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/logging +LOGWRAPPER_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.corba/_logwrappers # Generate LogWrapper classes $(EXCEPTION_DIR)/%SystemException.java: \ @@ -217,7 +217,7 @@ $(eval $(call SetupIdlCompilation,BUILD_IDLS, \ IDLJ := $(TOOL_IDLJ_CMD), \ SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \ - BIN := $(GENSRC_OUTPUTDIR)/java.corba, \ + BIN := $(SUPPORT_OUTPUTDIR)/gensrc/java.corba, \ EXCLUDES := com/sun/tools/corba/se/idl/% \ org/omg/CORBA/% \ com/sun/corba/se/GiopIDL/% \ @@ -232,12 +232,12 @@ ################################################################################ # zh_HK is just a copy of zh_TW -$(GENSRC_OUTPUTDIR)/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \ +$(SUPPORT_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \ $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties $(install-file) ################################################################################ all: $(BUILD_IDLS) $(LOGWRAPPER_TARGETS) \ - $(GENSRC_OUTPUTDIR)/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties + $(SUPPORT_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties