Skip to content

Commit

Permalink
Merge pull request adoptium#583 from judovana/allQuoted
Browse files Browse the repository at this point in the history
Now quoting all
  • Loading branch information
smlambert authored Sep 3, 2024
2 parents 24eb0d4 + 8fdc826 commit 751ecc8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions clean.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion compile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
Expand Down

0 comments on commit 751ecc8

Please sign in to comment.