Updating branch refs/heads/libxfce4ui to dbe4b0cfff338b8b16ab6b8f07377d4479a531c5 (commit) from 291accfead103e9050301d3cffbfd366fdfc44ff (commit)
commit dbe4b0cfff338b8b16ab6b8f07377d4479a531c5 Author: Olivier Fourdan <four...@xfce.org> Date: Fri Sep 4 14:02:45 2009 +0200 gitify the build generation autogen.sh | 9 +-------- configure.ac.in | 8 ++++---- settings-dialogs/Makefile.am | 5 ++--- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/autogen.sh b/autogen.sh index a6f77eb..8f35549 100755 --- a/autogen.sh +++ b/autogen.sh @@ -36,14 +36,7 @@ echo "Creating configure.ac" # substitute revision and linguas linguas=`sed -e '/^#/d' po/LINGUAS` -if test -d .git/svn; then - revision=`git svn find-rev trunk 2>/dev/null || - git svn find-rev origin/trunk 2>/dev/null || - git svn find-rev HEAD 2>/dev/null || - git svn find-rev master 2>/dev/null` -else - revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` -fi +revision=`git rev-parse --short HEAD` sed -e "s/@LINGUAS@/${linguas}/g" \ -e "s/@REVISION@/${revision}/g" \ < "configure.ac.in" > "configure.ac" diff --git a/configure.ac.in b/configure.ac.in index ba80155..4b216a0 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -6,9 +6,9 @@ dnl m4_define([xfwm4_version_major], [4]) m4_define([xfwm4_version_minor], [7]) m4_define([xfwm4_version_micro], [0]) -m4_define([xfwm4_version_build], [...@revision@]) -m4_define([xfwm4_version_tag], [svn]) -m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [svn], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) +m4_define([xfwm4_version_build], [...@revision@]) +m4_define([xfwm4_version_tag], [git]) +m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])]) m4_define([gtk_minimum_version], [2.10.0]) m4_define([xfce_minimum_version], [4.6.0]) @@ -204,7 +204,7 @@ REVISION=unknown if test x"@REVISION@" != x""; then revisi...@revision@ fi -AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [svn revision number]) +AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [git id]) AC_SUBST([REVISION]) AC_OUTPUT([ diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am index ffed63d..739cd10 100644 --- a/settings-dialogs/Makefile.am +++ b/settings-dialogs/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = \ xfwm4-settings \ xfwm4-tweaks-settings \ -xfwm4-workspace-settings +xfwm4-workspace-settings noinst_DATA = \ monitor-icon.png \ @@ -130,5 +130,4 @@ EXTRA_DIST = \ xfwm4-dialog.glade DISTCLEANFILES = \ - $(desktop_DATA) \ - monitor-icon.h + $(desktop_DATA) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits