# HG changeset patch
# User erikj
# Date 1424254680 -3600
# Node ID f14b019bfdfa90fe0200eb985b664dbe1b50ef83
# Parent  82642b0f09457cb33089daa0b8291e784093661c
8073328: Incremental build of gensrc broken
Reviewed-by: alanb, tbell, dfuchs, sherman

diff -r 82642b0f0945 -r f14b019bfdfa jdk/make/gensrc/Gensrc-jdk.charsets.gmk
--- a/jdk/make/gensrc/Gensrc-jdk.charsets.gmk	Tue Feb 17 12:02:38 2015 -0800
+++ b/jdk/make/gensrc/Gensrc-jdk.charsets.gmk	Wed Feb 18 11:18:00 2015 +0100
@@ -40,16 +40,17 @@
 CHARSET_EXTENDED_JAVA_TEMPLATES := \
     $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
 CHARSET_EXTENDED_JAVA_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
-CHARSET_EXTENDED := extcs
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \
-    $(CHARSET_TEMPLATES) $(CHARSET_EXTENDED_DATA) $(BUILD_TOOLS_JDK)
+    $(wildcard $(CHARSET_DATA_DIR)/$(CHARSET_STANDARD_OS)) \
+    $(CHARSET_TEMPLATES) $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
+    $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(@D)
 	$(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) \
-		extcs charsets  $(CHARSET_STANDARD_OS) \
-                $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
-		$(CHARSET_EXTENDED_JAVA_DIR)
+	    extcs charsets  $(CHARSET_STANDARD_OS) \
+	    $(CHARSET_EXTENDED_JAVA_TEMPLATES) \
+	    $(CHARSET_EXTENDED_JAVA_DIR) $(LOG_INFO)
 	$(TOUCH) '$@'
 
 $(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER)/HKSCS.java \
diff -r 82642b0f0945 -r f14b019bfdfa jdk/make/gensrc/GensrcCharsetMapping.gmk
--- a/jdk/make/gensrc/GensrcCharsetMapping.gmk	Tue Feb 17 12:02:38 2015 -0800
+++ b/jdk/make/gensrc/GensrcCharsetMapping.gmk	Wed Feb 18 11:18:00 2015 +0100
@@ -40,11 +40,13 @@
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_BASE)-stdcs: $(CHARSET_DATA_DIR)/charsets \
-    $(CHARSET_TEMPLATES) $(BUILD_TOOLS_JDK)
+    $(wildcard $(CHARSET_DATA_DIR)/$(CHARSET_STANDARD_OS)) \
+    $(CHARSET_TEMPLATES) $(CHARSET_STANDARD_JAVA_TEMPLATES) \
+    $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(@D)
 	$(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_BASE) \
-		stdcs charsets $(CHARSET_STANDARD_OS) \
-                $(CHARSET_STANDARD_JAVA_TEMPLATES) $(CHARSET_EXTSRC_DIR) \
+	    stdcs charsets $(CHARSET_STANDARD_OS) \
+	    $(CHARSET_STANDARD_JAVA_TEMPLATES) $(CHARSET_EXTSRC_DIR) $(LOG_INFO)
 	$(TOUCH) '$@'
 
 GENSRC_JAVA_BASE += $(CHARSET_DONE_BASE)-stdcs
diff -r 82642b0f0945 -r f14b019bfdfa jdk/make/src/classes/build/tools/charsetmapping/Main.java
--- a/jdk/make/src/classes/build/tools/charsetmapping/Main.java	Tue Feb 17 12:02:38 2015 -0800
+++ b/jdk/make/src/classes/build/tools/charsetmapping/Main.java	Wed Feb 18 11:18:00 2015 +0100
@@ -206,7 +206,7 @@
     }
 
     static void verbose(Charset cs) {
-         System.err.printf("%s, %s, %s, %s, %s  %b%n",
+         System.out.printf("%s, %s, %s, %s, %s  %b%n",
                            cs.clzName, cs.csName, cs.hisName, cs.pkgName, cs.type, cs.isASCII);
     }