From 6600f0c43f2d40008253dc732bba543b46d3b8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Thu, 3 Jun 2010 07:40:54 +0000 Subject: [PATCH] Let git-svn users get the right revision number to be used as version. SVN revision: 49407 --- legacy/ecore/configure.ac | 2 ++ legacy/edje/configure.ac | 2 ++ legacy/eet/configure.ac | 2 ++ legacy/eeze/configure.ac | 5 +++-- legacy/efreet/configure.ac | 2 ++ legacy/eina/configure.ac | 2 ++ legacy/embryo/configure.ac | 2 ++ legacy/evas/configure.ac | 2 ++ 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index d882675e2c..21ad619148 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -4,6 +4,8 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) +m4_if(v_rev, [0], [m4_define([v_rev], +m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac index 60beb79a78..1801acf96c 100644 --- a/legacy/edje/configure.ac +++ b/legacy/edje/configure.ac @@ -4,6 +4,8 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) +m4_if(v_rev, [0], [m4_define([v_rev], +m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index 73632709e5..25193b68b5 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -4,6 +4,8 @@ m4_define([v_maj], [1]) m4_define([v_min], [2]) m4_define([v_mic], [3]) m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) +m4_if(v_rev, [0], [m4_define([v_rev], +m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line diff --git a/legacy/eeze/configure.ac b/legacy/eeze/configure.ac index 5aada7ea0a..6fbbd409e9 100644 --- a/legacy/eeze/configure.ac +++ b/legacy/eeze/configure.ac @@ -3,8 +3,9 @@ m4_define([v_maj], [0]) m4_define([v_min], [2]) m4_define([v_mic], [0]) -m4_define([v_rev], m4_esyscmd([svnversion . | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) -m4_ifelse(m4_len[v_rev], [0], [m4_undefine([v_rev])]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) +m4_if(v_rev, [0], [m4_define([v_rev], +m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line diff --git a/legacy/efreet/configure.ac b/legacy/efreet/configure.ac index 8ea64ec56a..c14cfa84b7 100644 --- a/legacy/efreet/configure.ac +++ b/legacy/efreet/configure.ac @@ -4,6 +4,8 @@ m4_define([v_maj], [0]) m4_define([v_min], [5]) m4_define([v_mic], [0]) m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) +m4_if(v_rev, [0], [m4_define([v_rev], +m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index 2f633190e1..d6dc10e744 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -4,6 +4,8 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) +m4_if(v_rev, [0], [m4_define([v_rev], +m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line diff --git a/legacy/embryo/configure.ac b/legacy/embryo/configure.ac index 457d131c2f..cefbdb94ac 100644 --- a/legacy/embryo/configure.ac +++ b/legacy/embryo/configure.ac @@ -4,6 +4,8 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) +m4_if(v_rev, [0], [m4_define([v_rev], +m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index cd199adcdd..45a61b3f44 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -4,6 +4,8 @@ m4_define([v_maj], [0]) m4_define([v_min], [9]) m4_define([v_mic], [9]) m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s", $1);}' | tr 'A-z' ' ' | sed 's/ //g'])) +m4_if(v_rev, [0], [m4_define([v_rev], +m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line