Skip to content

Commit 1b6a93e

Browse files
committed
switch to new version script
1 parent 3f95a45 commit 1b6a93e

5 files changed

Lines changed: 3 additions & 53 deletions

File tree

script/build/branch_revision

Lines changed: 0 additions & 16 deletions
This file was deleted.

script/build/git_revision

Lines changed: 0 additions & 13 deletions
This file was deleted.

script/build/trunk_revision

Lines changed: 0 additions & 14 deletions
This file was deleted.

script/build/update_version

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
#!/usr/bin/env bash
22

3-
# Return the complete revision number
4-
# <major>.<minor>.<trunk-basis>.<patch-or-0>-<sha>[-qualifier]
5-
63
set -e
74

85
version_template=`cat VERSION_TEMPLATE`
6+
commit_count=`git rev-list HEAD --count`
97

108
if [[ "$version_template" =~ ^[0-9]+\.[0-9]+\.GENERATED_VERSION(-[a-zA-Z0-9]+)?$ ]]; then
119

12-
git_revision=`script/build/git_revision`
13-
echo ${version_template/GENERATED_VERSION/$git_revision}
10+
echo ${version_template/GENERATED_VERSION/$commit_count}
1411

1512
else
1613
echo "Invalid version template string: $version_template" >&2
1714
exit -1
1815
fi
1916

17+

0 commit comments

Comments
 (0)