@@ -1,5 +1,3 @@ -- localization - code-cleanup - online-help (yelp) -- use GOption instead of getopt - use GList instead of my home-grown linked-list stuff TODO @@ -1,156 +1,15 @@ -#! /bin/sh +#!/bin/sh -if [ -z "$USE_SHELL" ]; then - USE_SHELL=/bin/sh; export USE_SHELL -fi +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. -(eval 'echo $((1+1))') >/dev/null 2>&1 || { - if [ -x /bin/ksh ]; then - USE_SHELL=/bin/ksh - elif [ -x /usr/xpg4/bin/sh ]; then - USE_SHELL=/usr/xpg4/bin/sh - else - echo "please install /bin/ksh or /usr/xpg4/bin/sh" - exit - fi - export USE_SHELL - echo "restarting under $USE_SHELL..." - $USE_SHELL $0 "$@" - exit -} - -TOP_DIR=$(cd $(dirname $0); echo $PWD) -LAST_DIR=$PWD +ORIGDIR=`pwd` +cd $srcdir -if test ! -f $TOP_DIR/configure.ac ; then - echo "You must execute this script from the top level directory." - exit 1 -fi +autoreconf -v --install || exit 1 +intltoolize --copy --force --automake || exit 1 +glib-gettextize --copy --force || exit 1 -# Functions -dump_help_screen () -{ - echo "Usage: autogen.sh [options]" - echo - echo "options:" - echo " -h,--help Show this help screen" - echo - exit 0 -} +cd $ORIGDIR || exit $? -parse_options () -{ - while test "$1" != "" ; do - case $1 in - -h|--help) - dump_help_screen - ;; - *) - echo Invalid argument - $1 - dump_help_screen - ;; - esac - shift - done -} - -run_or_die_shell () -{ - run_or_die $USE_SHELL "$@" -} - -run_or_die () -{ - COMMAND=$1 - - # check for empty commands - if test -z "$COMMAND" ; then - echo "*warning* no command specified" - return 1 - fi - - shift; - - OPTIONS="$@" - - # print a message - printf "*info* running $COMMAND" - if test -n "$OPTIONS" ; then - echo " ($OPTIONS)" - else - echo - fi - - # run or die - $COMMAND $OPTIONS ; RESULT=$? - if test $RESULT -ne 0 ; then - echo "*error* $COMMAND failed. (exit code = $RESULT)" - exit 1 - fi - - return 0 -} - -# Main run -parse_options "$@" -cd $TOP_DIR - -AUTOCONF=${AUTOCONF:-autoconf} -AUTOMAKE=${AUTOMAKE:-automake} -ACLOCAL=${ACLOCAL:-aclocal} -AUTOHEADER=${AUTOHEADER:-autoheader} -LIBTOOLIZE=${LIBTOOLIZE:-libtoolize} - -# Check for proper automake version -automake_maj_req=1 -automake_min_req=9 - -printf "Checking Automake version..." - -automake_version=`$AUTOMAKE --version | head -n1 | cut -f 4 -d \ ` -automake_major=$(echo $automake_version | cut -f 1 -d . | sed -e 's:^\([0-9]\+\).*$:\1:') -automake_minor=$(echo $automake_version | cut -f 2 -d . | sed -e 's:^\([0-9]\+\).*$:\1:') -automake_micro=$(echo $automake_version | cut -f 3 -d . | sed -e 's:^\([0-9]\+\).*$:\1:') - -printf "$automake_major.$automake_minor.$automake_micro.: " - -if [ $automake_major -ge $automake_maj_req ]; then - if [ $automake_minor -lt $automake_min_req ]; then - echo "error: cairo-clock requires automake $automake_maj_req.$automake_min_req" - exit 1 - else - echo "ok" - fi -fi - -# Check for proper autoconf version -autoconf_maj_req=2 -autoconf_min_req=52 - -printf "Checking Autoconf version... " - -autoconf_version=`$AUTOCONF --version | head -n1 | cut -f 4 -d \ ` -autoconf_major=$(echo $autoconf_version | cut -f 1 -d . | sed -e 's:^\([0-9]\+\).*$:\1:') -autoconf_minor=$(echo $autoconf_version | cut -f 2 -d . | sed -e 's:^\([0-9]\+\).*$:\1:') - -printf "$autoconf_major.$autoconf_minor..: " - -if [ $autoconf_major -ge $autoconf_maj_req ]; then - if [ $autoconf_minor -lt $autoconf_min_req ]; then - echo "error: cairo-clock requires autoconf $autoconf_maj_req.$autoconf_min_req" - exit 1 - else - echo "ok" - fi -fi - -touch ChangeLog - -run_or_die $ACLOCAL -I m4 -run_or_die $LIBTOOLIZE -f -c --automake -run_or_die $ACLOCAL -I m4 -run_or_die $AUTOCONF -run_or_die $AUTOHEADER -run_or_die $AUTOMAKE -a -c - -cd $LAST_DIR +$srcdir/configure --enable-maintainer-mode "$@" \ No newline at end of file autogen.sh @@ -1,15 +1,24 @@ -dnl Process this file with autoconf to produce a configure script. +AC_PREREQ([2.57]) -AC_INIT([cairo-clock], [0.3.3]) -AC_PREREQ([2.5]) +m4_define(cairo_clock_version_major, 0) +m4_define(cairo_clock_version_minor, 3) +m4_define(cairo_clock_version_micro, 3) -AC_CANONICAL_BUILD -AC_CANONICAL_HOST -AC_CANONICAL_TARGET +AC_INIT([cairo-clock], + [cairo_clock_version_major().cairo_clock_version_minor().cairo_clock_version_micro()], + [macslow@bangang.de]) -AM_INIT_AUTOMAKE([1.8]) +CAIRO_CLOCK_VERSION_MAJOR=cairo_clock_version_major() +CAIRO_CLOCK_VERSION_MINOR=cairo_clock_version_minor() +CAIRO_CLOCK_VERSION_MICRO=cairo_clock_version_micro() +AC_SUBST(CAIRO_CLOCK_VERSION_MAJOR) +AC_SUBST(CAIRO_CLOCK_VERSION_MINOR) +AC_SUBST(CAIRO_CLOCK_VERSION_MICRO) -AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([1.9]) +AC_CONFIG_HEADER([config.h]) +AC_PROG_INTLTOOL([0.23]) +AM_MAINTAINER_MODE dnl Check for C compiler AC_LANG([C]) @@ -54,6 +63,17 @@ AC_DISABLE_STATIC AC_ENABLE_SHARED AC_PROG_LIBTOOL +dnl intltool +ALL_LINGUAS="de" +AC_SUBST(ALL_LINGUAS) +AM_GLIB_GNU_GETTEXT +GETTEXT_PACKAGE=cairo-clock +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) +AC_SUBST(GETTEXT_PACKAGE) + +cairoclocklocaledir='${prefix}/${DATADIRNAME}/locale' +AC_SUBST(cairoclocklocaledir) + dnl pkg-config PKG_PROG_PKG_CONFIG @@ -65,11 +85,11 @@ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.10.0]) dnl GTK Deps+Libglade PKG_CHECK_MODULES([GTK_DEP], - [cairo >= 1.0.0 + [cairo >= 1.2.0 pango >= 1.10.0 pangocairo >= 1.10.0 - libglade-2.0 >= 2.5.1 - librsvg-2.0 >= 2.13.91]) + libglade-2.0 >= 2.6.0 + librsvg-2.0 >= 2.14.0]) dnl CLOCK defines CLOCK_DEFINES='-DDATA_DIR="\"$(datadir)\"" -DPKGDATA_DIR="\"$(pkgdatadir)\""' @@ -86,6 +106,7 @@ AC_CONFIG_FILES([ glade/Makefile src/Makefile man/Makefile + po/Makefile.in themes/Makefile themes/fdo/Makefile themes/simple/Makefile configure.ac @@ -1,8 +1,5 @@ desktopdir = $(datadir)/applications -desktop_DATA = \ - cairo-clock.desktop - -EXTRA_DIST = \ - cairo-clock.desktop.in - +desktop_in_files = cairo-clock.desktop.in +desktop_DATA = $(cairo_clock_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ desktop/Makefile.am @@ -1,14 +1,8 @@ [Desktop Entry] Type=Application Encoding=UTF-8 -Name=MacSlow's Cairo-Clock -Name[de]=MacSlow's Cairo-Uhr -Name[en]=MacSlow's Cairo-Clock -Name[fr]=MacSlow's Cairo-Heure -Comment=a super fine analog clock -Comment[de]=eine total tolle Analoguhr -Comment[en]=a super fine analog clock -Comment[fr]=une formidable heure analogue +_Name=MacSlow's Cairo-Clock +_Comment=a super fine analog clock Exec=cairo-clock Icon=cairo-clock Categories=GNOME;Application;Utility; desktop/cairo-clock.desktop.in @@ -3,19 +3,20 @@ transform = s/_/-/g cairo_clock_LDFLAGS = -Wl, --export-dynamic -cairo_clock_LDADD = \ - $(GLIB_LIBS) \ - $(GTK_LIBS) \ +cairo_clock_LDADD = \ + $(GLIB_LIBS) \ + $(GTK_LIBS) \ $(GTK_DEP_LIBS) -cairo_clock_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/include \ - -DG_LOG_DOMAIN=\"CairoClock\" \ - $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) $(GTK_DEP_CFLAGS) \ - $(CLOCK_DEFINES) \ - -D_XOPEN_SOURCE=600 +cairo_clock_CFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -DG_LOG_DOMAIN=\"CairoClock\" \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) $(GTK_DEP_CFLAGS) \ + $(CLOCK_DEFINES) \ + -D_XOPEN_SOURCE=600 \ + -DCAIROCLOCKLOCALEDIR=\""$(cairoclocklocaledir)"\" cairo_clock_SOURCES = \ cairo-clock.c src/Makefile.am @@ -31,7 +31,9 @@ ** Truchan <moppsy@comcast.net> ** *******************************************************************************/ - + +#include "config.h" + #include <time.h> #include <math.h> #include <string.h> @@ -51,9 +53,6 @@ #include <gdk/gdkx.h> #endif -#define GETTEXT_PACKAGE "cairo-clock" -#define LOCALEDIR "mo" - #define SECOND_INTERVAL 1000 #define MINUTE_INTERVAL 60000 #define MIN_WIDTH 32 @@ -827,9 +826,9 @@ write_settings (gchar* pcFilePath, return FALSE; fprintf (fileHandle, - "%s %s %s\n", "# This file is machine-generated.", - "Do not edit it manually!", - "I really mean it!!!"); + "%s %s %s\n", _("# This file is machine-generated."), + _("Do not edit it manually!"), + _("I really mean it!!!")); fprintf (fileHandle, "x=%d\n", iX); fprintf (fileHandle, "y=%d\n", iY); fprintf (fileHandle, "width=%d\n", iWidth); @@ -872,7 +871,7 @@ on_close_clicked (GtkButton* pButton, g_iSticky, g_i24, g_iRefreshRate)) - printf ("Ups, there was an error while trying to save the preferences!\n"); + printf (_("Ups, there was an error while trying to save the preferences!\n")); if (pcFilename) free (pcFilename); @@ -1327,116 +1326,116 @@ main (int argc, 0, G_OPTION_ARG_INT, &g_iDefaultX, - "x-position of the top-left window-corner", + _("x-position of the top-left window-corner"), "X"}, {"yposition", 'y', 0, G_OPTION_ARG_INT, &g_iDefaultY, - "y-position of the top-left window-corner", + _("y-position of the top-left window-corner"), "Y"}, {"width", 'w', 0, G_OPTION_ARG_INT, &g_iDefaultWidth, - "open window with this width", + _("open window with this width"), "WIDTH"}, {"height", 'h', 0, G_OPTION_ARG_INT, &g_iDefaultHeight, - "open window with this height", + _("open window with this height"), "HEIGHT"}, {"seconds", 's', 0, G_OPTION_ARG_NONE, &g_iShowSeconds, - "draw seconds hand", + _("draw seconds hand"), NULL}, {"date", 'd', 0, G_OPTION_ARG_NONE, &g_iShowDate, - "draw data-display", + _("draw date-display"), NULL}, {"list", 'l', 0, G_OPTION_ARG_NONE, &bPrintThemeList, - "list installed themes and exit", + _("list installed themes and exit"), NULL}, {"theme", 't', 0, G_OPTION_ARG_STRING, &g_pcTheme, - "theme to draw the clock with", + _("theme to draw the clock with"), "NAME"}, {"ontop", 'o', 0, G_OPTION_ARG_NONE, &g_iKeepOnTop, - "clock-window stays on top of all windows", + _("clock-window stays on top of all windows"), NULL}, {"pager", 'p', 0, G_OPTION_ARG_NONE, &g_iAppearInPager, - "clock-window shows up in pager", + _("clock-window shows up in pager"), NULL}, {"taskbar", 'b', 0, G_OPTION_ARG_NONE, &g_iAppearInTaskbar, - "clock-window shows up in taskbar", + _("clock-window shows up in taskbar"), NULL}, {"sticky", 'i', 0, G_OPTION_ARG_NONE, &g_iSticky, - "clock-window sticks to all workspaces", + _("clock-window sticks to all workspaces"), NULL}, {"twelve", 'e', 0, G_OPTION_ARG_NONE, &g_i12, - "hands work in 12 hour mode", + _("hands work in 12 hour mode"), NULL}, {"twentyfour", 'f', 0, G_OPTION_ARG_NONE, &g_i24, - "hands work in 24 hour mode", + _("hands work in 24 hour mode"), NULL}, {"refresh", 'r', 0, G_OPTION_ARG_INT, &g_iRefreshRate, - "render at RATE (default: 30 Hz)", + _("render at RATE (default: 30 Hz)"), "RATE"}, {"version", 'v', 0, G_OPTION_ARG_NONE, &bPrintVersion, - "print version of program and exit", + _("print version of program and exit"), NULL}, {NULL}}; - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, CAIROCLOCKLOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); @@ -1452,7 +1451,7 @@ main (int argc, if (argc > 1) { /* setup and process command-line options */ - pOptionContext = g_option_context_new ("- analog clock drawn with vector-graphics"); + pOptionContext = g_option_context_new (_("- analog clock drawn with vector-graphics")); g_option_context_add_main_entries (pOptionContext, aOptions, "cairo-clock"); @@ -1520,7 +1519,7 @@ main (int argc, pGladeXml = glade_xml_new (get_glade_filename (), NULL, NULL); if (!pGladeXml) { - printf ("Could not load \"%s\"!\n", get_glade_filename ()); + printf (_("Could not load \"%s\"!\n"), get_glade_filename ()); exit (1); } @@ -1635,7 +1634,7 @@ main (int argc, get_icon_filename (), NULL); gtk_window_set_title (GTK_WINDOW (g_pMainWindow), - "MacSlow's Cairo-Clock"); + _("MacSlow's Cairo-Clock")); gtk_window_set_default_size (GTK_WINDOW (g_pMainWindow), g_iDefaultWidth, g_iDefaultHeight); @@ -1820,7 +1819,7 @@ main (int argc, g_iSticky, g_i24, g_iRefreshRate)) - printf ("Ups, error while trying to save the preferences!\n"); + printf (_("Ups, error while trying to save the preferences!\n")); if (pcFilename) free (pcFilename); src/cairo-clock.c af1dc91d027184726acbda97075282e9f0c541d6 Mirco Müller macslow@bangang.de http://github.com/stephane/cairo-clock/commit/c48dcae1521768a3f9ce2029093c49a7b7646beb c48dcae1521768a3f9ce2029093c49a7b7646beb 2007-08-16T22:45:18-07:00 2007-08-16T22:45:18-07:00 implemented localization d10eca1240d108680e46482e6b50251460978b1f macslow mirco@vaio.(none)