From 99cbd64756c7cc882a45137deb66873814b63056 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 6 Dec 2015 12:24:39 +0000 Subject: [PATCH] Fix version detection using .ottdrev-vc --- config.lib | 2 ++ version_utils.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config.lib b/config.lib index aabfdd1d80..80f0d9aabb 100644 --- a/config.lib +++ b/config.lib @@ -1064,6 +1064,8 @@ check_params() { log 1 "checking revision... git detection" elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`HGPLAIN= hg help 2>/dev/null`" ]; then log 1 "checking revision... hg detection" + elif [ -f "$ROOT_DIR/.ottdrev-vc" ]; then + log 1 "checking revision... source release version" elif [ -f "$ROOT_DIR/.ottdrev" ]; then log 1 "checking revision... source tarball" else diff --git a/version_utils.sh b/version_utils.sh index a7df83bcd4..c0030f8a50 100755 --- a/version_utils.sh +++ b/version_utils.sh @@ -90,7 +90,7 @@ function read_source { handle_source "Makefile.src.in" "$1" while IFS=$'\n' read -r line; do handle_source "src/$line" "$1" - done < <( sed -e 's/^[ \t]*//; s/[ \t]*$//;' -e '/^$/ d;' -e '/^#/ d;' -e '/^..\// d;' "source.list" ) + done < <( sed -e 's/^[ \t]*//; s/[ \t]*$//;' -e '/^$/ d;' -e '/^#/ d;' -e '/^..\// d;' -e 's/^rev.cpp$/rev.cpp.in/;' "source.list" ) } if [ -z "$HASH" -a -z "$NAMES" -a -z "$HASHLIST" -a -z "$TESTOK" -a -z "$WRITE" -a -z "$RELEASETAG" ]; then