configury: fix OPAL_GET_VERSION
- fix path to getdate.sh - do not prepend "date" to the revision - support git worktree Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
Этот коммит содержится в:
родитель
159856f9aa
Коммит
930d3c4695
@ -12,7 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
|||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
dnl Copyright (c) 2008-2020 Cisco Systems, Inc. All rights reserved.
|
dnl Copyright (c) 2008-2020 Cisco Systems, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
|
dnl Copyright (c) 2014 Intel, Inc. All rights reserved.
|
||||||
dnl Copyright (c) 2014 Research Organization for Information Science
|
dnl Copyright (c) 2014-2020 Research Organization for Information Science
|
||||||
dnl and Technology (RIST). All rights reserved.
|
dnl and Technology (RIST). All rights reserved.
|
||||||
dnl $COPYRIGHT$
|
dnl $COPYRIGHT$
|
||||||
dnl
|
dnl
|
||||||
@ -80,7 +80,7 @@ m4_define([OPAL_GET_VERSION],[
|
|||||||
|
|
||||||
# If we're in a git repo and we found the git command, use
|
# If we're in a git repo and we found the git command, use
|
||||||
# git describe to get the repo rev
|
# git describe to get the repo rev
|
||||||
if test -d "$srcdir/.git" && test $git_happy -eq 1; then
|
if test -r "$srcdir/.git" && test $git_happy -eq 1; then
|
||||||
if test "$srcdir" != "`pwd`"; then
|
if test "$srcdir" != "`pwd`"; then
|
||||||
git_save_dir=`pwd`
|
git_save_dir=`pwd`
|
||||||
cd "$srcdir"
|
cd "$srcdir"
|
||||||
@ -91,7 +91,7 @@ m4_define([OPAL_GET_VERSION],[
|
|||||||
$2_REPO_REV=`git describe --tags --always`
|
$2_REPO_REV=`git describe --tags --always`
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
$2_REPO_REV=date`$srcdir/getdate.sh '+%Y-%m-%d'`
|
$2_REPO_REV=`$srcdir/config/getdate.sh '+%Y-%m-%d'`
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user