make/gendata/Gendata-java.base.gmk

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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

@@ -38,10 +38,13 @@
 
 include GendataPublicSuffixList.gmk
 
 ################################################################################
 
+TOOL_CHARACTERNAME = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    org.openjdk.buildtools.generatecharacter.CharacterName
+
 GENDATA_UNINAME := $(JDK_OUTPUTDIR)/modules/java.base/java/lang/uniName.dat
 
 $(GENDATA_UNINAME): $(TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
         $(call MakeDir, $(@D))
         $(TOOL_CHARACTERNAME) $< $@

@@ -50,10 +53,13 @@
 
 ################################################################################
 
 GENDATA_CURDATA := $(JDK_OUTPUTDIR)/modules/java.base/java/util/currency.data
 
+TOOL_GENERATECURRENCYDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    org.openjdk.buildtools.generatecurrencydata.GenerateCurrencyData
+
 $(GENDATA_CURDATA): $(TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
         $(call MakeDir, $(@D))
         $(RM) $@
         $(TOOL_GENERATECURRENCYDATA) -o $@.tmp -i $<
         $(MV) $@.tmp $@

@@ -61,10 +67,13 @@
 
 TARGETS += $(GENDATA_CURDATA)
 
 ################################################################################
 
+TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    org.openjdk.buildtools.generatecacerts.GenerateCacerts
+
 GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
 GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts
 
 $(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)
         $(call LogInfo, Generating cacerts)

@@ -86,10 +95,13 @@
     CRYPTO.POLICY := limited
 endif
 
 # RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile
 
+TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    org.openjdk.buildtools.makejavasecurity.MakeJavaSecurity
+
 $(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS_JDK) $(GENDATA_JAVA_SECURITY_SRC) $(RESTRICTED_PKGS_SRC)
         $(call LogInfo, Generating java.security)
         $(call MakeTargetDir)
         $(TOOL_MAKEJAVASECURITY) $(GENDATA_JAVA_SECURITY_SRC) $@ $(OPENJDK_TARGET_OS) \
             $(OPENJDK_TARGET_CPU_ARCH) $(CRYPTO.POLICY) $(RESTRICTED_PKGS_SRC)