From 7decbb0d7cc774bea42ca08a89daf9e0b1cc6bc3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 2 Sep 2010 22:28:35 +0000 Subject: [PATCH] k-s told me to do work on eve so I did it and now I'm writing a commmmit message for what I did but I don't remember what it was so I'll just hope that it works and that if it doesn't someone blames TAsn or cedric and fixes it SVN revision: 51847 --- Makefile.am | 13 +++++++++---- configure.ac | 22 ++++++++++++++++++++++ src/bin/main.c | 6 ++++-- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 497adc8..3f83a15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,14 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src data po -MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ - config.h.in config.sub configure install-sh \ - ltconfig ltmain.sh missing mkinstalldirs \ - stamp-h.in acconfig.h depcomp +MAINTAINERCLEANFILES = Makefile.in ABOUT-NLS INSTALL aclocal.m4 config.guess compile \ + config.h.in config.rpath config.sub configure install-sh \ + ltconfig ltmain.sh missing mkinstalldirs \ + m4/lib-link.m4 m4/lib-prefix.m4 m4/lib-ld.m4 m4/lcmessage.m4 m4/libtool.m4 m4/ulonglong.m4 \ + m4/inttypes-pri.m4 m4/progtest.m4 m4/uintmax_t.m4 m4/lt~obsolete.m4 m4/stdint_h.m4 m4/intdiv0.m4 \ + m4/iconv.m4 m4/po.m4 m4/isc-posix.m4 m4/inttypes.m4 m4/ltsugar.m4 m4/glibc21.m4 m4/gettext.m4 m4/ltversion.m4 \ + m4/codeset.m4 m4/inttypes_h.m4 m4/ltoptions.m4 m4/nls.m4 po/Rules-quot po/en@quot.header po/insert-header.sin \ + po/quot.sed po/en@boldquot.header po/boldquot.sed po/Makevars.template po/remove-potcdate.sin po/Makefile.in.in \ + stamp-h.in acconfig.h depcomp EXTRA_DIST = README AUTHORS COPYING diff --git a/configure.ac b/configure.ac index d2b3a9f..9063711 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,23 @@ +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +m4_define([v_maj], [1]) +m4_define([v_min], [0]) +m4_define([v_mic], [0]) +m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || 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 +m4_undefine([v_rev]) +##-- When doing snapshots - change soname. remove dnl on below line +dnl m4_define([relname], [ver-pre-svn-07]) +dnl m4_define([v_rel], [-release relname]) +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])]) +m4_define([lt_rev], m4_eval(v_maj + v_min)) +m4_define([lt_cur], v_mic) +m4_define([lt_age], v_min) +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## + AC_INIT(eve, 0.2.0.0, barbieri@profusion.mobi) AC_PREREQ([2.60]) AC_CONFIG_SRCDIR([configure.ac]) @@ -20,6 +40,8 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'` VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'` SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'` version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" +m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) +AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) AC_SUBST(VMAJ) AC_SUBST(version_info) diff --git a/src/bin/main.c b/src/bin/main.c index 1856944..f9e212f 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -283,11 +283,13 @@ window_create() return win->current_view; } +#define stringify(X) #X + static const Ecore_Getopt options = { PACKAGE_NAME, "%prog [options] [url]", - PACKAGE_VERSION, - "(C) 2000 ProFUSION embedded systems", + PACKAGE_VERSION "Revision:" stringify(VREV), + "(C) 2010 ProFUSION embedded systems", "LGPL-3", "WebKit-EFL demo browser for mobile systems with touchscreen.", EINA_TRUE,