[Wesnoth-cvs-commits] wesnoth utils/wmlxgettext po/wesnoth-editor/Mak...

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/10/21 19:54:40

Modified files:
        utils          : wmlxgettext 
        po/wesnoth-editor: Makefile.in.in 
        po/wesnoth-ei  : Makefile.in.in 
        po/wesnoth-httt: Makefile.in.in 
        po/wesnoth-lib : Makefile.in.in 
        po/wesnoth-sotbe: Makefile.in.in 
        po/wesnoth-tdh : Makefile.in.in 
        po/wesnoth-trow: Makefile.in.in 
        po/wesnoth     : Makefile.in.in 

Log message:
        add --directory option to wmlxgettext so that running out of source 
tree works as expected

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/utils/wmlxgettext.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-editor/Makefile.in.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-ei/Makefile.in.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/Makefile.in.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-lib/Makefile.in.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/Makefile.in.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-tdh/Makefile.in.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-trow/Makefile.in.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/Makefile.in.in.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: wesnoth/po/wesnoth-editor/Makefile.in.in
diff -u wesnoth/po/wesnoth-editor/Makefile.in.in:1.2 
wesnoth/po/wesnoth-editor/Makefile.in.in:1.3
--- wesnoth/po/wesnoth-editor/Makefile.in.in:1.2        Fri Oct 15 19:03:27 2004
+++ wesnoth/po/wesnoth-editor/Makefile.in.in    Thu Oct 21 19:54:39 2004
@@ -114,7 +114,7 @@
          --keyword=_ --keyword=N_ \
          --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
        if test -r FINDCFG ;\
-       then $(top_srcdir)/utils/wmlxgettext \
+       then $(top_srcdir)/utils/wmlxgettext --directory=$(top_srcdir) \
          `cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
        fi
        if test -f $(DOMAIN).wml.po ; then \
Index: wesnoth/po/wesnoth-ei/Makefile.in.in
diff -u wesnoth/po/wesnoth-ei/Makefile.in.in:1.2 
wesnoth/po/wesnoth-ei/Makefile.in.in:1.3
--- wesnoth/po/wesnoth-ei/Makefile.in.in:1.2    Fri Oct 15 19:03:27 2004
+++ wesnoth/po/wesnoth-ei/Makefile.in.in        Thu Oct 21 19:54:39 2004
@@ -114,7 +114,7 @@
          --keyword=_ --keyword=N_ \
          --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
        if test -r FINDCFG ;\
-       then $(top_srcdir)/utils/wmlxgettext \
+       then $(top_srcdir)/utils/wmlxgettext --directory=$(top_srcdir) \
          `cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
        fi
        if test -f $(DOMAIN).wml.po ; then \
Index: wesnoth/po/wesnoth-httt/Makefile.in.in
diff -u wesnoth/po/wesnoth-httt/Makefile.in.in:1.2 
wesnoth/po/wesnoth-httt/Makefile.in.in:1.3
--- wesnoth/po/wesnoth-httt/Makefile.in.in:1.2  Fri Oct 15 19:03:27 2004
+++ wesnoth/po/wesnoth-httt/Makefile.in.in      Thu Oct 21 19:54:39 2004
@@ -114,7 +114,7 @@
          --keyword=_ --keyword=N_ \
          --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
        if test -r FINDCFG ;\
-       then $(top_srcdir)/utils/wmlxgettext \
+       then $(top_srcdir)/utils/wmlxgettext --directory=$(top_srcdir) \
          `cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
        fi
        if test -f $(DOMAIN).wml.po ; then \
Index: wesnoth/po/wesnoth-lib/Makefile.in.in
diff -u wesnoth/po/wesnoth-lib/Makefile.in.in:1.2 
wesnoth/po/wesnoth-lib/Makefile.in.in:1.3
--- wesnoth/po/wesnoth-lib/Makefile.in.in:1.2   Fri Oct 15 19:03:27 2004
+++ wesnoth/po/wesnoth-lib/Makefile.in.in       Thu Oct 21 19:54:39 2004
@@ -114,7 +114,7 @@
          --keyword=_ --keyword=N_ \
          --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
        if test -r FINDCFG ;\
-       then $(top_srcdir)/utils/wmlxgettext \
+       then $(top_srcdir)/utils/wmlxgettext --directory=$(top_srcdir) \
          `cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
        fi
        if test -f $(DOMAIN).wml.po ; then \
Index: wesnoth/po/wesnoth-sotbe/Makefile.in.in
diff -u wesnoth/po/wesnoth-sotbe/Makefile.in.in:1.2 
wesnoth/po/wesnoth-sotbe/Makefile.in.in:1.3
--- wesnoth/po/wesnoth-sotbe/Makefile.in.in:1.2 Fri Oct 15 19:03:27 2004
+++ wesnoth/po/wesnoth-sotbe/Makefile.in.in     Thu Oct 21 19:54:39 2004
@@ -114,7 +114,7 @@
          --keyword=_ --keyword=N_ \
          --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
        if test -r FINDCFG ;\
-       then $(top_srcdir)/utils/wmlxgettext \
+       then $(top_srcdir)/utils/wmlxgettext --directory=$(top_srcdir) \
          `cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
        fi
        if test -f $(DOMAIN).wml.po ; then \
Index: wesnoth/po/wesnoth-tdh/Makefile.in.in
diff -u wesnoth/po/wesnoth-tdh/Makefile.in.in:1.2 
wesnoth/po/wesnoth-tdh/Makefile.in.in:1.3
--- wesnoth/po/wesnoth-tdh/Makefile.in.in:1.2   Fri Oct 15 19:03:27 2004
+++ wesnoth/po/wesnoth-tdh/Makefile.in.in       Thu Oct 21 19:54:39 2004
@@ -114,7 +114,7 @@
          --keyword=_ --keyword=N_ \
          --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
        if test -r FINDCFG ;\
-       then $(top_srcdir)/utils/wmlxgettext \
+       then $(top_srcdir)/utils/wmlxgettext --directory=$(top_srcdir) \
          `cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
        fi
        if test -f $(DOMAIN).wml.po ; then \
Index: wesnoth/po/wesnoth-trow/Makefile.in.in
diff -u wesnoth/po/wesnoth-trow/Makefile.in.in:1.2 
wesnoth/po/wesnoth-trow/Makefile.in.in:1.3
--- wesnoth/po/wesnoth-trow/Makefile.in.in:1.2  Fri Oct 15 19:03:27 2004
+++ wesnoth/po/wesnoth-trow/Makefile.in.in      Thu Oct 21 19:54:39 2004
@@ -114,7 +114,7 @@
          --keyword=_ --keyword=N_ \
          --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
        if test -r FINDCFG ;\
-       then $(top_srcdir)/utils/wmlxgettext \
+       then $(top_srcdir)/utils/wmlxgettext --directory=$(top_srcdir) \
          `cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
        fi
        if test -f $(DOMAIN).wml.po ; then \
Index: wesnoth/po/wesnoth/Makefile.in.in
diff -u wesnoth/po/wesnoth/Makefile.in.in:1.2 
wesnoth/po/wesnoth/Makefile.in.in:1.3
--- wesnoth/po/wesnoth/Makefile.in.in:1.2       Fri Oct 15 19:03:27 2004
+++ wesnoth/po/wesnoth/Makefile.in.in   Thu Oct 21 19:54:39 2004
@@ -114,7 +114,7 @@
          --keyword=_ --keyword=N_ \
          --output=- | sed s/charset=CHARSET/charset=UTF-8/ > $(DOMAIN).cpp.po
        if test -r FINDCFG ;\
-       then $(top_srcdir)/utils/wmlxgettext \
+       then $(top_srcdir)/utils/wmlxgettext --directory=$(top_srcdir) \
          `cd $(top_srcdir) && sh $(subdir)/FINDCFG` > $(DOMAIN).wml.po ;\
        fi
        if test -f $(DOMAIN).wml.po ; then \
Index: wesnoth/utils/wmlxgettext
diff -u wesnoth/utils/wmlxgettext:1.7 wesnoth/utils/wmlxgettext:1.8
--- wesnoth/utils/wmlxgettext:1.7       Sun Oct 17 12:47:49 2004
+++ wesnoth/utils/wmlxgettext   Thu Oct 21 19:54:38 2004
@@ -8,12 +8,16 @@
 use strict;
 use File::Basename;
 use POSIX qw(strftime);
+use Getopt::Long;
+
+our $toplevel = '.';
+GetOptions ('directory=s' => \$toplevel);
 
 our $module = dirname ($0) . "/wmltrans.pm";
 eval "require \"$module\";";
 
 our ($str,$translatable,$line,%messages);
-chdir "../..";
+chdir $toplevel;
 foreach my $file (@ARGV) {
   open (FILE, "<$file") or die "cannot read from $file";
   my $readingattack = 0;