[Xfce4-commits] <exo:master> Update version to 0.5.0 and use new git build stuff.
Nick Schermer
nick at xfce.org
Thu Aug 20 21:42:02 CEST 2009
Updating branch refs/heads/master
to db00686d3ff93104fd9ed7dcfee53728b28a10f2 (commit)
from 583ec9b731b98451b3b6ffe5b385b313b005ef0a (commit)
commit db00686d3ff93104fd9ed7dcfee53728b28a10f2
Author: Nick Schermer <nick at xfce.org>
Date: Thu Aug 20 21:40:33 2009 +0200
Update version to 0.5.0 and use new git build stuff.
autogen.sh | 43 +++++++++++--------------------------------
configure.in.in | 14 +++++++-------
po-doc/LINGUAS | 2 --
po-doc/Makefile.am | 4 ++--
po/LINGUAS | 2 --
5 files changed, 20 insertions(+), 45 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index a3c930e..d3b7588 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,46 +1,25 @@
#!/bin/sh
#
-# $Id$
+# Copyright (c) 2002-2009
+# The Xfce development team. All rights reserved.
#
-# Copyright (c) 2002-2006
-# The Thunar development team. All rights reserved.
-#
-# Written for Thunar by Benedikt Meurer <benny at xfce.org>.
+# Written for Xfce by Benedikt Meurer <benny at xfce.org>
+# and Brian Tarricone <brian at tarricone.org>.
#
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
-autogen.sh: You don't seem to have the Xfce development tools installed on
- your system, which are required to build this software.
- Please install the xfce4-dev-tools package first, it is available
+autogen.sh: You don't seem to have the Xfce development tools (at least
+ version $XDT_REQURED_VERSION) installed on your system, which
+ are required to build this software.
+ Please install the xfce4-dev-tools package first; it is available
from http://www.xfce.org/.
EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
- or try to checkout again.
-EOF
- exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-if [ -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
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.in.in" > "configure.in"
-
-exec xdt-autogen $@
+exec xdt-autogen "$@"
# vi:set ts=2 sw=2 et ai:
diff --git a/configure.in.in b/configure.in.in
index e38ca77..11545d9 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -12,17 +12,17 @@ dnl ***************************
m4_define([libexo_verinfo], [0:0:0])
m4_define([libexo_version_api], [1])
m4_define([libexo_version_major], [0])
-m4_define([libexo_version_minor], [3])
-m4_define([libexo_version_micro], [101])
+m4_define([libexo_version_minor], [5])
+m4_define([libexo_version_micro], [0])
m4_define([libexo_version_nano], [])
-m4_define([libexo_version_build], [r at REVISION@])
-m4_define([libexo_version_tag], [svn])
-m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [svn], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])])
+m4_define([libexo_version_build], [@REVISION@])
+m4_define([libexo_version_tag], [git])
+m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [git], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])])
dnl ********************************************
dnl *** Full debug support for SVN snapshots ***
dnl ********************************************
-m4_define([libexo_debug_default], [ifelse(libexo_version_tag(), [svn], [full], [minimum])])
+m4_define([libexo_debug_default], [ifelse(libexo_version_tag(), [git], [full], [minimum])])
dnl ***************************
dnl *** Initialize autoconf ***
@@ -33,7 +33,7 @@ All rights reserved.
Written by Benedikt Meurer <benny at xfce.org>.])
AC_INIT([exo], [libexo_version], [http://bugzilla.xfce.org/])
AC_PREREQ([2.50])
-AC_REVISION([$Id$])
+AC_REVISION([@REVISION@])
AC_CANONICAL_TARGET()
dnl ***************************
diff --git a/po-doc/LINGUAS b/po-doc/LINGUAS
deleted file mode 100644
index 7648be9..0000000
--- a/po-doc/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-da es fr gl id it ja pt_BR tr
diff --git a/po-doc/Makefile.am b/po-doc/Makefile.am
index 0232c20..e409dfb 100644
--- a/po-doc/Makefile.am
+++ b/po-doc/Makefile.am
@@ -63,14 +63,14 @@ exo-preferred-applications.pot: $(docdir)/C/exo-preferred-applications.xml.in
update-po: Makefile exo-preferred-applications.pot
@echo "*** Updating PO ***"
- langs=`sed -e '/^#/d' $(srcdir)/LINGUAS`; \
+ langs=`cd "$(srcdir)/" 2>/dev/null && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $$1 }'`; \
for lang in $$langs; do \
$(XML2PO) -u $$lang.po $(docdir)/C/exo-preferred-applications.xml.in; \
done
update-xml: Makefile exo-preferred-applications.pot
@echo "*** Updating XML ***"
- langs=`sed -e '/^#/d' $(srcdir)/LINGUAS`; \
+ langs=`cd "$(srcdir)/" 2>/dev/null && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $$1 }'`; \
for lang in $$langs; do \
if test -n $(docdir)/$$lang; then \
mkdir -p $(docdir)/$$lang; \
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index c73c6e3..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast be ca cs cy da de dz el en_GB es et eu fi fr gl he hu id it ja ka ku lt lv mk nb nl pa pl pt pt_BR ro ru sl sq sv tl_PH tr uk ur ur_PK zh_CN zh_TW
More information about the Xfce4-commits
mailing list