Skip to content

Commit 57297e6

Browse files
committed
8354278: Revert use of non-POSIX echo -n introduced in JDK-8301197
Reviewed-by: iris
1 parent 900b3ff commit 57297e6

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

make/Docs.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ define create_overview_file
262262
$$($1_OVERVIEW): $$($1_OVERVIEW_VARDEPS_FILE)
263263
$$(call LogInfo, Creating overview.html for $1)
264264
$$(call MakeDir, $$(@D))
265-
$$(ECHO) -n '$$($1_OVERVIEW_TEXT)' > $$@
265+
$$(PRINTF) "%s" '$$($1_OVERVIEW_TEXT)' > $$@
266266
endef
267267

268268
################################################################################

make/MainSupport.gmk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ define SetupTargetBody
5757
endef
5858

5959
define CleanDocs
60-
@$(ECHO) -n "Cleaning docs ..."
60+
@$(PRINTF) "Cleaning docs ..."
6161
@$(ECHO) "" $(LOG_DEBUG)
6262
$(RM) -r $(SUPPORT_OUTPUTDIR)/docs
6363
$(RM) -r $(SUPPORT_OUTPUTDIR)/javadoc
@@ -67,28 +67,28 @@ endef
6767

6868
# Cleans the dir given as $1
6969
define CleanDir
70-
@$(ECHO) -n "Cleaning $(strip $1) build artifacts ..."
70+
@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
7171
@$(ECHO) "" $(LOG_DEBUG)
7272
($(CD) $(OUTPUTDIR) && $(RM) -r $1)
7373
@$(ECHO) " done"
7474
endef
7575

7676
define CleanSupportDir
77-
@$(ECHO) -n "Cleaning$(strip $1) build artifacts ..."
77+
@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
7878
@$(ECHO) "" $(LOG_DEBUG)
7979
$(RM) -r $(SUPPORT_OUTPUTDIR)/$(strip $1)
8080
@$(ECHO) " done"
8181
endef
8282

8383
define CleanMakeSupportDir
84-
@$(ECHO) -n "Cleaning $(strip $1) make support artifacts ..."
84+
@$(PRINTF) "Cleaning %s make support artifacts ..." "$(strip $1)"
8585
@$(ECHO) "" $(LOG_DEBUG)
8686
$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/$(strip $1)
8787
@$(ECHO) " done"
8888
endef
8989

9090
define CleanTest
91-
@$(ECHO) -n "Cleaning test $(strip $1) ..."
91+
@$(PRINTF) "Cleaning test %s ..." "$(strip $1)"
9292
@$(ECHO) "" $(LOG_DEBUG)
9393
$(RM) -r $(SUPPORT_OUTPUTDIR)/test/$(strip $(subst -,/,$1))
9494
# Remove as much of the test directory structure as is empty
@@ -97,25 +97,25 @@ define CleanTest
9797
endef
9898

9999
define Clean-gensrc
100-
@$(ECHO) -n "Cleaning gensrc $(if $1,for $(strip $1) )..."
100+
@$(PRINTF) "Cleaning gensrc %s..." "$(if $1,for $(strip $1) )"
101101
@$(ECHO) "" $(LOG_DEBUG)
102102
$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)
103103
@$(ECHO) " done"
104104
endef
105105

106106
define Clean-java
107-
@$(ECHO) -n "Cleaning java $(if $1,for $(strip $1) )..."
107+
@$(PRINTF) "Cleaning java %s..." "$(if $1,for $(strip $1) )"
108108
@$(ECHO) "" $(LOG_DEBUG)
109109
$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
110110
$(RM) -r $(SUPPORT_OUTPUTDIR)/special_classes/$(strip $1)
111111
$(ECHO) " done"
112-
$(ECHO) -n "Cleaning headers $(if $1,for $(strip $1) )..."
112+
$(PRINTF) "Cleaning headers %s..." "$(if $1,for $(strip $1) )"
113113
$(RM) -r $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)
114114
@$(ECHO) " done"
115115
endef
116116

117117
define Clean-native
118-
@$(ECHO) -n "Cleaning native $(if $1,for $(strip $1) )..."
118+
@$(PRINTF) "Cleaning native %s..." "$(if $1,for $(strip $1) )"
119119
@$(ECHO) "" $(LOG_DEBUG)
120120
$(RM) -r $(SUPPORT_OUTPUTDIR)/native/$(strip $1)
121121
$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
@@ -124,7 +124,7 @@ define Clean-native
124124
endef
125125

126126
define Clean-include
127-
@$(ECHO) -n "Cleaning include $(if $1,for $(strip $1) )..."
127+
@$(PRINTF) "Cleaning include %s..." "$(if $1,for $(strip $1) )"
128128
@$(ECHO) "" $(LOG_DEBUG)
129129
$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_include/$(strip $1)
130130
@$(ECHO) " done"

make/autoconf/help.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,12 +292,12 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
292292
$ECHO "* Debug level: $DEBUG_LEVEL"
293293
$ECHO "* HS debug level: $HOTSPOT_DEBUG_LEVEL"
294294
$ECHO "* JVM variants: $JVM_VARIANTS"
295-
$ECHO -n "* JVM features: "
295+
$PRINTF "* JVM features: "
296296
297297
for variant in $JVM_VARIANTS; do
298298
features_var_name=JVM_FEATURES_$variant
299299
JVM_FEATURES_FOR_VARIANT=${!features_var_name}
300-
$ECHO -n "$variant: '$JVM_FEATURES_FOR_VARIANT' "
300+
$PRINTF "%s: \'%s\' " "$variant" "$JVM_FEATURES_FOR_VARIANT"
301301
done
302302
$ECHO ""
303303

make/common/FindTests.gmk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ ifeq ($(GENERATE_FIND_TESTS_FILE), true)
5959
$(call MakeTargetDir)
6060
( $(foreach root, $(JTREG_TESTROOTS), \
6161
$(ECHO) ""; \
62-
$(ECHO) -n "$(root)_JTREG_TEST_GROUPS := "; \
62+
$(PRINTF) "\n%s_JTREG_TEST_GROUPS := " "$(root)"; \
6363
$(SED) -n -e 's/^\#.*//g' -e 's/\([^ ]*\)\w*=.*/\1/gp' \
6464
$($(root)_JTREG_GROUP_FILES) \
6565
| $(SORT) -u | $(TR) '\n' ' ' ; \
6666
) \
6767
) > $@
6868
$(ECHO) "" >> $@
69-
$(ECHO) -n "MAKE_TEST_TARGETS := " >> $@
69+
$(PRINTF) "MAKE_TEST_TARGETS := " >> $@
7070
$(MAKE) -s --no-print-directory $(MAKE_ARGS) \
7171
SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
7272
TARGETS_FILE=$@

make/common/Modules.gmk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
180180
$(call MakeTargetDir)
181181
$(RM) $@
182182
$(foreach m, $(MODULE_INFOS), \
183-
( $(ECHO) -n "DEPS_$(call GetModuleNameFromModuleInfo, $m) := " && \
183+
( $(PRINTF) "DEPS_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
184184
$(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
185185
BEGIN { if (MODULE != "java.base") printf(" java.base"); } \
186186
/^ *requires/ { sub(/;/, ""); \
@@ -194,7 +194,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
194194
gsub(/\r/, ""); \
195195
printf(" %s", $$0) } \
196196
END { printf("\n") }' $m && \
197-
$(ECHO) -n "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) := " && \
197+
$(PRINTF) "TRANSITIVE_MODULES_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
198198
$(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
199199
BEGIN { if (MODULE != "java.base") printf(" java.base"); } \
200200
/^ *requires *transitive/ { \

0 commit comments

Comments
 (0)