archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-24 05:14:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8245287: Start using ModuleWrapper for gensrc as well

Browse source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2020-05-19 15:59:51 +02:00
parent 74f1e6da4e
commit 1cb7df63e7
34 changed files with 80 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make/modules/java.base/Gensrc.gmk
View file

@ -36,6 +36,10 @@ include gensrc/GensrcVarHandles.gmk
include gensrc/GensrcModuleLoaderMap.gmk
include gensrc/GensrcEmojiData.gmk
# GensrcLocaleData.gmk does not set TARGETS, so we must choose which targets
# to include.
TARGETS += $(GENSRC_BASELOCALEDATA)
################################################################################
CLDR_DATA_DIR := $(TOPDIR)/make/data/cldr/common
@ -61,7 +65,7 @@ $(CLDR_GEN_DONE): $(wildcard $(CLDR_DATA_DIR)/dtd/*.dtd) \
-tzdatadir $(TZ_DATA_DIR))
$(TOUCH) $@
GENSRC_JAVA_BASE += $(CLDR_GEN_DONE)
TARGETS += $(CLDR_GEN_DONE)
################################################################################
@ -77,7 +81,7 @@ $(eval $(call SetupCompileProperties, SUN_UTIL, \
CLASS := sun.util.resources.LocaleNamesBundle, \
))
GENSRC_JAVA_BASE += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL)
TARGETS += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL)
# Some resources bundles are already present as java files but still need to be
# copied to zh_HK locale.
@ -86,7 +90,7 @@ $(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
sun/security/util/AuthResources_zh_TW.java \
sun/security/util/Resources_zh_TW.java)))
GENSRC_JAVA_BASE += $(COPY_ZH_HK)
TARGETS += $(COPY_ZH_HK)
################################################################################
@ -96,7 +100,7 @@ $(GENSRC_LSREQUIVMAPS): $(TOPDIR)/make/data/lsrdata/language-subtag-registry.txt
$(call MakeDir, $(@D))
$(TOOL_GENERATELSREQUIVMAPS) $< $@
GENSRC_JAVA_BASE += $(GENSRC_LSREQUIVMAPS)
TARGETS += $(GENSRC_LSREQUIVMAPS)
################################################################################
@ -111,12 +115,4 @@ $(INTPOLY_GEN_DONE): $(INTPLOY_HEADER) $(BUILD_TOOLS_JDK)
$(GENSRC_DIR)) $(LOG_DEBUG)
$(TOUCH) $@
GENSRC_JAVA_BASE += $(INTPOLY_GEN_DONE)
################################################################################
java.base: $(GENSRC_JAVA_BASE)
all: java.base
.PHONY: all java.base
TARGETS += $(INTPOLY_GEN_DONE)

5
make/modules/java.base/gensrc/GensrcBuffer.gmk
View file

@ -1,5 +1,5 @@
#
# 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
@ -378,4 +378,5 @@ $(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF), type:=dou
###
$(GENSRC_BUFFER): $(BUILD_TOOLS_JDK)
GENSRC_JAVA_BASE += $(GENSRC_BUFFER)
TARGETS += $(GENSRC_BUFFER)

3
make/modules/java.base/gensrc/GensrcCharacterData.gmk
View file

@ -64,6 +64,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/%.java: $(CHARACTERDATA)/%.java.
GENSRC_CHARACTERDATA += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataUndefined.java \
$(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataPrivateUse.java
GENSRC_JAVA_BASE += $(GENSRC_CHARACTERDATA)
$(GENSRC_CHARACTERDATA): $(BUILD_TOOLS_JDK)
TARGETS += $(GENSRC_CHARACTERDATA)

5
make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
View file

@ -1,5 +1,5 @@
#
# 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
@ -100,8 +100,9 @@ $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
$(MV) $@.tmp $@
GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java
GENSRC_JAVA_BASE += $(GENSRC_CHARSETCODER)
################################################################################
$(GENSRC_CHARSETCODER): $(BUILD_TOOLS_JDK)
TARGETS += $(GENSRC_CHARSETCODER)

4
make/modules/java.base/gensrc/GensrcCharsetMapping.gmk
View file

@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2014, 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
@ -53,4 +53,4 @@ $(CHARSET_DONE_BASE)-stdcs: $(CHARSET_DATA_DIR)/charsets \
$(LOG_DEBUG)
$(TOUCH) '$@'
GENSRC_JAVA_BASE += $(CHARSET_DONE_BASE)-stdcs
TARGETS += $(CHARSET_DONE_BASE)-stdcs

3
make/modules/java.base/gensrc/GensrcEmojiData.gmk
View file

@ -40,5 +40,4 @@ $(GENSRC_EMOJIDATA): $(BUILD_TOOLS_JDK) $(EMOJIDATATEMP) $(UNICODEDATA)/emoji/em
$(UNICODEDATA) \
$(GENSRC_EMOJIDATA)
GENSRC_JAVA_BASE += $(GENSRC_EMOJIDATA)
TARGETS += $(GENSRC_EMOJIDATA)

5
make/modules/java.base/gensrc/GensrcExceptions.gmk
View file

@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2014, 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
@ -41,6 +41,7 @@ $(GENSRC_EXCEPTIONS_DST)/_the.%.marker: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
$(TOUCH) $@
GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D).marker)
GENSRC_JAVA_BASE += $(GENSRC_EXCEPTIONS)
$(GENSRC_EXCEPTIONS): $(BUILD_TOOLS_JDK)
TARGETS += $(GENSRC_EXCEPTIONS)

8
make/modules/java.base/gensrc/GensrcLocaleData.gmk
View file

@ -1,5 +1,5 @@
#
# 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
@ -147,7 +147,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLo
GENSRC_BASELOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java
GENSRC_LOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java
GENSRC_JAVA_BASE += $(GENSRC_BASELOCALEDATA)
GENSRC_JDK_LOCALEDATA += $(GENSRC_LOCALEDATA)
################################################################################
# This file is included twice, by java.base and jdk.localedata. The includer must
# add either GENSRC_BASELOCALEDATA or GENSRC_LOCALEDATA to TARGETS.

12
make/modules/java.base/gensrc/GensrcMisc.gmk
View file

@ -1,5 +1,5 @@
#
# 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
@ -50,7 +50,7 @@ $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
@@VENDOR_URL_VM_BUG@@ => $(VENDOR_URL_VM_BUG), \
))
GENSRC_JAVA_BASE += $(BUILD_VERSION_JAVA)
TARGETS += $(BUILD_VERSION_JAVA)
################################################################################
@ -88,7 +88,7 @@ $(GENSRC_SOR_FILE): \
$(TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
$(generate-preproc-src)
GENSRC_JAVA_BASE += $(GENSRC_SOR_FILE)
TARGETS += $(GENSRC_SOR_FILE)
################################################################################
@ -100,7 +100,7 @@ ifeq ($(call isTargetOs, windows), false)
$(TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
$(generate-preproc-src)
GENSRC_JAVA_BASE += $(GENSRC_UC_FILE)
TARGETS += $(GENSRC_UC_FILE)
endif
@ -114,7 +114,7 @@ ifeq ($(call isTargetOs, solaris), true)
$(TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
$(generate-preproc-src)
GENSRC_JAVA_BASE += $(GENSRC_SC_FILE)
TARGETS += $(GENSRC_SC_FILE)
endif
@ -135,5 +135,5 @@ ifneq ($(wildcard $(TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity
@@JCE_DEFAULT_POLICY@@ => $(JCE_DEFAULT_POLICY), \
))
GENSRC_JAVA_BASE += $(BUILD_JCESECURITY_JAVA)
TARGETS += $(BUILD_JCESECURITY_JAVA)
endif

4
make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
View file

@ -1,5 +1,5 @@
#
# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2015, 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
@ -52,6 +52,6 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java:
-platform $(PLATFORM_MODULES_LIST) -o $@.tmp $<
$(MV) $@.tmp $@
GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java
TARGETS += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java
################################################################################

2
make/modules/java.base/gensrc/GensrcVarHandles.gmk
View file

@ -276,4 +276,4 @@ VARHANDLES_MEMORY_ADDRESS_TYPES := Byte Short Char Int Long Float Double
$(foreach t, $(VARHANDLES_MEMORY_ADDRESS_TYPES), \
$(eval $(call GenerateVarHandleMemoryAddress,VAR_HANDLE_MEMORY_ADDRESS_$t,$t)))
GENSRC_JAVA_BASE += $(GENSRC_VARHANDLES)
TARGETS += $(GENSRC_VARHANDLES)