elua: trigger xgettext execution from xgettext.lua, which is executed by xgettext_wrapper

diff --git a/po/Makevars b/po/Makevars
index b6ee6afb9756d438080753b0d6463376046238f6..0b56f80f30a661489819dde4538aa0dbe76094cd 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -11,7 +11,7 @@ top_builddir = ..
 XGETTEXT_FALLBACK := $(XGETTEXT)
 
 # Override xgettext with our own custom wrapper
-XGETTEXT = $(srcdir)/xgettext_wrapper $(XGETTEXT_FALLBACK)
+XGETTEXT = $(srcdir)/xgettext_wrapper $(top_builddir) $(XGETTEXT_FALLBACK)
 
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user

diff --git a/po/xgettext_wrapper b/po/xgettext_wrapper
index 9415f2f39b192796582fa847971d5ccb12c3492d..d65c8d0959f77a70f537670f976097abee10f627 100755 (executable)
--- a/po/xgettext_wrapper
+++ b/po/xgettext_wrapper
@@ -1,5 +1,10 @@
 #!/bin/sh
-XGETTEXT=$1
+ELUAPATH=$1/src/bin/elua
+ELUA=${ELUAPATH}/elua
+LXGETTEXT=${ELUAPATH}/xgettext.lua
+export XGETTEXT=$2
+export EFL_RUN_IN_TREE=1
 shift
-$XGETTEXT "$@"
+shift
+$ELUA $LXGETTEXT "$@"
 exit $?

diff --git a/src/bin/elua/xgettext.lua b/src/bin/elua/xgettext.lua
index d4a5ee9b402ca441accf4b904647c743b2cbd4bc..b849aefb5f94ed1230822e3366002f94763ad607 100644 (file)
--- a/src/bin/elua/xgettext.lua
+++ b/src/bin/elua/xgettext.lua
@@ -120,7 +120,7 @@ local opts, args = getopt.parse {
         { nil, "copyright-holder", true, metavar = "STRING", help = "set "
             .. "copyright holder in output"
         },
-        { nil, "foreing-user", false, help = "omit copyright in output "
+        { nil, "foreign-user", false, help = "omit copyright in output "
             .. "for foreign user"
         },
         { nil, "package-name", true, metavar = "PACKAGE", help = "set package "
@@ -158,4 +158,22 @@ local opts, args = getopt.parse {
     }
 }
 
+if not opts or opts["h"] or opts["v"] then
+    return true
+end
+
+local hasxgettext = os.getenv("XGETTEXT")
+if hasxgettext then
+    local gargs = { "\"" .. hasxgettext .. "\"" }
+    for i = 1, #opts do
+        gargs[#gargs + 1] = "\"" .. arg[i] .. "\""
+    end
+    for i, v in ipairs(args) do
+        if not v:match("^.+%.lua$") then
+            gargs[#gargs + 1] = v
+        end
+    end
+    os.execute(table.concat(gargs, " "))
+end
+
 return true
\ No newline at end of file