cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=467582ff6d199d04f96093628abe0563b7aefbdd
commit 467582ff6d199d04f96093628abe0563b7aefbdd Author: Cedric BAIL <[email protected]> Date: Fri Jan 24 12:08:33 2014 +0900 PKGBUILD - follow changes in defining version with efl.m4 Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D492 Signed-off-by: Cedric BAIL <[email protected]> --- pkgbuild/PKGBUILD | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD index 3deb62c..5fa55a2 100644 --- a/pkgbuild/PKGBUILD +++ b/pkgbuild/PKGBUILD @@ -20,13 +20,9 @@ pkgver() { cd "../.." if [[ -d .git ]]; then - for _i in v_maj v_min v_mic; do - local v_ver=$v_ver.$(grep -m1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*") - done - - v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac) - - printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" + local efl_version=$(grep -m 1 EFL_VERSION configure.ac | grep -o "[[:digit:]]*" | tr '\n' '.') + efl_version=$(awk -F , -v efl_version=${efl_version%.} '/^AC_INIT/ {gsub(/efl_version/, efl_version); gsub(/[\[\] -]/, ""); print $2}' configure.ac) + printf "$efl_version.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" else ./configure --version | awk '/^elementary/ {gsub("-", ""); print $NF}' fi --
