mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-22 02:54:28 -05:00
31d235c4c7
The GIT-VERSION-GEN script sets up GIT_CEILING_DIRECTORIES so that we won't accidentally parse version information from an unrelated parent repository. The ceiling is derived from the source directory by simply appendign "/.." to it, which mean that we'll only consider the current directory for repository discovery. This works alright in the case where git-gui is built as a standalone project, but it breaks when git-gui is embedded into a _related_ parent project. This is for example how git-gui is distributed via Git. Interestingly enough, the version information is still derived properly when building git-gui via Git's Makefile. In that case we eventually end up specifying the ceiling directory as "./.." as we use relative paths there, and that seems to not restrict the repository discovery. But when building via Meson we specify the source directory as an absolute path, and if so the repository discovery _is_ stopped. The consequence is that we won't be able to derive the version in that case. Fix the issue by adding a new optional parameter to GIT-VERSION-GEN that allows the caller to override the parent project directory and wire up new build options for Meson and Make that allows users to specify it. Note that by default we won't set the parent project directory. This isn't required for Meson anyway as we already use absolute paths there, but for our Makefile it means that we still end up with "./.." as ceiling directory, which is ineffective. But using e.g. pwd(1) as the default value would break downstream's version generation, unless we updated git-gui and the Makefile at the same point in time. Signed-off-by: Patrick Steinhardt <ps@pks.im>
107 lines
2.4 KiB
Bash
Executable File
107 lines
2.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
DEF_VER=v2.53.GIT
|
|
|
|
LF='
|
|
'
|
|
|
|
if test "$#" -lt 2 || test "$#" -gt 3
|
|
then
|
|
echo >&2 "USAGE: $0 <SOURCE_DIR> (--format=<STRING>|<INPUT>) [<OUTPUT>]"
|
|
exit 1
|
|
fi
|
|
|
|
SOURCE_DIR="$1"
|
|
|
|
case "$2" in
|
|
--format=*)
|
|
INPUT="${2#--format=}"
|
|
;;
|
|
*)
|
|
if ! test -f "$2"
|
|
then
|
|
echo >&2 "Input is not a file: $2"
|
|
exit 1
|
|
fi
|
|
INPUT=$(cat "$2")
|
|
;;
|
|
esac
|
|
|
|
OUTPUT="$3"
|
|
|
|
# Protect us from reading Git version information outside of the Git directory
|
|
# in case it is not a repository itself, but embedded in an unrelated
|
|
# repository.
|
|
GIT_CEILING_DIRECTORIES="$SOURCE_DIR/.."
|
|
export GIT_CEILING_DIRECTORIES
|
|
|
|
if test -z "$GIT_VERSION"
|
|
then
|
|
# First see if there is a version file (included in release tarballs),
|
|
# then try git-describe, then default.
|
|
if test -f "$SOURCE_DIR"/version
|
|
then
|
|
VN=$(cat "$SOURCE_DIR"/version) || VN="$DEF_VER"
|
|
elif {
|
|
test -d "$SOURCE_DIR/.git" ||
|
|
test -d "${GIT_DIR:-.git}" ||
|
|
test -f "$SOURCE_DIR"/.git;
|
|
} &&
|
|
VN=$(git -C "$SOURCE_DIR" describe --dirty --match="v[0-9]*" 2>/dev/null) &&
|
|
case "$VN" in
|
|
*$LF*) (exit 1) ;;
|
|
esac
|
|
then
|
|
VN=$(echo "$VN" | sed -e 's/-/./g');
|
|
else
|
|
VN="$DEF_VER"
|
|
fi
|
|
|
|
GIT_VERSION=$(expr "$VN" : v*'\(.*\)')
|
|
fi
|
|
|
|
if test -z "$GIT_BUILT_FROM_COMMIT"
|
|
then
|
|
GIT_BUILT_FROM_COMMIT=$(git -C "$SOURCE_DIR" rev-parse -q --verify HEAD 2>/dev/null)
|
|
fi
|
|
|
|
if test -z "$GIT_DATE"
|
|
then
|
|
GIT_DATE=$(git -C "$SOURCE_DIR" show --quiet --format='%as' 2>/dev/null)
|
|
fi
|
|
|
|
if test -z "$GIT_USER_AGENT"
|
|
then
|
|
GIT_USER_AGENT="git/$GIT_VERSION"
|
|
fi
|
|
|
|
# While released Git versions only have three numbers, development builds also
|
|
# have a fourth number that corresponds to the number of patches since the last
|
|
# release.
|
|
read GIT_MAJOR_VERSION GIT_MINOR_VERSION GIT_MICRO_VERSION GIT_PATCH_LEVEL trailing <<EOF
|
|
$(echo "$GIT_VERSION" 0 0 0 0 | tr '.a-zA-Z-' ' ')
|
|
EOF
|
|
|
|
REPLACED=$(printf "%s\n" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
|
|
-e "s|@GIT_MAJOR_VERSION@|$GIT_MAJOR_VERSION|" \
|
|
-e "s|@GIT_MINOR_VERSION@|$GIT_MINOR_VERSION|" \
|
|
-e "s|@GIT_MICRO_VERSION@|$GIT_MICRO_VERSION|" \
|
|
-e "s|@GIT_PATCH_LEVEL@|$GIT_PATCH_LEVEL|" \
|
|
-e "s|@GIT_BUILT_FROM_COMMIT@|$GIT_BUILT_FROM_COMMIT|" \
|
|
-e "s|@GIT_USER_AGENT@|$GIT_USER_AGENT|" \
|
|
-e "s|@GIT_DATE@|$GIT_DATE|"
|
|
)
|
|
|
|
if test -z "$OUTPUT"
|
|
then
|
|
printf "%s\n" "$REPLACED"
|
|
else
|
|
printf "%s\n" "$REPLACED" >"$OUTPUT".$$+
|
|
if ! test -f "$OUTPUT" || ! cmp "$OUTPUT".$$+ "$OUTPUT" >/dev/null
|
|
then
|
|
mv "$OUTPUT".$$+ "$OUTPUT"
|
|
else
|
|
rm "$OUTPUT".$$+
|
|
fi
|
|
fi
|