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]>

Author: keithc-ca

closed/GensrcJ9JCL.gmk

@@ -0,0 +1,70 @@
+# ===========================================================================
+# (c) Copyright IBM Corp. 2020, 2020 All Rights Reserved
+# ===========================================================================
+# 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.
+#
+# IBM designates this particular file as subject to the "Classpath" exception
+# as provided by IBM in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+
+.PHONY : all
+
+all :
+
+include $(SPEC)
+include $(TOPDIR)/make/common/MakeBase.gmk
+
+J9JCL_SOURCES_DONEFILE := $(MAKESUPPORT_OUTPUTDIR)/j9jcl_sources.done
+
+J9TOOLS_DIR := $(SUPPORT_OUTPUTDIR)/j9tools
+
+RecursiveWildcard = $(foreach dir,$(wildcard $1/*),$(call RecursiveWildcard,$(dir),$2) $(filter $(subst *,%,$2),$(dir)))
+AllJclSource = $(call RecursiveWildcard,$(OPENJ9_TOPDIR)/jcl/src,*.java)
+
+JPP_DEST := $(SUPPORT_OUTPUTDIR)/j9jcl_sources
+JPP_JAR  := $(J9TOOLS_DIR)/jpp.jar
+JPP_TAGS := PLATFORM-$(OPENJ9_PLATFORM_CODE)
+
+ifeq (true,$(OPENJ9_ENABLE_INLINE_TYPES))
+  JPP_TAGS += INLINE-TYPES
+endif # OPENJ9_ENABLE_INLINE_TYPES
+
+ifeq (true,$(OPENJ9_ENABLE_OPENJDK_METHODHANDLES))
+  JPP_TAGS += OPENJDK_METHODHANDLES
+endif # OPENJ9_ENABLE_OPENJDK_METHODHANDLES
+
+$(J9JCL_SOURCES_DONEFILE) : $(AllJclSource)
+	@$(ECHO) Building OpenJ9 Java Preprocessor
+	@$(MKDIR) -p $(J9TOOLS_DIR)
+	$(MAKE) $(MAKE_ARGS) -C $(OPENJ9_TOPDIR)/sourcetools -f buildj9tools.mk \
+		BOOT_JDK=$(BOOT_JDK) \
+		DEST_DIR=$(call FixPath,$(J9TOOLS_DIR)) \
+		JAVA_HOME=$(BOOT_JDK) \
+		$(call FixPath,$(JPP_JAR))
+	@$(ECHO) Generating J9JCL sources
+	@$(BOOT_JDK)/bin/java \
+		-cp "$(call FixPath,$(JPP_JAR))" \
+		-Dfile.encoding=US-ASCII \
+		com.ibm.jpp.commandline.CommandlineBuilder \
+			-verdict \
+			-baseDir "$(call FixPath,$(OPENJ9_TOPDIR))/" \
+			-config JAVA$(VERSION_FEATURE) \
+			-srcRoot jcl/ \
+			-xml jpp_configuration.xml \
+			-dest "$(call FixPath,$(JPP_DEST))" \
+			-tag:define "$(subst $(SPACE),;,$(sort $(JPP_TAGS)))"
+	@$(MKDIR) -p $(@D)
+	@$(TOUCH) $@
+
+all : $(J9JCL_SOURCES_DONEFILE)

closed/OpenJ9.gmk

@@ -86,29 +86,22 @@ ifeq (false,$(WARNINGS_AS_ERRORS_OPENJ9))
 endif
 
 ifeq (windows,$(OPENJDK_TARGET_OS))
-  # convert unix path to windows path
-  FixPath = $(shell $(CYGPATH) -m $1)
   # convert windows path to unix path
   UnixPath = $(shell $(CYGPATH) -u $1)
   # set Visual Studio environment
   # wrap PATH in quotes as it contains spaces (unix path)
   # INCLUDE, LIB are already wrapped in quotes (windows paths)
   EXPORT_MSVS_ENV_VARS := PATH="$(PATH)" INCLUDE=$(INCLUDE) LIB=$(LIB)
-  # set the output directory for shared libraries
-  OPENJ9_BIN_OR_LIB_DIR := bin
 else
-  FixPath = $1
   UnixPath = $1
   EXPORT_MSVS_ENV_VARS :=
-  OPENJ9_BIN_OR_LIB_DIR := lib
 endif
 
 .PHONY : \
 	build-j9 \
 	clean-j9 \
 	clean-j9-dist \
 	clean-openj9-thirdparty-binaries \
-	generate-j9jcl-sources \
 	run-preprocessors-j9 \
 	stage-j9 \
 	#
@@ -331,7 +324,6 @@ $(OPENJ9_VM_BUILD_DIR)/omr/OMR_VERSION_STRING : $(call DependOnVariable, OPENJ9O
 	$(ECHO) '#define OMR_VERSION_STRING "$(OPENJ9OMR_SHA)"' > $@
 
 run-preprocessors-j9 : \
-	generate-j9jcl-sources \
 	$(OPENJ9_VM_BUILD_DIR)/omr/OMR_VERSION_STRING \
 	$(OPENJ9_VM_BUILD_DIR)/compiler/jit.version \
 	$(OPENJ9_VM_BUILD_DIR)/include/openj9_version_info.h
@@ -504,48 +496,6 @@ build-j9 : run-preprocessors-j9
 	@$(ECHO) OpenJ9 compile complete
 	+$(DDR_COMMAND)
 
-J9JCL_SOURCES_DONEFILE := $(MAKESUPPORT_OUTPUTDIR)/j9jcl_sources.done
-
-recur_wildcard = $(foreach dir,$(wildcard $1/*),$(call recur_wildcard,$(dir),$2) $(filter $(subst *,%,$2),$(dir)))
-AllJclSource   = $(call recur_wildcard,$(OPENJ9_TOPDIR)/jcl/src,*.java)
-
-JPP_DEST := $(SUPPORT_OUTPUTDIR)/j9jcl_sources
-JPP_JAR  := $(J9TOOLS_DIR)/jpp.jar
-JPP_TAGS := PLATFORM-$(OPENJ9_PLATFORM_CODE)
-
-ifeq (true,$(OPENJ9_ENABLE_INLINE_TYPES))
-  JPP_TAGS += INLINE-TYPES
-endif # OPENJ9_ENABLE_INLINE_TYPES
-
-ifeq (true,$(OPENJ9_ENABLE_OPENJDK_METHODHANDLES))
-  JPP_TAGS += OPENJDK_METHODHANDLES
-endif # OPENJ9_ENABLE_OPENJDK_METHODHANDLES
-
-$(J9JCL_SOURCES_DONEFILE) : $(AllJclSource)
-	@$(ECHO) Building OpenJ9 Java Preprocessor
-	@$(MKDIR) -p $(J9TOOLS_DIR)
-	$(MAKE) $(MAKE_ARGS) -C $(OPENJ9_TOPDIR)/sourcetools -f buildj9tools.mk \
-		BOOT_JDK=$(BOOT_JDK) \
-		DEST_DIR=$(call FixPath,$(J9TOOLS_DIR)) \
-		JAVA_HOME=$(BOOT_JDK) \
-		$(call FixPath,$(JPP_JAR))
-	@$(ECHO) Generating J9JCL sources
-	@$(BOOT_JDK)/bin/java \
-		-cp "$(call FixPath,$(JPP_JAR))" \
-		-Dfile.encoding=US-ASCII \
-		com.ibm.jpp.commandline.CommandlineBuilder \
-			-verdict \
-			-baseDir "$(call FixPath,$(OPENJ9_TOPDIR))/" \
-			-config JAVA$(VERSION_FEATURE) \
-			-srcRoot jcl/ \
-			-xml jpp_configuration.xml \
-			-dest "$(call FixPath,$(JPP_DEST))" \
-			-tag:define "$(subst $(SPACE),;,$(sort $(JPP_TAGS)))"
-	@$(MKDIR) -p $(@D)
-	@$(TOUCH) $@
-
-generate-j9jcl-sources : $(J9JCL_SOURCES_DONEFILE)
-
 clean-j9 : clean-openj9-thirdparty-binaries
 	+$(MAKE) $(MAKE_ARGS) -C $(OUTPUTDIR)/vm clean
 

closed/custom/Main.gmk

@@ -22,7 +22,6 @@ CLEAN_DIRS += vm
 
 .PHONY : \
 	debug-image \
-	generate-j9jcl-sources \
 	j9vm-build \
 	test-image-openj9 \
 	#
@@ -45,9 +44,6 @@ OPENJ9_MAKE := $(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/closed/OpenJ9.gmk
 
 create-main-targets-include java.base-gensrc : generate-j9jcl-sources
 
-generate-j9jcl-sources :
-	@+$(OPENJ9_MAKE) $@
-
 j9vm-build : buildtools-langtools
   ifeq ($(BUILD_OPENSSL),yes)
 	@+$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/closed/openssl.gmk

closed/custom/common/Modules.gmk

@@ -38,3 +38,18 @@ TOP_SRC_DIRS += \
     $(TOPDIR)/closed/src \
     $(SUPPORT_OUTPUTDIR)/j9jcl_sources \
     #
+
+.PHONY : generate-j9jcl-sources
+
+generate-j9jcl-sources :
+	@+$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/closed/GensrcJ9JCL.gmk
+
+# When building multiple configurations at once (e.g. 'make CONF= images')
+# the 'create-main-targets-include' target will only be considered for the
+# first configuration; J9JCL source generation will be delayed later for
+# other configurations. In order to produce a complete module-deps.gmk
+# we need to ensure that the J9JCL source has been generated.
+
+ifeq (,$(wildcard $(SUPPORT_OUTPUTDIR)/j9jcl_sources))
+  $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk : generate-j9jcl-sources
+endif