diff options
| author | Mike Holmes <mike.holmes@linaro.org> | 2016-10-21 14:40:17 -0400 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2016-10-24 19:09:00 +0300 |
| commit | eebd6b0bb6cc1f724d8f78c1c419031004adc3e4 (patch) | |
| tree | f6c4a2861fe896294ee7afe4489812ecf8b823cf /scripts | |
| parent | 44df10d424bcd3c74b1d662b40e74b8fdbd031a4 (diff) | |
configure: the version cannot use a script
Use of a script in the autotools breaks github CI
Define the API version in configure and reuse it in the code
Benefits:
removes dependence on scripts to build
removes scripts and the make file from odp/scripts
removes generated .scmversion file
places api versioning right next to lib versioning in the configure.ac
allows github to auto build odp repos
Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
Reviewed-by: Brian Brooks <brian.brooks@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rwxr-xr-x | scripts/get_impl_str.sh | 11 | ||||
| -rwxr-xr-x | scripts/git_hash.sh | 29 |
3 files changed, 0 insertions, 41 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 189b3efc2..000000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = get_impl_str.sh git_hash.sh diff --git a/scripts/get_impl_str.sh b/scripts/get_impl_str.sh deleted file mode 100755 index d765a531e..000000000 --- a/scripts/get_impl_str.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [ -z ${1} ]; then - echo "should be called with a path" - exit -fi -ROOTDIR=${1} - -CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git} - -echo -n "'${CUSTOM_STR}' ($(cat ${ROOTDIR}/.scmversion))" diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh deleted file mode 100755 index 336eb01dd..000000000 --- a/scripts/git_hash.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ -z ${1} ]; then - echo "should be called with a path" - exit -fi -ROOTDIR=${1} - -if [ -d ${ROOTDIR}/.git ]; then - hash=$(git --git-dir=${ROOTDIR}/.git describe --match 'v[0-9]*\.[0-9]*\.[0-9]*\.[0-9]*'\ - | tr -d "\n") - if [[ $(git --git-dir=${ROOTDIR}/.git diff --shortstat 2> /dev/null \ - | tail -n1) != "" ]]; then - dirty=.dirty - fi - - echo -n "${hash}${dirty}">${ROOTDIR}/.scmversion - - sed -i "s|-|.git|" ${ROOTDIR}/.scmversion - sed -i "s|-|.|g" ${ROOTDIR}/.scmversion - sed -i "s|^v||g" ${ROOTDIR}/.scmversion -elif [ ! -d ${ROOTDIR}/.git -a ! -f ${ROOTDIR}/.scmversion ]; then - echo -n "File ROOTDIR/.scmversion not found, " - echo "and not inside a git repository" - echo "Bailing out! Not recoverable!" - exit 1 -fi - -cat ${ROOTDIR}/.scmversion |