26 lines
1.4 KiB
Diff
26 lines
1.4 KiB
Diff
# HG changeset patch
|
|
# User sgehwolf
|
|
# Date 1592560575 -7200
|
|
# Fri Jun 19 11:56:15 2020 +0200
|
|
# Node ID c523ff594ec50a45cb157cffc93c17e0414c066a
|
|
# Parent c17f1a4da248acfe3c1285fe332aea245eb84bb4
|
|
8247874: Replacement in VersionProps.java.template not working when --with-vendor-bug-url contains '&'
|
|
Summary: Backports parts of 8223319: Add copyright footer to specs and man pages
|
|
Reviewed-by: andrew, phh
|
|
|
|
diff --git openjdk.orig/make/common/TextFileProcessing.gmk openjdk/make/common/TextFileProcessing.gmk
|
|
--- openjdk.orig/make/common/TextFileProcessing.gmk
|
|
+++ openjdk/make/common/TextFileProcessing.gmk
|
|
@@ -155,9 +155,10 @@
|
|
# Convert the REPLACEMENTS syntax ( A => B ; C => D ; ...) to a sed command
|
|
# line (-e "s/A/B/g" -e "s/C/D/g" ...), basically by replacing '=>' with '/'
|
|
# and ';' with '/g" -e "s/', and adjusting for edge cases.
|
|
+ # '&' has special meaning in sed so needs to be escaped.
|
|
$1_REPLACEMENTS_COMMAND_LINE := $(SED) -e 's$$($1_SEP)$$(subst $$(SPACE);$$(SPACE),$$($1_SEP)g' \
|
|
-e 's$$($1_SEP),$$(subst $$(SPACE)=>$$(SPACE),$$($1_SEP),$$(subst $$(SPACE)=>$$(SPACE);$$(SPACE),$$($1_SEP)$$($1_SEP)g' \
|
|
- -e 's$$($1_SEP),$$(strip $$($1_REPLACEMENTS)))))$$($1_SEP)g'
|
|
+ -e 's$$($1_SEP),$$(subst &,\&,$$(strip $$($1_REPLACEMENTS))))))$$($1_SEP)g'
|
|
else
|
|
# We don't have any replacements, just pipe the file through cat.
|
|
$1_REPLACEMENTS_COMMAND_LINE := $(CAT)
|