Skip to content

Commit ea8d390

Browse files
committed
Fix incremental DDR builds
ClassGenerator reads CompatibilityConstants29.dat and so must be executed if that file changes. Signed-off-by: Keith W. Campbell <[email protected]>
1 parent 3c6b8bf commit ea8d390

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

closed/DDR.gmk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ===========================================================================
2-
# (c) Copyright IBM Corp. 2018, 2021 All Rights Reserved
2+
# (c) Copyright IBM Corp. 2018, 2022 All Rights Reserved
33
# ===========================================================================
44
# This code is free software; you can redistribute it and/or modify it
55
# under the terms of the GNU General Public License version 2 only, as
@@ -89,6 +89,10 @@ $(eval $(call SetupJavaCompilation,BUILD_DDR_TOOLS, \
8989
com/ibm/j9ddr/tools/store/StructureMismatchError.java \
9090
))
9191

92+
# Any new references to constants must be paired with additions to the compatibility
93+
# list unless those constants were defined long ago.
94+
DDR_COMPATIBILITY_FILE := $(DDR_VM_SRC_ROOT)/com/ibm/j9ddr/CompatibilityConstants29.dat
95+
9296
#############################################################################
9397

9498
# When StructureReader opens the blob, it must be able to find AuxFieldInfo29.dat
@@ -106,7 +110,7 @@ DDR_TOOLS_OPTIONS := \
106110
# its contents influence the generated class files.
107111
DDR_FIELDS_FILE := $(DDR_VM_SRC_ROOT)/com/ibm/j9ddr/AuxFieldInfo29.dat
108112

109-
$(DDR_CLASSES_MARKER) : $(DDR_BLOB_FILE) $(DDR_FIELDS_FILE) $(BUILD_DDR_TOOLS)
113+
$(DDR_CLASSES_MARKER) : $(DDR_BLOB_FILE) $(DDR_COMPATIBILITY_FILE) $(DDR_FIELDS_FILE) $(BUILD_DDR_TOOLS)
110114
@$(ECHO) Generating DDR pointer and structure class files
111115
@$(RM) -rf $(DDR_CLASSES_BIN)
112116
@$(JAVA) $(DDR_TOOLS_OPTIONS) \
@@ -127,9 +131,6 @@ $(DDR_POINTERS_MARKER) : $(DDR_SUPERSET_FILE) $(DDR_FIELDS_FILE) $(BUILD_DDR_TOO
127131
-o $(DDR_GENSRC_DIR)
128132
@$(TOUCH) $@
129133

130-
# Any new references to constants must be paired with additions to the compatibility
131-
# list unless those constants were defined long ago.
132-
DDR_COMPATIBILITY_FILE := $(DDR_VM_SRC_ROOT)/com/ibm/j9ddr/CompatibilityConstants29.dat
133134
DDR_RESTRICT_FILE := $(OPENJ9_TOPDIR)/debugtools/DDR_VM/data/superset-constants.dat
134135

135136
$(DDR_STRUCTURES_MARKER) : $(DDR_SUPERSET_FILE) $(DDR_RESTRICT_FILE) $(DDR_COMPATIBILITY_FILE) $(DDR_FIELDS_FILE) $(BUILD_DDR_TOOLS)

0 commit comments

Comments
 (0)