[Xfce4-commits] <xfce4-settings:xfce-4.6> Some changes to the build system for GIT.
Nick Schermer
noreply at xfce.org
Sat Jan 2 14:34:04 CET 2010
Updating branch refs/heads/xfce-4.6
to 3ec5f58ba2769fce91cc107db50e690e8af07059 (commit)
from 0629eba29bc9e3191f2645c18f570fdb39c4d60b (commit)
commit 3ec5f58ba2769fce91cc107db50e690e8af07059
Author: Nick Schermer <nick at xfce.org>
Date: Sat Jan 2 14:21:08 2010 +0100
Some changes to the build system for GIT.
autogen.sh | 74 ++++++----
configure.ac.in | 10 +-
po/ChangeLog | 436 -------------------------------------------------------
po/LINGUAS | 2 -
4 files changed, 52 insertions(+), 470 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index bb77f9a..8b8fad8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,6 @@
#!/bin/sh
#
-# $Id: autogen.sh 23241 2006-09-29 19:05:15Z kelnos $
-#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2009
# The Xfce development team. All rights reserved.
#
# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
@@ -12,42 +10,64 @@
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, available from
- http://xfce.org/~benny/projects/xfce4-dev-tools/.
+ 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
+# portability for awk
+awk_tests="gawk mawk nawk awk"
+if test -z "$AWK"; then
+ for a in $awk_tests; do
+ if type $a >/dev/null 2>&1; then
+ AWK=$a
+ break
+ fi
+ done
+else
+ if ! type $AWK >/dev/null 2>/dev/null; then
+ unset AWK
+ fi
+fi
+if test -z "$AWK"; then
+ echo "autogen.sh: The 'awk' program (one of $awk_tests) is" >&2
+ echo " required, but cannot be found." >&2
exit 1
-}
+fi
-echo 'dnl *** This file is automatically generated from configure.ac.in ***' \
- >configure.ac
-echo 'dnl *** DO NOT EDIT! ***' >>configure.ac
-echo >>configure.ac
+# substitute revision
+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`
+elif test -d .git; then
+ revision=`git rev-parse --short HEAD`
+elif test -d .svn; then
+ revision=`LC_ALL=C svn info $0 | $AWK '/^Revision: / {printf "%05d\n", $2}'`
+fi
+if test "x$revision" = "x"; then
+ revision="UNKNOWN"
+fi
-# 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)
-elif [ -d .svn ]; then
- revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}')
+# substitute the linguas
+linguas=`cd "po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'`
+if test "x$linguas" = "x"; then
+ echo "autogen.sh: No po files were found, aborting." >&2
+ exit 1
fi
-[ "$revision" ] || revision=UNKNOWN
+# create configure.ac
sed -e "s/@LINGUAS@/${linguas}/g" \
-e "s/@REVISION@/${revision}/g" \
- < "configure.ac.in" >> "configure.ac"
+ < "configure.ac.in" > "configure.ac"
xdt-autogen $@
+# xdt-autogen clean does not remove all generated files
+(test x"clean" = x"$1") && {
+ rm -f configure.in
+ rm -f INSTALL
+} || true
# vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index 8192299..5d030cf 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -13,14 +13,14 @@ m4_define([xfce4_settings_version_major], [4])
m4_define([xfce4_settings_version_minor], [6])
m4_define([xfce4_settings_version_micro], [3])
m4_define([xfce4_settings_version_nano], [])
-m4_define([xfce4_settings_version_build], [r at REVISION@])
-m4_define([xfce4_settings_version_tag], []) # Leave empty for releases
-m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(),[],[], [-ifelse(xfce4_settings_version_tag(), [stephan], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])])
+m4_define([xfce4_settings_version_build], [@REVISION@])
+m4_define([xfce4_settings_version_tag], [git]) # Leave empty for releases
+m4_define([xfce4_settings_version], [xfce4_settings_version_major().xfce4_settings_version_minor().xfce4_settings_version_micro()ifelse(xfce4_settings_version_nano(), [], [], [.xfce4_settings_version_nano()])ifelse(xfce4_settings_version_tag(), [git], [xfce4_settings_version_tag()-xfce4_settings_version_build()], [xfce4_settings_version_tag()])])
dnl *******************************************
-dnl *** Debugging support for SVN snapshots ***
+dnl *** Debugging support for GIT snapshots ***
dnl *******************************************
-m4_define([xfce4_settings_debug_default], [ifelse(xfce4_settings_version_tag(), [svn], [full], [minimum])])
+m4_define([xfce4_settings_debug_default], [ifelse(xfce4_settings_version_tag(), [git], [full], [minimum])])
dnl ***************************
dnl *** Initialize autoconf ***
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index cbb4f04..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,436 +0,0 @@
-2009-08-07 Gabor Kelemen <kelemeng at gnome.hu>
-
- * hu.po: Translation updated.
-
-2009-07-10 Gabor Kelemen <kelemeng at gnome.hu>
-
- * hu.po: Translation updated.
-
-2009-07-09 Mike Massonnet <mmassonnet at xfce.org>
-
- * ast.po: Asturian translation added (Marcos).
-
-2009-07-01 Gabor Kelemen <kelemeng at gnome.hu>
-
- * hu.po: Translation reworked.
-
-2009-06-03 Piarres Beobide <pi at beobide.net>
-
- * eu.po: Basque translation update
-
-2009-05-30 Mișu Moldovan <dumol at xfce.org>
-
- * ro.po, LINGUAS: Romanian translation added
-
-2009-05-29 Mike Massonnet <mmassonnet at xfce.org>
-
- * sk.po: Slovak translation update (Robert Hartl)
- * ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki)
- * ur.po: Urdu translation update (Muhammad Ali Makki)
-
-2009-05-11 Mike Massonnet <mmassonnet at xfce.org>
-
- * lv.po: Latvian translation update (Rihards Prieditis)
-
-2009-05-10 Alexander Toresson <eulex at xfce.org>
-
- * sv.po: Swedish translation update (Daniel Nylander)
-
-2009-04-16 Masato Hashimoto <cabezon.hashimoto at gmail.com>
-
- * ja.po: Japanese translation update (Masato Hashimoto)
-
-2009-04-16 Mike Massonnet <mmassonnet at xfce.org>
-
- * gl.po: Galician translation update (Leandro Regueiro)
-
-2009-04-13 Mike Massonnet <mmassonnet at xfce.org>
-
- * de.po: German translation update (Fabian Nowak)
-
-2009-04-04 Per Kongstad <pko at xfce.org>
-
- * da.po: Danish translation update (Per Kongstad)
-
-2009-03-30 Piotr Sokół <piotr.sokol at 10g.pl>
-
- * pl.po: Polish translation update
-
-2009-03-29 Maximilian Schleiss <maximilian at xfce.org>
-
- * es.po: Spanish translation update (Abel Martín)
- * it.po, LINGUAS: Italian translation added (Cristian Marchi)
-
-2009-03-27 Maximilian Schleiss <maximilian at xfce.org>
-
- * gl.po, LINGUAS: Galician translation added (Leandro Regueiro)
- * pt.po: Portuguese translation update (Nuno Miguel)
- * ru.po: Russian translation update (Vladimir Dolzhenko)
-
-2009-03-23 Piotr Sokół <piotr.sokol at 10g.pl>
-
- * pl.po: Polish translation update
-
-2009-03-19 Masato Hashimoto <cabezon.hashimoto at gmail.com>
-
- * ja.po: Japanese translation update (Masato Hashimoto)
-
-2009-03-16 Piotr Sokół <piotr.sokol at 10g.pl>
-
- * pl.po: Polish translation update
-
-2009-03-14 Maximilian Schleiss <maximilian at xfce.org>
-
- * es.po: Spanish translation update (Abel Martín)
-
-2009-03-08 Piotr Sokół <piotr.sokol at 10g.pl>
-
- * pl.po: Polish translation update
-
-2009-03-05 Mike Massonnet <mmassonnet at xfce.org>
-
- * pt.po: Renamed pt_PT.po to pt.po (bug #4574)
-
-2009-03-02 Maximilian Schleiss <maximilian at xfce.org>
-
- * pt_PT, LINGUAS: European Portuguese translation added (Nuno Miguel)
-
-2009-03-01 Maximilian Schleiss <maximilian at xfce.org>
-
- * es.po: Spanish translation update (Abel Martín)
- * pl.po: Polish translation update (Piotr Sokół)
-
-2009-02-22 Mike Massonnet <mmassonnet at xfce.org>
-
- * ru.po: Add Russian translation (Ilya Shestopalov)
-
-2009-02-21 Maximilian Schleiss <maximilian at xfce.org>
-
- * es.po: Spanish translation update (Abel Martín)
- * id.po: Indonesian translation update (Andhika Padmawan)
-
-2009-02-21 Stavros Giannouris <stavrosg at hellug.gr>
-
- * el.po: Greek translation update
-
-2009-02-16 Per Kongstad <pko at xfce.org>
-
- * da.po: Danish translation update (Per Kongstad)
-
-2009-02-09 Alexander Toresson <eulex at xfce.org>
-
- * sv.po: Swedish translation update (Daniel Nylander)
-
-2009-02-07 Maximilian Schleiss <maximilian at xfce.org>
-
- * ja.po: Japanese translation update (Masato Hashimoto)
- * nb.po: Norwegian Bokmål translation update (Terje Uriansrud)
- * zh_CN: Simplified Chinese translation update (Chris K. Zhang)
-
-2009-02-04 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-settings.pot, *.po: Remove the <b> markup from the string I
- just fixed in the keyboard settings dialog. This way no translations
- need to be updated due to that.
-
-2009-01-31 Eren Türkay <erenturkay at xfce.org>
-
- * tr.po: Turkish translation update (Gökmen Görgen, Samed Beyribey)
-
-2009-01-26 Maximilian Schleiss <maximilian at xfce.org>
-
- * ca.po: Catalan translation update (Carles Muñoz Gorriz)
- * uk.po: Ukrainian translation udpate (Dmitry Nikitin)
-
-2009-01-26 Michal Várady <miko.vaji at gmail.com>
-
- * cs.po: Czech translation updated
-
-2009-01-26 Jannis Pohlmann <jannis at xfce.org>
-
- * fi.po: Update translation file for the release.
-
-2009-01-25 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2009-01-25 Og Maciel <ogmaciel at gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2009-01-25 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2009-01-23 Mike Massonnet <mmassonnet at xfce.org>
-
- * fr.po: Updated French translation
-
-2009-01-23 Per Kongstad <pko at xfce.org>
-
- * da.po: Danish translation update (Per Kongstad)
-
-2009-01-19 Maximilian Schleiss <maximilian at xfce.org>
-
- * zh_CN.po, LINGUAS: Simplified Chinese translation added (Chris K. Zhang)
-
-2009-01-18 Maximilian Schleiss <maximilian at xfce.org>
-
- * es.po: Spanish translation update (Abel Martín)
- * ja.po: Japanese translation update (Masato Hashimoto)
-
-2009-01-18 Alexander Toresson <eulex at xfce.org>
-
- * sv.po: Swedish translation update (Daniel Nylander)
-
-2009-01-17 Michal Várady <miko.vaji at gmail.com>
-
- * cs.po: Czech translation updated
-
-2009-01-15 Og Maciel <ogmaciel at gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation.
-
-2009-01-11 Maximilian Schleiss <maximilian at xfce.org>
-
- * ca.po: Catalan translation update (Carles Muñoz Gorriz)
-
-2009-01-10 Lars Nielsen <lars at mit-web.dk>
-
- * da.po: Danish translation update (Per Kongstad)
-
-2009-01-10 Jannis Pohlmann <jannis at xfce.org>
-
- * xfce4-settings.pot, *.po: Update translation files.
-
-2009-01-06 Stavros Giannouris <stavrosg at hellug.gr>
-
- * el.po, LINGUAS: Greek translation added ()
-
-2009-01-03 Michal Várady <miko.vaji at gmail.com>
-
- * cs.po: Czech translation updated
-
-2008-12-31 Michal Várady <miko.vaji at gmail.com>
-
- * cs.po: Czech translation fixed
-
-2008-12-25 Maximilian Schleiss <maximilian at xfce.org>
-
- * id.po: Indonesian translation update (Andhika Padmawan)
-
-2008-12-20 Alexander Toresson <eulex at xfce.org>
-
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
-
-2008-12-16 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-12-12 Maximilian Schleiss <maximilian at xfce.org>
-
- * uk.po, LINGUAS: Ukrainian translation added (Dmitry Nikitin)
-
-2008-12-08 Piarres Beobide <pi at beobide.net>
-
- * eu.po: Basque translation update
-
-2008-12-07 Piarres Beobide <pi at beobide.net>
-
- * eu.po: Basque translation update
-
-2008-12-03 Maximilian Schleiss <maximilian at xfce.org>
-
- * fr.po: French translation update
-
-2008-11-30 Maximilian Schleiss <maximilian at xfce.org>
-
- * ca.po: Catalan translation udpate (Carles Muñoz Gorriz)
- * es.po: Spanish translation update (Abel Martín)
- * ja.po: Japanese translation update (Masato Hashimoto)
-
-2008-11-28 Og Maciel <ogmaciel at gnome.org>
-
- * pt_BR.po: Updated Brazilian Portuguese translation (Henrique P Machado)
-
-2008-11-28 Maximilian Schleiss <maximilian at xfce.org>
-
- * nb.po; LINGUAS: Norwegian Bokmal translation added (Terje Uriansrud)
-
-2008-11-27 Piarre Beobide <pi at beobide.net>
-
- * eu.po, LINGUAS: Basque translation added
-
-2008-11-25 Maximilian Schleiss <maximilian at xfce.org>
-
- * es.po: Spanish translation update (Abel Martín)
-
-2008-11-23 Maximilian Schleiss <maximilian at xfce.org>
-
- * ca.po: Catalan translation udpate (Carles Muñoz Gorriz)
-
-2008-11-21 Michal Várady <miko.vaji at gmail.com>
-
- * cs.po: Czech translation updated
-
-2008-11-19 Eren Türkay <erenturkay at xfce.org>
-
- * tr.po: Add Turkish translation.
-
-2008-11-18 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-11-17 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-11-16 Maximilian Schleiss <maximilian at xfce.org>
-
- * ca.po: Catalan translation udpate (Carles Muñoz Gorriz)
- * de.po: German translation update (Fabian Nowak)
- * es.po: Spanish translation update (Abel Martín)
-
-2008-11-10 Maximilian Schleiss <maximilian at xfce.org>
-
- * ca.po: Catalan translation udpate (Carles Muñoz Gorriz)
- * ja.po: Japanese translation udpate (Nobuhiro Iwamatsu)
-
-2008-11-06 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-11-03 Lars Nielsen <lars at mit-web.dk>
-
- * da.po,LINGUAS: Added Danish translation
-
-2008-11-02 Maximilian Schleiss <maximilian at xfce.org>
-
- * es.po; LINGUAS: Spanish translation added (Abel Martín)
-
-2008-11-01 Michal Várady <miko.vaji at gmail.com>
-
- * cs.po, LINGUAS: Czech translation updated
-
-2008-10-30 Maximilian Schleiss <maximilian at xfce.org>
-
- * id.po: Indonesian translation update (Andhika Padmawan)
-
-2008-10-30 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-10-28 Og Maciel <ogmaciel at gnome.org>
-
- * POTFILES.in: Removed obsolete lines.
- * pt_BR.po: Updated Brazilian Portuguese translation (Vladimir Melo)
-
-2008-10-28 Maximilian Schleiss <maximilian at xfce.org>
-
- * de.po: German translation udpate (Fabian Nowak)
- * fr.po: French translation update
- * id.po: Indonesian translation update (Andhika Padmawan)
-
-2008-10-28 Michal Várady <miko.vaji at gmail.com>
-
- * cs.po, LINGUAS: Czech translation added
-
-2008-10-20 Maximilian Schleiss <maximilian at xfce.org>
-
- * ca.po, LINGUAS: Catalan translation added (Carles Muñoz Gorriz)
- * de.po: German translation update (Fabian Nowak)
- * ja.po: Japanese translation update (Masato Hashimoto)
-
-2008-10-20 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-10-19 Jannis Pohlmann <jannis at xfce.org>
-
- * POTFILES.in: Update file list.
- * de.po: Update German translations.
- * xfce4-settings.pot, *.po: Update strings.
-
-2008-10-18 Maximilian Schleiss <maximilian at xfce.org>
-
- * id.po, LINGUAS: Indonesian translation added (Andhika Padmawan)
- * ja.po, LINGUAS: Japanese translation added (HASHIMOTO Masato)
-
-2008-10-16 Jannis Pohlmann <jannis at xfce.org>
-
- * LINGUAS: Remove hu because hu.po is missing.
-
-2008-10-11 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-10-11 Stephan Arts <stephan at xfce.org>
-
- * nl.po: Dutch translation update
-
-2008-10-10 Maximilian Schleiss <maximilian at xfce.org>
-
- * fr.po: French translation update
-
-2008-10-07 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-10-06 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation.
-
-2008-10-05 Maximilian Schleiss <maximilian at xfce.org>
-
- * de.po, LINGUAS: German translation added (Fabian Nowak)
-
-2008-09-13 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation
-
-2008-09-09 Maximilian Schleiss <maximilian at xfce.org>
-
- * fr.po,LINGUAS: French translation added
-
-2008-09-08 Jannis Pohlmann <jannis at xfce.org>
-
- * *.po, xfce4-settings.pot: Merge strings.
-
-2008-09-08 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation
-
-2008-09-08 Jannis Pohlmann <jannis at xfce.org>
-
- * POTFILES.in: Add missing files.
- * *.po, xfce4-settings.pot: Merge new strings.
-
-2008-09-07 Jannis Pohlmann <jannis at xfce.org>
-
- * POTFILES.in: Add frap-shortcuts.c and frap-shortcuts-dialog.c.
- * *.po, xfce4-settings.pot: Merge new strings.
-
-2008-09-06 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Update Finnish translation
-
-2008-09-06 Jari Rahkonen <jari.rahkonen at pp1.inet.fi>
-
- * fi.po: Add Finnish translation
-
-2008-09-06 Jannis Pohlmann <jannis at xfce.org>
-
- * *.po, xfce4-settings.pot: Merge new strings, remove the old ones.
-
-2008-09-06 Jannis Pohlmann <jannis at xfce.org>
-
- * *.po, xfce4-settings.pot: Merge new strings.
-
-2008-06-25 Og Maciel <ogmaciel at gnome.org>
-
- * pt_BR.po: Added Brazilian Portuguese translation
- by Fábio Nogueira <deb-user-ba at ubuntu.com>
-
-2008-06-21 Stephan Arts <stephan at xfce.org>
-
- * nl.po: Add Dutch translation
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 1202206..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ast ca cs da de el es eu fi fr gl hu id it ja lv nb nl pl pt_BR pt ro ru sk sv tr uk ur ur_PK zh_CN
More information about the Xfce4-commits
mailing list