stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=31a625cb7d58b3aa2e9513c1be747ce4d38e05ad
commit 31a625cb7d58b3aa2e9513c1be747ce4d38e05ad Author: Mike Blumenkrantz <[email protected]> Date: Wed Aug 15 16:16:14 2018 -0400 ci: always use same version numbering for every build if the version number ever changes then this destroys the entire ccache as the version is used in various places in headers which are included throughout the tree Differential Revision: https://phab.enlightenment.org/D6848 --- .ci/ci-configure.sh | 3 +++ .ci/efl.m4.diff | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index 2fea243276..bf551f53e3 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -29,6 +29,9 @@ MISC_DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd - RELEASE_READY_LINUX_COPTS=" --with-profile=release" +patch -p1 < .ci/efl.m4.diff +sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac + if [ "$DISTRO" != "" ] ; then # Normal build test of all targets OPTS="$DEFAULT_LINUX_COPTS" diff --git a/.ci/efl.m4.diff b/.ci/efl.m4.diff new file mode 100644 index 0000000000..fda939a8ed --- /dev/null +++ b/.ci/efl.m4.diff @@ -0,0 +1,24 @@ +diff --git a/m4/efl.m4 b/m4/efl.m4 +index d051155e56..4b91c60963 100644 +--- a/m4/efl.m4 ++++ b/m4/efl.m4 +@@ -22,14 +22,14 @@ dnl dev_version = development version (svn revision). + dnl def_build_profile = dev or release based on 'dev' release parameter. + AC_DEFUN([EFL_VERSION], + [dnl +-m4_define([v_maj], [$1])dnl +-m4_define([v_min], [$2])dnl +-m4_define([v_mic], [$3])dnl +-m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl ++m4_define([v_maj], [1])dnl ++m4_define([v_min], [99])dnl ++m4_define([v_mic], [99])dnl ++m4_define([dev_version], [0]) + m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl + m4_define([v_rel], [])dnl + m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl +-m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl ++m4_define([efl_version], [v_maj.v_min.v_mic])dnl + dnl m4_define([efl_version], [v_maj.v_min.v_mic])dnl + ]) + --
