mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-24 20:22:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/403_versioning_cleanup'

Browse Source 
* commit 'origin/403_versioning_cleanup':
  version.sh: pregenerate version.h to avoid running ./configure twice in clean environment
  version.sh: unbreak version.h generation (--git-dir needs path to bare repo)
  version.sh: fix typo
  version.sh: more elegant extraction of old version
  version.sh: fix bashisms
  version.sh: don't suppress error messages from git availability check
This commit is contained in:
Sergei Trofimovich 2009-06-17 13:01:28 +03:00
commit 22ca1a9263
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -84,6 +84,8 @@ test -f configure || \
{ echo "autoconf failed to generate vfs/samba/configure" >&2; exit 1; } { echo "autoconf failed to generate vfs/samba/configure" >&2; exit 1; }
) || exit 1 ) || exit 1
$srcdir/maint/version.sh "$srcdir"
if test -x $srcdir/configure.mc; then if test -x $srcdir/configure.mc; then
$srcdir/configure.mc "$@" $srcdir/configure.mc "$@"
fi fi

12
maint/version.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
git --version &>/dev/null || exit git --version >/dev/null || exit
curr_dir=$(pwd) curr_dir=$(pwd)
@ -21,24 +21,22 @@ src_top_dir=
VERSION_FILE=${src_top_dir}/version.h VERSION_FILE=${src_top_dir}/version.h
pushd ${src_top_dir} &>/dev/null git_head=$(git --git-dir "${src_top_dir}/.git" rev-parse --verify HEAD 2>/dev/null)
git_head=$(git rev-parse --verify HEAD 2>/dev/null)
[ -z "${git_head}" ] && exit [ -z "${git_head}" ] && exit
new_version="$(git describe 2>/dev/null)" new_version="$(git --git-dir "${src_top_dir}/.git" describe 2>/dev/null)"
[ -z "${new_version}" ] && exit [ -z "${new_version}" ] && exit
popd &>/dev/null
saved_version= saved_version=
[ -r ${VERSION_FILE} ] && { [ -r ${VERSION_FILE} ] && {
saved_version=$(grep '^#define MC_CURRENT_VERSION' ${VERSION_FILE}| sed -r 's/.*"(.*)"$/\1/') saved_version=$(sed -rn 's/^#define MC_CURRENT_VERSION "(.*)"$/\1/p' ${VERSION_FILE})
} }
[ -z "${saved_version}" -o "${saved_version}" != "${new_version}" ] && { [ -z "${saved_version}" -o "${saved_version}" != "${new_version}" ] && {
cat >${VERSION_FILE} <<EOF cat >${VERSION_FILE} <<EOF
#ifndef MC_CURRENT_VERSION #ifndef MC_CURRENT_VERSION
/* This is autogenerated file. Don't edit! */ /* This is an autogenerated file. Don't edit! */
#define MC_CURRENT_VERSION "${new_version}" #define MC_CURRENT_VERSION "${new_version}"
#endif #endif
EOF EOF