[Libreoffice] [PATCH] po2oo --skipsource support

Hi Andras,

I tried to use internal toolkit:
"
checking which translate-toolkit to use... internal
"
But when I try to build translations I got this error:
"
=============
Building module translations
=============
Entering /home/kami/git/libreoffice-3-4/bootstrap/translations

: &&
LD_LIBRARY_PATH=/home/kami/git/libreoffice-3-4/bootstrap/solver/300/
unxlngi6.pro/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}<http://unxlngi6.pro/lib$%7BLD_LIBRARY_PATH:+:$%7BLD_LIBRARY_PATH%7D%7D>
/home/kami/git/libreoffice-3-4/bootstrap/solver/300/unxlngi6.pro/bin/po2oo--skipsource
-i ./source/de -t ./
unxlngi6.pro/misc/sdf-template/en-US.sdf -o ./
unxlngi6.pro/misc/sdf-l10n/de.sdf -l de
Traceback (most recent call last):
  File "/home/kami/git/libreoffice-3-4/bootstrap/solver/300/
unxlngi6.pro/bin/po2oo", line 27, in <module>
    from translate.convert import po2oo
ImportError: No module named translate.convert
dmake:  Error code 1, while making './unxlngi6.pro/misc/sdf-l10n/de.sdf'
Retrying /home/kami/git/libreoffice-3-4/bootstrap/translations

: &&
LD_LIBRARY_PATH=/home/kami/git/libreoffice-3-4/bootstrap/solver/300/
unxlngi6.pro/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}<http://unxlngi6.pro/lib$%7BLD_LIBRARY_PATH:+:$%7BLD_LIBRARY_PATH%7D%7D>
/home/kami/git/libreoffice-3-4/bootstrap/solver/300/unxlngi6.pro/bin/po2oo--skipsource
-i ./source/de -t ./
unxlngi6.pro/misc/sdf-template/en-US.sdf -o ./
unxlngi6.pro/misc/sdf-l10n/de.sdf -l de
Traceback (most recent call last):
  File "/home/kami/git/libreoffice-3-4/bootstrap/solver/300/
unxlngi6.pro/bin/po2oo", line 27, in <module>
    from translate.convert import po2oo
ImportError: No module named translate.convert
dmake:  Error code 1, while making './unxlngi6.pro/misc/sdf-l10n/de.sdf'
"

If I install system provided translation-toolkit (version 1.7 on Ubuntu
11.04) it tries to use that but the build fails because of missing
--skipsource in 1.7 however I am using internal translation toolkit. I think
it can be a path problem where the a system installed translation-toolkit
masks the version comes form the build system.

I provide the attached patch to fix this problem. I simply move
translate-toolkit python modules to bin. I hope this will solve the problem.
Please commit it to master and 3-4 if you agree.

Not tested other platform than Linux.

Regards,
KAMI

From 72da35d03c29c9d8e94de0cf49dea7a8dbffff7d Mon Sep 17 00:00:00 2001
From: Kalman Szalai - KAMI <kami911@gmail.com>
Date: Tue, 19 Apr 2011 09:42:45 +0200
Subject: [PATCH] Place translate-toolkit module files next to po2oo in bin.

---
 translate_toolkit/prj/d.lst |   61 ++++++++++++++++++++++--------------------
 1 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst
index 5833cf4..ca4fe7a 100644
--- a/translate_toolkit/prj/d.lst
+++ b/translate_toolkit/prj/d.lst
@@ -1,32 +1,35 @@
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\convert
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\filters
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\lang
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\misc
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\misc\typecheck
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\placeables
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\versioncontrol
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\storage\xml_extract
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\search
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\search\indexing
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\services
-mkdir: %_DEST%\lib%_EXT%\translate_toolkit\translate\tools
+mkdir: %_DEST%\bin%_EXT%\translate
+mkdir: %_DEST%\bin%_EXT%\translate\convert
+mkdir: %_DEST%\bin%_EXT%\translate\filters
+mkdir: %_DEST%\bin%_EXT%\translate\lang
+mkdir: %_DEST%\bin%_EXT%\translate\misc
+mkdir: %_DEST%\bin%_EXT%\translate\misc\typecheck
+mkdir: %_DEST%\bin%_EXT%\translate\storage
+mkdir: %_DEST%\bin%_EXT%\translate\storage\placeables
+mkdir: %_DEST%\bin%_EXT%\translate\storage\versioncontrol
+mkdir: %_DEST%\bin%_EXT%\translate\storage\xml_extract
+mkdir: %_DEST%\bin%_EXT%\translate\search
+mkdir: %_DEST%\bin%_EXT%\translate\search\indexing
+mkdir: %_DEST%\bin%_EXT%\translate\services
+mkdir: %_DEST%\bin%_EXT%\translate\share
+mkdir: %_DEST%\bin%_EXT%\translate\share\langmodels
+mkdir: %_DEST%\bin%_EXT%\translate\tools
 
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\convert\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\convert\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\filters\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\filters\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\lang\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\lang\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\misc\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\misc\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\misc/typecheck\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\misc/typecheck\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\storage\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/placeables\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\storage/placeables\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/versioncontrol\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\storage/versioncontrol\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\storage/xml_extract\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\storage/xml_extract\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\search\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\search\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\search/indexing\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\search/indexing\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\services\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\services\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\lib\translate\tools\* 
%_DEST%\lib%_EXT%\translate_toolkit\translate\tools\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\* %_DEST%\bin%_EXT%\translate\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\convert\* %_DEST%\bin%_EXT%\translate\convert\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\filters\* %_DEST%\bin%_EXT%\translate\filters\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\lang\* %_DEST%\bin%_EXT%\translate\lang\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\misc\* %_DEST%\bin%_EXT%\translate\misc\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\misc/typecheck\* 
%_DEST%\bin%_EXT%\translate\misc/typecheck\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage\* %_DEST%\bin%_EXT%\translate\storage\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/placeables\* 
%_DEST%\bin%_EXT%\translate\storage/placeables\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/versioncontrol\* 
%_DEST%\bin%_EXT%\translate\storage/versioncontrol\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/xml_extract\* 
%_DEST%\bin%_EXT%\translate\storage/xml_extract\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\search\* %_DEST%\bin%_EXT%\translate\search\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\search/indexing\* 
%_DEST%\bin%_EXT%\translate\search/indexing\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\services\* 
%_DEST%\bin%_EXT%\translate\services\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\share\* %_DEST%\bin%_EXT%\translate\share\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\share\langmodels\* 
%_DEST%\bin%_EXT%\translate\share\langmodels\*
+..\%__SRC%\misc\build\translate-toolkit-*\translate\tools\* %_DEST%\bin%_EXT%\translate\tools\*
 ..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po  %_DEST%\bin%_EXT%\*
 ..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo  %_DEST%\bin%_EXT%\*
-- 
1.7.4.1