Mercurial > hg > openjdk > jdk9 > corba
changeset 739:0680fb7dae4d jdk-9+103
Merge
| author | lana |
|---|---|
| date | Thu, 21 Jan 2016 10:16:59 -0800 |
| parents | 68b4d7d59f16 (current diff) 7cf41aa89a2b (diff) |
| children | e385e95e6101 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/gensrc/Gensrc-java.corba.gmk Thu Jan 21 09:45:57 2016 -0800 +++ b/make/gensrc/Gensrc-java.corba.gmk Thu Jan 21 10:16:59 2016 -0800 @@ -62,9 +62,9 @@ $(EXCEPTION_DIR)/%SystemException.java: \ $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ $(BUILD_TOOLS_CORBA) - $(MKDIR) -p $(@D) + $(call LogInfo, Generating class file from $*.mc) + $(call MakeDir, $(@D)) $(RM) -f $(@D)/_the_wrappers.d - $(ECHO) $(LOG_INFO) Generating class file from $*.mc $(TOOL_LOGUTIL_CMD) make-class $< $(@D) # Generate LogWrapper properties file by concatening resource files @@ -77,17 +77,17 @@ $(LOGWRAPPER_DIR)/ORBUtilSystemException.resource \ $(LOGWRAPPER_DIR)/POASystemException.resource \ $(LOGWRAPPER_DIR)/UtilSystemException.resource - $(MKDIR) -p $(@D) - $(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F) + $(call LogInfo, Concatenating 8 resource files into $(@F)) + $(call MakeDir, $(@D)) $(CAT) $^ > $@ # The resources files are generated from lisp-like .mc files. $(LOGWRAPPER_DIR)/%SystemException.resource: \ $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ $(BUILD_TOOLS_CORBA) - $(MKDIR) -p $(@D) + $(call LogInfo, Generating resource file from $*.mc) + $(call MakeDir, $(@D)) $(RM) -f $(@D)/_the_wrappers.d - $(ECHO) $(LOG_INFO) Generating resource file from $*.mc $(TOOL_LOGUTIL_CMD) make-resource $< $(@D) @@ -240,4 +240,3 @@ all: $(BUILD_IDLS) $(LOGWRAPPER_TARGETS) \ $(SUPPORT_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties -