Skip to content

Hacking about... #2164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
david-beaumont wants to merge 6 commits into
base: lworld
Choose a base branch
from
Draft

Hacking about... #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f808a80
Hacking about...
david-beaumont Feb 25, 2026
d1d9715
working but very hacked
david-beaumont Feb 25, 2026
49d3774
paths correctly found
david-beaumont Feb 25, 2026
9bfabad
outputs sensible file in correct place
david-beaumont Feb 25, 2026
a878b0b
seems to be working
david-beaumont Feb 26, 2026
e86754d
tidied and ready for splitting
david-beaumont Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 38 additions & 20 deletions make/CompileJavaModules.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,20 @@ MODULESOURCEPATH := $(call GetModuleSrcPath)
# Add imported modules to the modulepath
MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))

################################################################################
# Setup preprocessor flags
# The output directory must be present in GENERATED_PREVIEW_SUBDIRS in Modules.gmk.
# Temporarily restrict this to java.base, but it can be expanded later.

ifeq ($(MODULE), java.base)
PREPROCESSOR_FLAGS := \
-Xlint:-removal -Xlint:-processing \
-Avalueclasses.outdir=$(SUPPORT_OUTPUTDIR)/gensrc-valueclasses \
-processor build.tools.valueclasses.GenValueClasses

PROCESSOR_PATH += $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes
endif

################################################################################
# Copy zh_HK properties files from zh_TW (needed by some modules)

Expand Down Expand Up @@ -120,9 +134,11 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
EXCLUDE_PATTERNS := -files, \
KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
TARGET_RELEASE := $(TARGET_RELEASE), \
PROCESSOR_PATH := $(PROCESSOR_PATH), \
JAVAC_FLAGS := \
$(DOCLINT) \
$(JAVAC_FLAGS) \
$(PREPROCESSOR_FLAGS) \
--module-source-path $(MODULESOURCEPATH) \
--module-path $(MODULEPATH) \
--system none, \
Expand All @@ -131,26 +147,28 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
TARGETS += $($(MODULE))

################################################################################
# Setup compilation for value classes in the module
# Setup compilation for preview classes in the module
# TBD: When $(DOCLINT) was included there was an NPE in JavacTypes.getOverriddenMethods

# Directory and file name suffix for jar file containing value classes
VALUECLASSES_STR := valueclasses
# Directory and file name suffix for jar file containing preview classes/resources.
PREVIEW_CLASSES_LABEL := preview
# Module relative path in which preview classes/resources are placed.
PREVIEW_PATH := META-INF/preview

ifneq ($(COMPILER), bootjdk)
MODULE_VALUECLASS_SRC_DIRS := $(call FindModuleValueClassSrcDirs, $(MODULE))
Copy link
Copy Markdown
Contributor Author

@david-beaumont david-beaumont Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lots of this is unrelated to annotation processing per se, just renaming "value class" stuff when it's really just "preview" stuff more generally.

MODULE_VALUECLASS_SOURCEPATH := $(call GetModuleValueClassSrcPath)
ifneq ($(MODULE_VALUECLASS_SRC_DIRS),)
# Temporarily compile valueclasses into a separate directory, and then copy
# into the correct "META-INF/preview" path location.
MODULE_PREVIEW_SRC_DIRS := $(call FindModulePreviewSrcDirs, $(MODULE))
MODULE_PREVIEW_SOURCEPATH := $(call GetModulePreviewSrcPath)
ifneq ($(MODULE_PREVIEW_SRC_DIRS),)
# Temporarily compile preview classes into a separate directory, and then
# copy into the correct output path location.
# We cannot compile directly into the desired directory because it's the
# compiler which creates the original '<module>/<classpath>/...' hierarchy.
TEMP_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/$(VALUECLASSES_STR)
TEMP_OUTPUTDIR := $(SUPPORT_OUTPUTDIR)/$(PREVIEW_CLASSES_LABEL)

$(eval $(call SetupJavaCompilation, $(MODULE)-$(VALUECLASSES_STR), \
$(eval $(call SetupJavaCompilation, $(MODULE)-$(PREVIEW_CLASSES_LABEL), \
SMALL_JAVA := false, \
MODULE := $(MODULE), \
SRC := $(wildcard $(MODULE_VALUECLASS_SRC_DIRS)), \
SRC := $(wildcard $(MODULE_PREVIEW_SRC_DIRS)), \
INCLUDES := $(JDK_USER_DEFINED_FILTER), \
FAIL_NO_SRC := $(FAIL_NO_SRC), \
BIN := $(TEMP_OUTPUTDIR)/, \
Expand All @@ -162,30 +180,30 @@ ifneq ($(COMPILER), bootjdk)
DEPENDS := $($(MODULE)), \
JAVAC_FLAGS := \
$(JAVAC_FLAGS) \
--module-source-path $(MODULE_VALUECLASS_SOURCEPATH) \
--module-source-path $(MODULE_PREVIEW_SOURCEPATH) \
--module-path $(JDK_OUTPUTDIR)/modules \
--system none \
--enable-preview -source $(JDK_SOURCE_TARGET_VERSION), \
))

# Don't add '$($(MODULE)-$(VALUECLASSES_STR))' to TARGETS (it's transient).
# The 'valueclasses' target below depends on it, and that's the non-transient
# Don't add '$($(MODULE)-$(PREVIEW_CLASSES_LABEL))' to TARGETS (it's transient).
# The 'preview' target below depends on it, and that's the non-transient
# result we care about.

# Copy compiled output from "$TEMP_OUTPUTDIR/$MODULE/<classpath>/..."
# to "$COMPILATION_OUTPUTDIR/$MODULE/META-INF/preview/<classpath>/...".
# to "$COMPILATION_OUTPUTDIR/$MODULE/$PREVIEW_PATH/<classpath>/...".
MOD_SRC := $(TEMP_OUTPUTDIR)/$(MODULE)
MOD_DST := $(COMPILATION_OUTPUTDIR)/$(MODULE)

# NOTE: We cannot use '$(CP) -R $(MOD_SRC)/*/ ...' to select sub-directories (it
# does not work on MacOS/BSD). Use 'filter-out' to explicitly exclude marker files.
$(MOD_DST)/_the.$(MODULE).valueclasses: $($(MODULE)-$(VALUECLASSES_STR))
$(RM) -r $(@D)/META-INF/preview
$(MKDIR) -p $(@D)/META-INF/preview
$(CP) -R $(filter-out $(MOD_SRC)/_%, $(wildcard $(MOD_SRC)/*)) $(@D)/META-INF/preview
$(MOD_DST)/_the.$(MODULE).preview: $($(MODULE)-$(PREVIEW_CLASSES_LABEL))
$(RM) -r $(@D)/$(PREVIEW_PATH)
$(MKDIR) -p $(@D)/$(PREVIEW_PATH)
$(CP) -R $(filter-out $(MOD_SRC)/_%, $(wildcard $(MOD_SRC)/*)) $(@D)/$(PREVIEW_PATH)
$(TOUCH) $@

TARGETS += $(MOD_DST)/_the.$(MODULE).valueclasses
TARGETS += $(MOD_DST)/_the.$(MODULE).preview
endif
endif

Expand Down
7 changes: 6 additions & 1 deletion make/common/JavaCompilation.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,18 @@ define SetupJavaCompilationBody
# including the compilation output on the classpath, so that incremental
# compilations in unnamed module can refer to other classes from the same
# source root, which are not being recompiled in this compilation:
$1_AUGMENTED_CLASSPATH += $$(BUILDTOOLS_OUTPUTDIR)/depend $$($1_BIN)
$1_AUGMENTED_CLASSPATH += $$($1_BIN)
$1_PROCESSOR_PATH += $$(BUILDTOOLS_OUTPUTDIR)/depend
Copy link
Copy Markdown
Contributor Author

@david-beaumont david-beaumont Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work if the /depend dir is no longer also in the augmented classpath.
I don't think order matters here (the user path is first).

endif

ifneq ($$($1_AUGMENTED_CLASSPATH), )
$1_FLAGS += -cp $$(call PathList, $$($1_AUGMENTED_CLASSPATH))
endif

ifneq ($$($1_PROCESSOR_PATH), )
$1_FLAGS += --processor-path $$(call PathList, $$($1_PROCESSOR_PATH))
endif

# Make sure the dirs exist, or that one of the EXTRA_FILES, that may not
# exist yet, is in it.
$$(foreach d, $$($1_SRC), \
Expand Down
2 changes: 1 addition & 1 deletion make/common/MakeBase.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ endef
# and outputs the 'fixed' paths into the file in $2. If the file in $2 already exists
# it is overwritten.
# On non-Windows platforms this instead does a copy, so that $2 can still be used
# as a depenendency of a make rule, instead of having to conditionally depend on
# as a dependency of a make rule, instead of having to conditionally depend on
# $1 instead, based on the target platform.
ifeq ($(call isTargetOs, windows), true)
FixPath = \
Expand Down
17 changes: 10 additions & 7 deletions make/common/Modules.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ GENERATED_SRC_DIRS += \
$(SUPPORT_OUTPUTDIR)/gensrc \
#

GENERATED_VALUE_CLASS_SUBDIRS += \
# Directories in which generated preview classes may exists.
GENERATED_PREVIEW_SUBDIRS += \
$(SUPPORT_OUTPUTDIR)/gensrc-valueclasses \
#

Expand Down Expand Up @@ -148,11 +149,12 @@ FindModuleSrcDirs = \
$(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
$(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))

# Find value class source dirs for a particular module (only generated)
# Find preview class source dirs for a particular module.
# Currently this is restricted to generated value classes, but can be extended.
# $1 - Module to find source dirs for
FindModuleValueClassSrcDirs = \
FindModulePreviewSrcDirs = \
$(strip $(wildcard \
$(addsuffix /$(strip $1), $(GENERATED_VALUE_CLASS_SUBDIRS))))
$(addsuffix /$(strip $1), $(GENERATED_PREVIEW_SUBDIRS))))

# Find all specs dirs for a particular module
# $1 - Module to find specs dirs for
Expand All @@ -176,10 +178,11 @@ GetModuleSrcPath = \
$(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
$(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))

# Construct the complete module source path for value classes
GetModuleValueClassSrcPath = \
# Construct the complete module source path for preview classes.
# Currently this is restricted to generated value classes, but can be extended.
GetModulePreviewSrcPath = \
$(call PathList, \
$(addsuffix /*, $(GENERATED_VALUE_CLASS_SUBDIRS) $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
$(addsuffix /*, $(GENERATED_PREVIEW_SUBDIRS) $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
$(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))

################################################################################
Expand Down
Loading