make/gensrc/GensrcCLDR.gmk

rev 49533 : [mq]: 8189784

*** 1,7 ****
  #
! # Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 32,47 ****
  CLDR_BASEMETAINFO_FILE := $(GENSRC_BASEDIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java
  CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo.java
  
  CLDR_BASE_LOCALES := "en-US"
  
  $(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
      $(wildcard $(CLDRSRCDIR)/common/main/en*.xml) \
      $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
      $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(GENSRC_BASEDIR)
!         $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -baselocales $(CLDR_BASE_LOCALES) -basemodule -o $(GENSRC_BASEDIR)
  
  $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
      $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
      $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
      $(BUILD_TOOLS_JDK)
--- 32,51 ----
  CLDR_BASEMETAINFO_FILE := $(GENSRC_BASEDIR)/sun/util/cldr/CLDRBaseLocaleDataMetaInfo.java
  CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/resources/cldr/provider/CLDRLocaleDataMetaInfo.java
  
  CLDR_BASE_LOCALES := "en-US"
  
+ ZONENAME_TEMPLATE := $(TOPDIR)/src/java.base/share/classes/java/time/format/ZoneName.java.template
+ 
  $(CLDR_BASEMETAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
      $(wildcard $(CLDRSRCDIR)/common/main/en*.xml) \
      $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
+     $(ZONENAME_TEMPLATE) \
      $(BUILD_TOOLS_JDK)
          $(MKDIR) -p $(GENSRC_BASEDIR)
!         $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -baselocales $(CLDR_BASE_LOCALES) -basemodule -o $(GENSRC_BASEDIR) \
!         -zntempfile $(ZONENAME_TEMPLATE)
  
  $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
      $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
      $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) \
      $(BUILD_TOOLS_JDK)