From b03d63c684b62a90e45d75da22886aeea033b0b8 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Fri, 12 Jul 2024 14:36:24 +0200 Subject: [PATCH 1/3] Now quoting all --- compile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile.mk b/compile.mk index 7e4aeeeb..1a0c365d 100644 --- a/compile.mk +++ b/compile.mk @@ -38,7 +38,7 @@ TEST_FLAG_PARAM := -DTEST_FLAG=$(TEST_FLAG) else TEST_FLAG_PARAM := endif -COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) $(Q)-DJDK_VENDOR=$(JDK_VENDOR)$(Q) -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM} +COMPILE_CMD=ant -f scripts$(D)build_test.xml $(Q)-DTEST_ROOT=$(TEST_ROOT)$(Q) $(Q)-DBUILD_ROOT=$(BUILD_ROOT)$(Q) $(Q)-DJDK_VERSION=$(JDK_VERSION)$(Q) $(Q)-DJDK_IMPL=$(JDK_IMPL)$(Q) $(Q)-DJDK_VENDOR=$(JDK_VENDOR)$(Q) $(Q)-DJCL_VERSION=$(JCL_VERSION)$(Q) $(Q)-DBUILD_LIST=${COMPILE_BUILD_LIST}$(Q) $(Q)-DRESOURCES_DIR=${RESOURCES_DIR}$(Q) $(Q)-DSPEC=${SPEC}$(Q) $(Q)-DTEST_JDK_HOME=${TEST_JDK_HOME}$(Q) $(Q)-DJVM_VERSION=$(JVM_VERSION)$(Q) $(Q)-DLIB_DIR=$(LIB_DIR)$(Q) ${TEST_FLAG_PARAM} compile: From cd263a8d5c2e6441d7a819cb17031ec384a42bed Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Fri, 12 Jul 2024 15:08:15 +0200 Subject: [PATCH 2/3] Now quoting also in clean.mk --- clean.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clean.mk b/clean.mk index cebc05a6..9bf3775e 100644 --- a/clean.mk +++ b/clean.mk @@ -26,8 +26,8 @@ cleanBuild: $(RM) -r $(BUILD_ROOT) clean: cleanBuild - $(RM) -r $(TEST_ROOT)$(D)TKG$(D)output_* + $(RM) -r $(Q)$(TEST_ROOT)$(Q)$(D)TKG$(D)output_* $(RM) $(FAILEDTARGETS) - ant -f $(TEST_ROOT)$(D)TKG$(D)scripts/build_tools.xml clean + ant -f $(Q)$(TEST_ROOT)$(Q)$(D)TKG$(D)scripts/build_tools.xml clean .PHONY: cleanBuild clean From 8fdc826a691d77ef28b745b8f4f2c5550cb3aaca Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Fri, 12 Jul 2024 15:11:44 +0200 Subject: [PATCH 3/3] Now quoting also in main makefile --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 789f3107..882e3950 100644 --- a/makefile +++ b/makefile @@ -108,7 +108,7 @@ endif # compile tools ####################################### include moveDmp.mk -COMPILE_TOOLS_CMD=ant -f .$(D)scripts$(D)build_tools.xml -DTEST_JDK_HOME=$(TEST_JDK_HOME) -DTEST_ROOT=$(TEST_ROOT) -DLIB_DIR=$(LIB_DIR) +COMPILE_TOOLS_CMD=ant -f .$(D)scripts$(D)build_tools.xml $(Q)-DTEST_JDK_HOME=$(TEST_JDK_HOME)$(Q) $(Q)-DTEST_ROOT=$(TEST_ROOT)$(Q) $(Q)-DLIB_DIR=$(LIB_DIR)$(Q) compileTools: $(RM) -r $(COMPILATION_OUTPUT); \