From a4769c42cbeb88ac0f520375e8f0571d3711f9fb Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 4 Jun 2010 01:04:24 +0000 Subject: [PATCH] change svnversion shell goop to nuke sed and just use tr to delete unwanted goop. SVN revision: 49429 --- legacy/ecore/configure.ac | 5 ++--- legacy/edje/configure.ac | 5 ++--- legacy/eet/configure.ac | 5 ++--- legacy/eeze/configure.ac | 5 ++--- legacy/efreet/configure.ac | 5 ++--- legacy/eina/configure.ac | 5 ++--- legacy/embryo/configure.ac | 5 ++--- legacy/evas/configure.ac | 5 ++--- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index 21ad619148..c8b57b03c8 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -3,9 +3,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']))]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +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 1801acf96c..4115db087c 100644 --- a/legacy/edje/configure.ac +++ b/legacy/edje/configure.ac @@ -3,9 +3,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']))]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +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 25193b68b5..16ae469fd6 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -3,9 +3,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']))]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +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 6fbbd409e9..eb3bdce247 100644 --- a/legacy/eeze/configure.ac +++ b/legacy/eeze/configure.ac @@ -3,9 +3,8 @@ m4_define([v_maj], [0]) m4_define([v_min], [2]) 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']))]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +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 c14cfa84b7..be40207df1 100644 --- a/legacy/efreet/configure.ac +++ b/legacy/efreet/configure.ac @@ -3,9 +3,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']))]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +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 d6dc10e744..adb47a3183 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -3,9 +3,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']))]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +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 cefbdb94ac..2b0078158c 100644 --- a/legacy/embryo/configure.ac +++ b/legacy/embryo/configure.ac @@ -3,9 +3,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']))]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +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 45a61b3f44..d1ae7ded4f 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -3,9 +3,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']))]) +m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) +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