make/gensrc/Gensrc-jdk.charsets.gmk

*** 28,54 ****
  ################################################################################
  #
  # Generate files using the charsetmapping tool
  #
  CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping
  CHARSET_GENSRC_JAVA_DIR_CS := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.charsets/sun/nio/cs/ext
  CHARSET_DONE_CS := $(CHARSET_GENSRC_JAVA_DIR_CS)/_the.charsetmapping
  CHARSET_COPYRIGHT_HEADER := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping
  CHARSET_TEMPLATES := \
      $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
      $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
  
! $(CHARSET_DONE_CS)-extsbcs: $(CHARSET_DATA_DIR)/extsbcs  \
!     $(CHARSET_TEMPLATES) $(BUILD_TOOLS_JDK)
!         $(MKDIR) -p $(@D)
!         $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) extsbcs
!         $(TOUCH) '$@'
! 
! $(CHARSET_DONE_CS)-dbcs: $(CHARSET_DATA_DIR)/dbcs \
!     $(CHARSET_TEMPLATES) $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)
!         $(TOOL_CHARSETMAPPING) $(CHARSET_DATA_DIR) $(CHARSET_GENSRC_JAVA_DIR_CS) dbcs
          $(TOUCH) '$@'
  
  $(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER)/HKSCS.java \
      $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)
--- 28,57 ----
  ################################################################################
  #
  # Generate files using the charsetmapping tool
  #
  CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping
+ 
  CHARSET_GENSRC_JAVA_DIR_CS := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.charsets/sun/nio/cs/ext
  CHARSET_DONE_CS := $(CHARSET_GENSRC_JAVA_DIR_CS)/_the.charsetmapping
  CHARSET_COPYRIGHT_HEADER := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping
  CHARSET_TEMPLATES := \
      $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
      $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
+ 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)
          $(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)
          $(TOUCH) '$@'
  
  $(CHARSET_DONE_CS)-hkscs: $(CHARSET_COPYRIGHT_HEADER)/HKSCS.java \
      $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)
*** 65,76 ****
      $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)
          $(TOOL_CHARSETMAPPING) '$<' '$@' sjis0213
  
  GENSRC_JDK_CHARSETS += \
!     $(CHARSET_DONE_CS)-extsbcs \
!     $(CHARSET_DONE_CS)-dbcs \
      $(CHARSET_DONE_CS)-hkscs \
      $(CHARSET_DONE_CS)-euctw \
      $(CHARSET_GENSRC_JAVA_DIR_CS)/sjis0213.dat \
      #
  
--- 68,78 ----
      $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(@D)
          $(TOOL_CHARSETMAPPING) '$<' '$@' sjis0213
  
  GENSRC_JDK_CHARSETS += \
!     $(CHARSET_DONE_CS)-extcs \
      $(CHARSET_DONE_CS)-hkscs \
      $(CHARSET_DONE_CS)-euctw \
      $(CHARSET_GENSRC_JAVA_DIR_CS)/sjis0213.dat \
      #