admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: sed portability fixes

Browse Source 
Recently generating the version-def.h file and the config-list.h
file have been updated, which broke versions of "sed" that do not
want to be fed a file that ends with an incomplete line, and/or that
do not understand the more recent "-E" option to use extended
regular expression.

Fix them in response to a build-failure reported on Solaris boxes.

cf. https://lore.kernel.org/git/09f954b8-d9c3-418f-ad4b-9cb9b063f4ae@comstyle.com/

Reported-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Collin Funk <collin.funk1@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2025-06-12 10:04:58 -07:00
parent 6a9e1c3507
commit 5acfacc2a1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GIT-VERSION-GEN
View File

@@ -82,7 +82,7 @@ read GIT_MAJOR_VERSION GIT_MINOR_VERSION GIT_MICRO_VERSION GIT_PATCH_LEVEL trail
$(echo "$GIT_VERSION" 0 0 0 0 | tr '.a-zA-Z-' ' ') $(echo "$GIT_VERSION" 0 0 0 0 | tr '.a-zA-Z-' ' ')
EOF EOF
REPLACED=$(printf "%s" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \ REPLACED=$(printf "%s\n" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
-e "s|@GIT_MAJOR_VERSION@|$GIT_MAJOR_VERSION|" \ -e "s|@GIT_MAJOR_VERSION@|$GIT_MAJOR_VERSION|" \
-e "s|@GIT_MINOR_VERSION@|$GIT_MINOR_VERSION|" \ -e "s|@GIT_MINOR_VERSION@|$GIT_MINOR_VERSION|" \
-e "s|@GIT_MICRO_VERSION@|$GIT_MICRO_VERSION|" \ -e "s|@GIT_MICRO_VERSION@|$GIT_MICRO_VERSION|" \

8
generate-configlist.sh
View File

@@ -13,17 +13,17 @@ print_config_list () {
cat <<EOF cat <<EOF
static const char *config_name_list[] = { static const char *config_name_list[] = {
EOF EOF
sed -E ' sed -e '
/^`?[a-zA-Z].*\..*`?::$/ { /^`*[a-zA-Z].*\..*`*::$/ {
/deprecated/d; /deprecated/d;
s/::$//; s/::$//;
s/`//g; s/`//g;
s/^.*$/ "&",/; s/^.*$/ "&",/;
s/, */",\n "/g; s/, */",\n "/g;
p;}; p;};
d' \ d' \
"$SOURCE_DIR"/Documentation/*config.adoc \ "$SOURCE_DIR"/Documentation/*config.adoc \
"$SOURCE_DIR"/Documentation/config/*.adoc| "$SOURCE_DIR"/Documentation/config/*.adoc |
sort sort
cat <<EOF cat <<EOF
NULL, NULL,