summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-08-15 16:16:14 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-16 16:15:07 -0400
commitc393cb039dcf0f308a8e788ead517b71aa2ebbe1 (patch)
tree27d25a15cf4db4f50879a0f3ab980bb968bba3ed
parent3c2779ffc3973aa043e4401bb12bd7c551fcc8d4 (diff)
ci: always use same version numbering for every builddevs/discomfitor/citest
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
-rwxr-xr-x.ci/ci-configure.sh3
-rw-r--r--.ci/efl.m4.diff24
2 files changed, 27 insertions, 0 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 8eb0525f12..7b882d0471 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 -
29 29
30RELEASE_READY_LINUX_COPTS=" --with-profile=release" 30RELEASE_READY_LINUX_COPTS=" --with-profile=release"
31 31
32patch -p1 < .ci/efl.m4.diff
33sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
34
32if [ "$DISTRO" != "" ] ; then 35if [ "$DISTRO" != "" ] ; then
33 # Normal build test of all targets 36 # Normal build test of all targets
34 OPTS="$DEFAULT_LINUX_COPTS" 37 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 @@
1diff --git a/m4/efl.m4 b/m4/efl.m4
2index d051155e56..4b91c60963 100644
3--- a/m4/efl.m4
4+++ b/m4/efl.m4
5@@ -22,14 +22,14 @@ dnl dev_version = development version (svn revision).
6 dnl def_build_profile = dev or release based on 'dev' release parameter.
7 AC_DEFUN([EFL_VERSION],
8 [dnl
9-m4_define([v_maj], [$1])dnl
10-m4_define([v_min], [$2])dnl
11-m4_define([v_mic], [$3])dnl
12-m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
13+m4_define([v_maj], [1])dnl
14+m4_define([v_min], [99])dnl
15+m4_define([v_mic], [99])dnl
16+m4_define([dev_version], [0])
17 m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl
18 m4_define([v_rel], [])dnl
19 m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl
20-m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
21+m4_define([efl_version], [v_maj.v_min.v_mic])dnl
22 dnl m4_define([efl_version], [v_maj.v_min.v_mic])dnl
23 ])
24