[Demexp-dev] Re: Before merging ketty's branch

[David MENTRE]

Hi Ketty,

"ketty ." <address@hidden> writes:

> I have hacked together something that seems to work. Please tell me what you
> think:  http://equah.afraid.org/demexp/hg/main?cs=d7004008e5db

At first sight, that seems pretty nice. I noticed that you have removed
the dependency to avoid the build mess with po files.

Of course, you have mangled part of config/Makefile.inc by re-indenting
part of it. ;-) I fixed it.

And of course, it does not work on my system because my xargs (version
4.1.20) doesn't have the '-I' option. :-(

I fixed it with following patch:

changeset:   455:23b1a828410ece74f80fa64593574303082b5f35
tag:         tip
user:        David MENTRE <address@hidden>
date:        Fri Oct 13 20:33:07 2006 +0200
files:       config/Makefile.inc
description:
Fix for xargs -I option that does not exists: use instead --replace and sed


diff -r d7004008e5db0bfbc4604a0e7d4e135f3b0c5b7f -r 
23b1a828410ece74f80fa64593574303082b5f35 config/Makefile.inc
--- a/config/Makefile.inc       Fri Oct 13 17:50:35 2006 +0200
+++ b/config/Makefile.inc       Fri Oct 13 20:33:07 2006 +0200
@@ -624,15 +624,16 @@ update-po: $(POTFILES) $(POFILES)
 
 # should be called "installpackageinbuilddir" or something, but it is too long 
^^
 installpackage.demexp: $(MOFILES_demexp)
-       echo -n $(LINGUAS) | xargs -I =lang= -d " " \
-         $(OCAML_GETTEXT) --action install $(OCAML_GETTEXT_INSTALL_OPTIONS)    
\
-           --install-textdomain demexp --install-language =lang= \
-           --install-destdir $(BUILDPO) $(PODIR)/=lang=.demexp.mo
+       echo -n $(LINGUAS) | sed 'y/ /\n/' | xargs --replace \
+         $(OCAML_GETTEXT) --action install $(OCAML_GETTEXT_INSTALL_OPTIONS) \
+           --install-textdomain demexp --install-language {} \
+           --install-destdir $(BUILDPO) $(PODIR)/{}.demexp.mo
+
 installpackage.demexp-web: $(MOFILES_demexp-web)
-       echo -n $(LINGUAS) | xargs -I =lang= -d " " \
-         $(OCAML_GETTEXT) --action install $(OCAML_GETTEXT_INSTALL_OPTIONS)    
\
-           --install-textdomain demexp-web --install-language =lang= \
-           --install-destdir $(BUILDPO) $(PODIR)/=lang=.demexp-web.mo
+       echo -n $(LINGUAS) | sed 'y/ /\n/' | xargs --replace \
+         $(OCAML_GETTEXT) --action install $(OCAML_GETTEXT_INSTALL_OPTIONS) \
+           --install-textdomain demexp-web --install-language {} \
+           --install-destdir $(BUILDPO) $(PODIR)/{}.demexp-web.mo
 
 install-buildpo: $(BUILDPO) installpackage.demexp installpackage.demexp-web
 




> * there are two potfiles: demexp.pot and demexp-web.pot (we could rename the
> first one into demexp-gtk.pot or something)

Yes, renaming demexp.pot into demexp-gtk2.pot would make sense. I don't
do it right now to avoid breaking Christophe's win32 build.

> * .po files are named: <language>.<gettextpackage>.po

Ok.


Could you try following tree (your tree with some fixes to be able to do
a 'make all'):
  http://www.linux-france.org/cgi-bin/hgwebdir.cgi/demexp/ketty-dm
If that works, I'll merge it with mine.


One last thing: I try to keep source line under 80 character width. 

Best wishes,
d.
-- 
GPG/PGP key: A3AD7A2A David MENTRE <address@hidden>
 5996 CC46 4612 9CA4 3562  D7AC 6C67 9E96 A3AD 7A2A