Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3616 - trunk/src/host/qemu-neo1973 ([EMAIL PROTECTED])
2. r3617 -
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src
([EMAIL PROTECTED])
3. r3618 - in
trunk/src/target/OM-2007.2/applications/openmoko-calculator2: .
po ([EMAIL PROTECTED])
--- Begin Message ---
Author: andrew
Date: 2007-12-09 14:34:09 +0100 (Sun, 09 Dec 2007)
New Revision: 3616
Modified:
trunk/src/host/qemu-neo1973/qemu-timer.h
trunk/src/host/qemu-neo1973/usb-linux-gadget.c
trunk/src/host/qemu-neo1973/vl.c
Log:
Add timer debugging helpers and an ugly hack with no other purpose than to make
usb-gadgetfs work until we can switch to AIO.
Modified: trunk/src/host/qemu-neo1973/qemu-timer.h
===================================================================
--- trunk/src/host/qemu-neo1973/qemu-timer.h 2007-12-07 18:08:01 UTC (rev
3615)
+++ trunk/src/host/qemu-neo1973/qemu-timer.h 2007-12-09 13:34:09 UTC (rev
3616)
@@ -3,6 +3,8 @@
/* timers */
+//#define TIMER_DEBUG
+
typedef struct QEMUClock QEMUClock;
typedef void QEMUTimerCB(void *opaque);
@@ -19,11 +21,25 @@
int64_t qemu_get_clock(QEMUClock *clock);
-QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque);
void qemu_free_timer(QEMUTimer *ts);
void qemu_del_timer(QEMUTimer *ts);
+int qemu_timer_pending(QEMUTimer *ts);
+#ifdef TIMER_DEBUG
+QEMUTimer *__qemu_new_timer(QEMUClock *clock,
+ QEMUTimerCB *cb, void *opaque, const char *line);
+# define qemu_new_timer(clock, cb, opaque) \
+ __qemu_new_timer(clock, cb, opaque, \
+ __FILE__ ":" stringify(__LINE__) " in " __FUNCTION__)
+void __qemu_mod_timer(QEMUTimer *ts, int64_t expire_time, const char *line);
+# define qemu_mod_timer(ts, time) \
+ __qemu_mod_timer(ts, time, \
+ __FILE__ ":" stringify(__LINE__) " in " __FUNCTION__)
+#else
+QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque);
+# define _qemu_new_timer qemu_new_timer
void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time);
-int qemu_timer_pending(QEMUTimer *ts);
+# define _qemu_mod_timer qemu_mod_timer
+#endif
extern int64_t ticks_per_sec;
Modified: trunk/src/host/qemu-neo1973/usb-linux-gadget.c
===================================================================
--- trunk/src/host/qemu-neo1973/usb-linux-gadget.c 2007-12-07 18:08:01 UTC
(rev 3615)
+++ trunk/src/host/qemu-neo1973/usb-linux-gadget.c 2007-12-09 13:34:09 UTC
(rev 3616)
@@ -428,7 +428,7 @@
cfg->bmAttributes = 0xc0; /* dummy_hcd is picky about power */
if (hci->hosthighspeed) {
- /* For high-speed devies we need to set the interval for
+ /* For high-speed devices we need to set the interval for
* Interrupt Enpoints as high as possible so that the host doesn't
* expect really fast responses from the emulator and thus
* time-out on some packets. */
Modified: trunk/src/host/qemu-neo1973/vl.c
===================================================================
--- trunk/src/host/qemu-neo1973/vl.c 2007-12-07 18:08:01 UTC (rev 3615)
+++ trunk/src/host/qemu-neo1973/vl.c 2007-12-09 13:34:09 UTC (rev 3616)
@@ -811,6 +811,10 @@
QEMUTimerCB *cb;
void *opaque;
struct QEMUTimer *next;
+#ifdef TIMER_DEBUG
+ const char *new_line;
+ const char *mod_line;
+#endif
};
struct qemu_alarm_timer {
@@ -976,7 +980,7 @@
return clock;
}
-QEMUTimer *qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque)
+QEMUTimer *_qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque)
{
QEMUTimer *ts;
@@ -987,6 +991,17 @@
return ts;
}
+#ifdef TIMER_DEBUG
+QEMUTimer *__qemu_new_timer(QEMUClock *clock, QEMUTimerCB *cb, void *opaque,
+ const char *new_line)
+{
+ QEMUTimer *ts = _qemu_new_timer(clock, cb, opaque);
+
+ ts->new_line = new_line;
+ return ts;
+}
+#endif
+
void qemu_free_timer(QEMUTimer *ts)
{
qemu_free(ts);
@@ -1014,7 +1029,7 @@
/* modify the current timer so that it will be fired when current_time
>= expire_time. The corresponding callback will be called. */
-void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time)
+void _qemu_mod_timer(QEMUTimer *ts, int64_t expire_time)
{
QEMUTimer **pt, *t;
@@ -1037,6 +1052,14 @@
*pt = ts;
}
+#ifdef TIMER_DEBUG
+void __qemu_mod_timer(QEMUTimer *ts, int64_t expire_time, const char *mod_line)
+{
+ _qemu_mod_timer(ts, expire_time);
+ ts->mod_line = mod_line;
+}
+#endif
+
int qemu_timer_pending(QEMUTimer *ts)
{
QEMUTimer *t;
@@ -1188,6 +1211,10 @@
#endif
CPUState *env = next_cpu;
+ /* FIXME Ugly hack only to make usb-gadgetfs work */
+ if (!alarm_has_dynticks(alarm_timer) && !cpu_single_env)
+ return;
+
/* stop the currently executing cpu because a timer occured */
cpu_interrupt(env, CPU_INTERRUPT_EXIT);
#ifdef USE_KQEMU
--- End Message ---
--- Begin Message ---
Author: ortalo
Date: 2007-12-09 22:29:30 +0100 (Sun, 09 Dec 2007)
New Revision: 3617
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src/calc-main.c
Log:
Simple modif. for svn commit test.
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src/calc-main.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src/calc-main.c
2007-12-09 13:34:09 UTC (rev 3616)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/src/calc-main.c
2007-12-09 21:29:30 UTC (rev 3617)
@@ -81,6 +81,7 @@
{ one, two, three, equal},
{ zero, point, minus, notimplemented},
};
+
/*
* Signal function and static helpers
*/
--- End Message ---
--- Begin Message ---
Author: ortalo
Date: 2007-12-09 22:34:54 +0100 (Sun, 09 Dec 2007)
New Revision: 3618
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/Makefile.am
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/autogen.sh
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/configure.ac
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/Calculator.pot
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/Makefile.in.in
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/fr.po
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/ru.po
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/sv.po
Log:
Update to separate LINGUAS file like other applications.
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-calculator2/Makefile.am
2007-12-09 21:29:30 UTC (rev 3617)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator2/Makefile.am
2007-12-09 21:34:54 UTC (rev 3618)
@@ -1,2 +1,11 @@
AUTOMAKE_OPTIONS=foreign
-SUBDIRS = src data po
\ No newline at end of file
+SUBDIRS = src data po
+
+INTLTOOL_BUILT = \
+ intltool-extract \
+ intltool-merge \
+ intltool-update
+
+EXTRA_DIST = $(INTLTOOL_BUILT:=.in)
+
+DISTCLEANFILES = $(INTLTOOL_BUILT)
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/autogen.sh
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-calculator2/autogen.sh
2007-12-09 21:29:30 UTC (rev 3617)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator2/autogen.sh
2007-12-09 21:34:54 UTC (rev 3618)
@@ -1,4 +1,5 @@
#! /bin/sh
autoreconf -v --install || exit 1
glib-gettextize --force --copy || exit 1
+intltoolize --force --copy || exit 1
./configure --enable-maintainer-mode "$@"
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-calculator2/configure.ac
2007-12-09 21:29:30 UTC (rev 3617)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator2/configure.ac
2007-12-09 21:34:54 UTC (rev 3618)
@@ -11,10 +11,10 @@
AC_PROG_LIBTOOL
dnl i18n support
+AC_PROG_INTLTOOL([0.23])
GETTEXT_PACKAGE=Calculator
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
AC_SUBST(GETTEXT_PACKAGE)
-ALL_LINGUAS="fr ru sv"
AM_GLIB_GNU_GETTEXT
# base deps
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/Calculator.pot
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/Calculator.pot
2007-12-09 21:29:30 UTC (rev 3617)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/Calculator.pot
2007-12-09 21:34:54 UTC (rev 3618)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-26 22:34+0200\n"
+"POT-Creation-Date: 2007-12-08 20:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -16,36 +16,31 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/calc-main.c:83
-msgid "Clear All"
+#: src/calc-main.c:71
+msgid "CE"
msgstr ""
-#: src/calc-main.c:83
-msgid "Clear"
+#: src/calc-main.c:71
+msgid "C"
msgstr ""
-#: src/calc-main.c:87
-msgid "<big><b>.</b></big>"
+#: src/calc-main.c:75
+msgid "."
msgstr ""
-#: src/calc-main.c:132
-msgid "<big>Not a Number</big><span font_desc=\"48\" > <b>NaN</b></span>"
+#: src/calc-main.c:101
+msgid "Error"
msgstr ""
-#: src/calc-main.c:136
+#: src/calc-main.c:105
msgid ""
-"<big>Not a Number</big> <span font_desc=\"48\" ><b>NaN</b></span>\n"
+"Error\n"
"<span foreground=\"darkgrey\" size=\"smaller\">covert_channel/ack</span>\n"
"<span foreground=\"orange\" style=\"italic\">Beam request transmitted...</"
"span>"
msgstr ""
-#. application object
-#. MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
-#: src/calc-main.c:374
+#. application
+#: src/calc-main.c:342
msgid "Calculator"
msgstr ""
-
-#: src/calc-main.c:381
-msgid "Close"
-msgstr ""
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/Makefile.in.in
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/Makefile.in.in
2007-12-09 21:29:30 UTC (rev 3617)
+++
trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/Makefile.in.in
2007-12-09 21:34:54 UTC (rev 3618)
@@ -11,80 +11,82 @@
#
# - Modified by jacob berkman <[EMAIL PROTECTED]> to install
# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <[EMAIL PROTECTED]> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
[EMAIL PROTECTED]@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
datadir = @datadir@
+datarootdir = @datarootdir@
libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @[EMAIL PROTECTED]
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
-CC = @CC@
-GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir)
$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir)
$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
-INCLUDES = -I.. -I$(top_srcdir)/intl
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#"
$(srcdir)/LINGUAS; fi)
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)";
ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep
^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then
printf "$$lang "; fi; done; fi)
-SOURCES =
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
-$(POFILES) $(GMOFILES) $(SOURCES)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then
LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then
LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in
$$LLINGUAS; do printf "$$lang "; done)
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf
"$$lang.po "; done)
+
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+
POTFILES = \
+# This comment gets stripped out
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf
"$$lang.gmo "; done)
.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-.c.o:
- $(COMPILE) $<
-
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox
+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
$(MSGFMT) -o $@ $<
.po.gmo:
- file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $<
+ file=`echo $* | sed 's,.*/,,'`.gmo \
+ && rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
- && rm -f $@ && $(GENCAT) $@ $*.msg
+ && rm -f $@ && gencat $@ $*.msg
all: [EMAIL PROTECTED]@
@@ -92,141 +94,98 @@
all-yes: $(CATALOGS)
all-no:
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
- $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE)
--directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
- --flag=g_strdup_printf:1:c-format \
- --flag=g_string_printf:2:c-format \
- --flag=g_string_append_printf:2:c-format \
- --flag=g_error_new:3:c-format \
- --flag=g_set_error:4:c-format \
- --flag=g_markup_printf_escaped:1:c-format \
- --flag=g_log:3:c-format \
- --flag=g_print:1:c-format \
- --flag=g_printerr:1:c-format \
- --flag=g_printf:1:c-format \
- --flag=g_fprintf:2:c-format \
- --flag=g_sprintf:2:c-format \
- --flag=g_snprintf:3:c-format \
- --flag=g_scanner_error:2:c-format \
- --flag=g_scanner_warn:2:c-format \
- --files-from=$(srcdir)/POTFILES.in \
- && test ! -f $(GETTEXT_PACKAGE).po \
- || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
- && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot )
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+ $(GENPOT)
-install: install-exec install-data
-install-exec:
+install: install-data
install-data: [EMAIL PROTECTED]@
install-data-no: all
install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- fi
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $$dir; \
+ $(mkdir_p) $(DESTDIR)$(itlocaledir)
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $$dir; \
+ if test -r $$lang.gmo; then \
+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $(srcdir)/$$lang.gmo as" \
+ "$$dir/$(GETTEXT_PACKAGE).mo"; \
fi; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
+ if test -r $$lang.gmo.m; then \
+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
- fi; \
- if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $$cat.m as
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
- else \
- if test -r $(srcdir)/$$cat.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$cat.m \
- $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- echo "installing $(srcdir)/$$cat as" \
- "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
+ if test -r $(srcdir)/$$lang.gmo.m ; then \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+ $$dir/$(GETTEXT_PACKAGE).mo.m; \
+ echo "installing $(srcdir)/$$lang.gmo.m as" \
+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
true; \
fi; \
fi; \
done
- if test "$(PACKAGE)" = "glib"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
- $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- else \
- $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- fi; \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
+
# Define this as empty until I found a useful application.
-installcheck:
+install-exec installcheck:
uninstall:
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- rm -f
$(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- rm -f
$(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m;
\
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
- if test "$(PACKAGE)" = "glib"; then \
- rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+
+check: all $(GETTEXT_PACKAGE).pot
+ rm -f missing notexist
+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+ if [ -r missing -o -r notexist ]; then \
+ exit 1; \
fi
-check: all
-
-dvi info tags TAGS ID:
-
mostlyclean:
- rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
- rm -fr *.o
+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+ rm -f .intltool-merge-cache
clean: mostlyclean
distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+ rm -f Makefile Makefile.in POTFILES stamp-it
+ rm -f *.mo *.msg *.cat *.cat.m *.gmo
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
- rm -f $(GMOFILES)
+ rm -f Makefile.in.in
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
dists="$(DISTFILES)"; \
+ extra_dists="$(EXTRA_DISTFILES)"; \
+ for file in $$extra_dists; do \
+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+ done; \
for file in $$dists; do \
- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
- || cp -p $(srcdir)/$$file $(distdir); \
+ test -f $$file || file="$(srcdir)/$$file"; \
+ ln $$file $(distdir) 2> /dev/null \
+ || cp -p $$file $(distdir); \
done
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- cd $(srcdir); \
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
echo "$$lang:"; \
- if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o
$$tmpdir/$$lang.new.po; then \
- if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+ if $$result; then \
+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1;
then \
rm -f $$tmpdir/$$lang.new.po; \
else \
if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
@@ -238,32 +197,20 @@
fi; \
fi; \
else \
- echo "msgmerge for $$cat failed!"; \
+ echo "msgmerge for $$lang.gmo failed!"; \
rm -f $$tmpdir/$$lang.new.po; \
fi; \
done
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
- ( if test 'x$(srcdir)' != 'x.'; then \
- posrcprefix='$(top_srcdir)/'; \
- else \
- posrcprefix="../"; \
- fi; \
- rm -f [EMAIL PROTECTED] $@ \
- && (sed -e '/^#/d' \
- -e "s/^\[.*\] +//" \
- -e '/^[ ]*$$/d' \
- -e "[EMAIL PROTECTED]@ $$posrcprefix& \\\\@" <
$(srcdir)/[EMAIL PROTECTED] \
- | sed -e '$$s/\\$$//') > [EMAIL PROTECTED] \
- && chmod a-w [EMAIL PROTECTED] \
- && mv [EMAIL PROTECTED] $@ )
+Makefile POTFILES: stamp-it
+ @if test ! -f $@; then \
+ rm -f stamp-it; \
+ $(MAKE) stamp-it; \
+ fi
-Makefile: Makefile.in.in ../config.status POTFILES
- cd .. \
- && CONFIG_FILES=$(subdir)/[EMAIL PROTECTED] CONFIG_HEADERS= \
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
$(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/fr.po
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/fr.po
2007-12-09 21:29:30 UTC (rev 3617)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/fr.po
2007-12-09 21:34:54 UTC (rev 3618)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openmoko-calculator 0.0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-26 22:34+0200\n"
+"POT-Creation-Date: 2007-12-08 20:04+0100\n"
"PO-Revision-Date: 2007-07-26 22:39+0200\n"
"Last-Translator: ortalo <[EMAIL PROTECTED]>\n"
"Language-Team: French <[EMAIL PROTECTED]>\n"
@@ -16,25 +16,26 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/calc-main.c:83
-msgid "Clear All"
-msgstr "RAZ"
+#: src/calc-main.c:71
+msgid "CE"
+msgstr ""
-#: src/calc-main.c:83
-msgid "Clear"
-msgstr "Effacer"
+#: src/calc-main.c:71
+msgid "C"
+msgstr ""
-#: src/calc-main.c:87
-msgid "<big><b>.</b></big>"
-msgstr "<big><b>,</b></big>"
+#: src/calc-main.c:75
+msgid "."
+msgstr ""
-#: src/calc-main.c:132
-msgid "<big>Not a Number</big><span font_desc=\"48\" > <b>NaN</b></span>"
+#: src/calc-main.c:101
+msgid "Error"
msgstr ""
-#: src/calc-main.c:136
+#: src/calc-main.c:105
+#, fuzzy
msgid ""
-"<big>Not a Number</big> <span font_desc=\"48\" ><b>NaN</b></span>\n"
+"Error\n"
"<span foreground=\"darkgrey\" size=\"smaller\">covert_channel/ack</span>\n"
"<span foreground=\"orange\" style=\"italic\">Beam request transmitted...</"
"span>"
@@ -44,12 +45,19 @@
"<span foreground=\"orange\" style=\"italic\">Téléportation "
"demandée...</span>"
-#. application object
-#. MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
-#: src/calc-main.c:374
+#. application
+#: src/calc-main.c:342
msgid "Calculator"
msgstr "Calculatrice"
-#: src/calc-main.c:381
-msgid "Close"
-msgstr "Fermer"
+#~ msgid "Clear All"
+#~ msgstr "RAZ"
+
+#~ msgid "Clear"
+#~ msgstr "Effacer"
+
+#~ msgid "<big><b>.</b></big>"
+#~ msgstr "<big><b>,</b></big>"
+
+#~ msgid "Close"
+#~ msgstr "Fermer"
Modified: trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/ru.po
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/ru.po
2007-12-09 21:29:30 UTC (rev 3617)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/ru.po
2007-12-09 21:34:54 UTC (rev 3618)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openmoko-calculator 0.0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-26 22:34+0200\n"
+"POT-Creation-Date: 2007-12-08 20:04+0100\n"
"PO-Revision-Date: 2007-04-03 17:33+0300\n"
"Last-Translator: Evgeny Ginzburg <[EMAIL PROTECTED]>\n"
"Language-Team: \n"
@@ -15,36 +15,43 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/calc-main.c:83
-msgid "Clear All"
-msgstr "Очистить всё"
+#: src/calc-main.c:71
+msgid "CE"
+msgstr ""
-#: src/calc-main.c:83
-msgid "Clear"
-msgstr "Очистить"
+#: src/calc-main.c:71
+msgid "C"
+msgstr ""
-#: src/calc-main.c:87
-msgid "<big><b>.</b></big>"
-msgstr "<big><b>.</b></big>"
+#: src/calc-main.c:75
+msgid "."
+msgstr ""
-#: src/calc-main.c:132
-msgid "<big>Not a Number</big><span font_desc=\"48\" > <b>NaN</b></span>"
+#: src/calc-main.c:101
+msgid "Error"
msgstr ""
-#: src/calc-main.c:136
+#: src/calc-main.c:105
msgid ""
-"<big>Not a Number</big> <span font_desc=\"48\" ><b>NaN</b></span>\n"
+"Error\n"
"<span foreground=\"darkgrey\" size=\"smaller\">covert_channel/ack</span>\n"
"<span foreground=\"orange\" style=\"italic\">Beam request transmitted...</"
"span>"
msgstr ""
-#. application object
-#. MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
-#: src/calc-main.c:374
+#. application
+#: src/calc-main.c:342
msgid "Calculator"
msgstr "Калькулятор"
-#: src/calc-main.c:381
-msgid "Close"
-msgstr "Закрыть"
+#~ msgid "Clear All"
+#~ msgstr "Очистить всё"
+
+#~ msgid "Clear"
+#~ msgstr "Очистить"
+
+#~ msgid "<big><b>.</b></big>"
+#~ msgstr "<big><b>.</b></big>"
+
+#~ msgid "Close"
+#~ msgstr "Закрыть"
Modified: trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/sv.po
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/sv.po
2007-12-09 21:29:30 UTC (rev 3617)
+++ trunk/src/target/OM-2007.2/applications/openmoko-calculator2/po/sv.po
2007-12-09 21:34:54 UTC (rev 3618)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openmoko calculator\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-26 22:34+0200\n"
+"POT-Creation-Date: 2007-12-08 20:04+0100\n"
"PO-Revision-Date: 2007-04-04 11:18+0100\n"
"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
@@ -15,36 +15,43 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/calc-main.c:83
-msgid "Clear All"
-msgstr "Töm allt"
+#: src/calc-main.c:71
+msgid "CE"
+msgstr ""
-#: src/calc-main.c:83
-msgid "Clear"
-msgstr "Töm"
+#: src/calc-main.c:71
+msgid "C"
+msgstr ""
-#: src/calc-main.c:87
-msgid "<big><b>.</b></big>"
-msgstr "<big><b>.</b></big>"
+#: src/calc-main.c:75
+msgid "."
+msgstr ""
-#: src/calc-main.c:132
-msgid "<big>Not a Number</big><span font_desc=\"48\" > <b>NaN</b></span>"
+#: src/calc-main.c:101
+msgid "Error"
msgstr ""
-#: src/calc-main.c:136
+#: src/calc-main.c:105
msgid ""
-"<big>Not a Number</big> <span font_desc=\"48\" ><b>NaN</b></span>\n"
+"Error\n"
"<span foreground=\"darkgrey\" size=\"smaller\">covert_channel/ack</span>\n"
"<span foreground=\"orange\" style=\"italic\">Beam request transmitted...</"
"span>"
msgstr ""
-#. application object
-#. MokoApplication* app = MOKO_APPLICATION(moko_application_get_instance());
-#: src/calc-main.c:374
+#. application
+#: src/calc-main.c:342
msgid "Calculator"
msgstr "Miniräknare"
-#: src/calc-main.c:381
-msgid "Close"
-msgstr "Stäng"
+#~ msgid "Clear All"
+#~ msgstr "Töm allt"
+
+#~ msgid "Clear"
+#~ msgstr "Töm"
+
+#~ msgid "<big><b>.</b></big>"
+#~ msgstr "<big><b>.</b></big>"
+
+#~ msgid "Close"
+#~ msgstr "Stäng"
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
