make/gensrc/GensrcCharacterData.gmk

rev 17483 : 8185104: Generate CharacterDataLatin1 lookup tables directly
Reviewed-by: alanb

*** 1,7 ****
  #
! # Copyright (c) 2011, 2014, 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) 2011, 2017, 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
*** 40,60 ****
          $(TOOL_GENERATECHARACTER) $2 \
              -template $(CHARACTERDATA)/$1.java.template \
              -spec $(UNICODEDATA)/UnicodeData.txt \
              -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
              -proplist $(UNICODEDATA)/PropList.txt \
!             -o $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java -string \
              -usecharforbyte $3
  
    GENSRC_CHARACTERDATA += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java
  endef
  
  $(eval $(call SetupCharacterData,CharacterDataLatin1, , -latin1 8))
! $(eval $(call SetupCharacterData,CharacterData00, -plane 0, 11 4 1))
! $(eval $(call SetupCharacterData,CharacterData01, -plane 1, 11 4 1))
! $(eval $(call SetupCharacterData,CharacterData02, -plane 2, 11 4 1))
! $(eval $(call SetupCharacterData,CharacterData0E, -plane 14, 11 4 1))
  
  # Copy two Java files that need no preprocessing.
  $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/%.java: $(CHARACTERDATA)/%.java.template
          $(call LogInfo, Generating $(@F))
          $(call install-file)
--- 40,60 ----
          $(TOOL_GENERATECHARACTER) $2 \
              -template $(CHARACTERDATA)/$1.java.template \
              -spec $(UNICODEDATA)/UnicodeData.txt \
              -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
              -proplist $(UNICODEDATA)/PropList.txt \
!             -o $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java \
              -usecharforbyte $3
  
    GENSRC_CHARACTERDATA += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java
  endef
  
  $(eval $(call SetupCharacterData,CharacterDataLatin1, , -latin1 8))
! $(eval $(call SetupCharacterData,CharacterData00, -string -plane 0, 11 4 1))
! $(eval $(call SetupCharacterData,CharacterData01, -string -plane 1, 11 4 1))
! $(eval $(call SetupCharacterData,CharacterData02, -string -plane 2, 11 4 1))
! $(eval $(call SetupCharacterData,CharacterData0E, -string -plane 14, 11 4 1))
  
  # Copy two Java files that need no preprocessing.
  $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/%.java: $(CHARACTERDATA)/%.java.template
          $(call LogInfo, Generating $(@F))
          $(call install-file)