Skip to content

Commit 990969b

Browse files
keithc-cakeithc-ca
committed
Improve support for builds with multiple configurations
* move j9jcl preprocessing to a separate makefile * remove redundant definition of FixPath * remove unused macro OPENJ9_BIN_OR_LIB_DIR Signed-off-by: Keith W. Campbell <[email protected]>
1 parent 6513c6a commit 990969b

File tree

4 files changed

+81
-50
lines changed

4 files changed

+81
-50
lines changed

‎closed/GensrcJ9JCL.gmk

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# ===========================================================================
2+
# (c) Copyright IBM Corp. 2020, 2020 All Rights Reserved
3+
# ===========================================================================
4+
# This code is free software; you can redistribute it and/or modify it
5+
# under the terms of the GNU General Public License version 2 only, as
6+
# published by the Free Software Foundation.
7+
#
8+
# IBM designates this particular file as subject to the "Classpath" exception
9+
# as provided by IBM in the LICENSE file that accompanied this code.
10+
#
11+
# This code is distributed in the hope that it will be useful, but WITHOUT
12+
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13+
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14+
# version 2 for more details (a copy is included in the LICENSE file that
15+
# accompanied this code).
16+
#
17+
# You should have received a copy of the GNU General Public License version
18+
# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
19+
# ===========================================================================
20+
21+
.PHONY : all
22+
23+
all :
24+
25+
include $(SPEC)
26+
include $(TOPDIR)/make/common/MakeBase.gmk
27+
28+
J9JCL_SOURCES_DONEFILE := $(MAKESUPPORT_OUTPUTDIR)/j9jcl_sources.done
29+
30+
J9TOOLS_DIR := $(SUPPORT_OUTPUTDIR)/j9tools
31+
32+
RecursiveWildcard = $(foreach dir,$(wildcard $1/*),$(call RecursiveWildcard,$(dir),$2) $(filter $(subst *,%,$2),$(dir)))
33+
AllJclSource = $(call RecursiveWildcard,$(OPENJ9_TOPDIR)/jcl/src,*.java)
34+
35+
JPP_DEST := $(SUPPORT_OUTPUTDIR)/j9jcl_sources
36+
JPP_JAR := $(J9TOOLS_DIR)/jpp.jar
37+
JPP_TAGS := PLATFORM-$(OPENJ9_PLATFORM_CODE)
38+
39+
ifeq (true,$(OPENJ9_ENABLE_OPENJDK_METHODHANDLES))
40+
JPP_TAGS += OPENJDK_METHODHANDLES
41+
endif # OPENJ9_ENABLE_OPENJDK_METHODHANDLES
42+
43+
$(J9JCL_SOURCES_DONEFILE) : $(AllJclSource)
44+
@$(ECHO) Building OpenJ9 Java Preprocessor
45+
@$(MKDIR) -p $(J9TOOLS_DIR)
46+
$(MAKE) $(MAKE_ARGS) -C $(OPENJ9_TOPDIR)/sourcetools -f buildj9tools.mk \
47+
BOOT_JDK=$(BOOT_JDK) \
48+
DEST_DIR=$(call FixPath,$(J9TOOLS_DIR)) \
49+
JAVA_HOME=$(BOOT_JDK) \
50+
$(call FixPath,$(JPP_JAR))
51+
@$(ECHO) Generating J9JCL sources
52+
@$(BOOT_JDK)/bin/java \
53+
-cp "$(call FixPath,$(JPP_JAR))" \
54+
-Dfile.encoding=US-ASCII \
55+
com.ibm.jpp.commandline.CommandlineBuilder \
56+
-verdict \
57+
-baseDir "$(call FixPath,$(OPENJ9_TOPDIR))/" \
58+
-config JAVA$(VERSION_FEATURE) \
59+
-srcRoot jcl/ \
60+
-xml jpp_configuration.xml \
61+
-dest "$(call FixPath,$(JPP_DEST))" \
62+
-tag:define "$(subst $(SPACE),;,$(sort $(JPP_TAGS)))"
63+
@$(MKDIR) -p $(@D)
64+
@$(TOUCH) $@
65+
66+
all : $(J9JCL_SOURCES_DONEFILE)

‎closed/OpenJ9.gmk

-46
Original file line numberDiff line numberDiff line change
@@ -86,29 +86,22 @@ ifeq (false,$(WARNINGS_AS_ERRORS_OPENJ9))
8686
endif
8787

8888
ifeq (windows,$(OPENJDK_TARGET_OS))
89-
# convert unix path to windows path
90-
FixPath = $(shell $(CYGPATH) -m $1)
9189
# convert windows path to unix path
9290
UnixPath = $(shell $(CYGPATH) -u $1)
9391
# set Visual Studio environment
9492
# wrap PATH in quotes as it contains spaces (unix path)
9593
# INCLUDE, LIB are already wrapped in quotes (windows paths)
9694
EXPORT_MSVS_ENV_VARS := PATH="$(PATH)" INCLUDE=$(INCLUDE) LIB=$(LIB)
97-
# set the output directory for shared libraries
98-
OPENJ9_BIN_OR_LIB_DIR := bin
9995
else
100-
FixPath = $1
10196
UnixPath = $1
10297
EXPORT_MSVS_ENV_VARS :=
103-
OPENJ9_BIN_OR_LIB_DIR := lib
10498
endif
10599

106100
.PHONY : \
107101
build-j9 \
108102
clean-j9 \
109103
clean-j9-dist \
110104
clean-openj9-thirdparty-binaries \
111-
generate-j9jcl-sources \
112105
run-preprocessors-j9 \
113106
stage-j9 \
114107
#
@@ -324,7 +317,6 @@ $(OPENJ9_VM_BUILD_DIR)/omr/OMR_VERSION_STRING : $(call DependOnVariable, OPENJ9O
324317
$(ECHO) '#define OMR_VERSION_STRING "$(OPENJ9OMR_SHA)"' > $@
325318

326319
run-preprocessors-j9 : \
327-
generate-j9jcl-sources \
328320
$(OPENJ9_VM_BUILD_DIR)/omr/OMR_VERSION_STRING \
329321
$(OPENJ9_VM_BUILD_DIR)/compiler/jit.version \
330322
$(OPENJ9_VM_BUILD_DIR)/include/openj9_version_info.h
@@ -491,44 +483,6 @@ build-j9 : run-preprocessors-j9
491483
@$(ECHO) OpenJ9 compile complete
492484
+$(DDR_COMMAND)
493485

494-
J9JCL_SOURCES_DONEFILE := $(MAKESUPPORT_OUTPUTDIR)/j9jcl_sources.done
495-
496-
recur_wildcard = $(foreach dir,$(wildcard $1/*),$(call recur_wildcard,$(dir),$2) $(filter $(subst *,%,$2),$(dir)))
497-
AllJclSource = $(call recur_wildcard,$(OPENJ9_TOPDIR)/jcl/src,*.java)
498-
499-
JPP_DEST := $(SUPPORT_OUTPUTDIR)/j9jcl_sources
500-
JPP_JAR := $(J9TOOLS_DIR)/jpp.jar
501-
JPP_TAGS := PLATFORM-$(OPENJ9_PLATFORM_CODE)
502-
503-
ifeq (true,$(OPENJ9_ENABLE_OPENJDK_METHODHANDLES))
504-
JPP_TAGS += OPENJDK_METHODHANDLES
505-
endif # OPENJ9_ENABLE_OPENJDK_METHODHANDLES
506-
507-
$(J9JCL_SOURCES_DONEFILE) : $(AllJclSource)
508-
@$(ECHO) Building OpenJ9 Java Preprocessor
509-
@$(MKDIR) -p $(J9TOOLS_DIR)
510-
$(MAKE) $(MAKE_ARGS) -C $(OPENJ9_TOPDIR)/sourcetools -f buildj9tools.mk \
511-
BOOT_JDK=$(BOOT_JDK) \
512-
DEST_DIR=$(call FixPath,$(J9TOOLS_DIR)) \
513-
JAVA_HOME=$(BOOT_JDK) \
514-
$(call FixPath,$(JPP_JAR))
515-
@$(ECHO) Generating J9JCL sources
516-
@$(BOOT_JDK)/bin/java \
517-
-cp "$(call FixPath,$(JPP_JAR))" \
518-
-Dfile.encoding=US-ASCII \
519-
com.ibm.jpp.commandline.CommandlineBuilder \
520-
-verdict \
521-
-baseDir "$(call FixPath,$(OPENJ9_TOPDIR))/" \
522-
-config JAVA11 \
523-
-srcRoot jcl/ \
524-
-xml jpp_configuration.xml \
525-
-dest "$(call FixPath,$(JPP_DEST))" \
526-
-tag:define "$(subst $(SPACE),;,$(sort $(JPP_TAGS)))"
527-
@$(MKDIR) -p $(@D)
528-
@$(TOUCH) $@
529-
530-
generate-j9jcl-sources : $(J9JCL_SOURCES_DONEFILE)
531-
532486
clean-j9 : clean-openj9-thirdparty-binaries
533487
+$(MAKE) $(MAKE_ARGS) -C $(OUTPUTDIR)/vm clean
534488

‎closed/custom/Main.gmk

-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ CLEAN_DIRS += vm
2222

2323
.PHONY : \
2424
debug-image \
25-
generate-j9jcl-sources \
2625
j9vm-build \
2726
test-image-openj9 \
2827
#
@@ -45,9 +44,6 @@ OPENJ9_MAKE := $(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/closed/OpenJ9.gmk
4544

4645
create-main-targets-include java.base-gensrc : generate-j9jcl-sources
4746

48-
generate-j9jcl-sources :
49-
@+$(OPENJ9_MAKE) $@
50-
5147
j9vm-build : buildtools-langtools
5248
ifeq ($(BUILD_OPENSSL),yes)
5349
@+$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/closed/openssl.gmk

‎closed/custom/common/Modules.gmk

+15
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,18 @@ TOP_SRC_DIRS += \
3838
$(TOPDIR)/closed/src \
3939
$(SUPPORT_OUTPUTDIR)/j9jcl_sources \
4040
#
41+
42+
.PHONY : generate-j9jcl-sources
43+
44+
generate-j9jcl-sources :
45+
@+$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/closed/GensrcJ9JCL.gmk
46+
47+
# When building multiple configurations at once (e.g. 'make CONF= images')
48+
# the 'create-main-targets-include' target will only be considered for the
49+
# first configuration; J9JCL source generation will be delayed later for
50+
# other configurations. In order to produce a complete module-deps.gmk
51+
# we need to ensure that the J9JCL source has been generated.
52+
53+
ifeq (,$(wildcard $(SUPPORT_OUTPUTDIR)/j9jcl_sources))
54+
$(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk : generate-j9jcl-sources
55+
endif

0 commit comments

Comments
 (0)