[Libreoffice-commits] .: 6 commits - configure.in instsetoo_native/prj ooo.lst scp2/prj set_soenv.in solenv/gbuild solenv/inc
Petr Mladek
pmladek at kemper.freedesktop.org
Fri Mar 25 04:17:05 PDT 2011
configure.in | 30 +++++++++++++++++++++++++++++-
instsetoo_native/prj/build.lst | 2 +-
ooo.lst | 1 +
scp2/prj/build.lst | 2 +-
set_soenv.in | 3 ++-
solenv/gbuild/AllLangResTarget.mk | 2 +-
solenv/inc/settings.mk | 2 +-
7 files changed, 36 insertions(+), 6 deletions(-)
New commits:
commit f6772e091ac55e52f7bf7515cab6f4c66c02dd72
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Mar 24 21:11:53 2011 +0100
new --with-system-translate-toolkit configure option
diff --git a/configure.in b/configure.in
index b41603b..791df21 100755
--- a/configure.in
+++ b/configure.in
@@ -701,6 +701,10 @@ AC_ARG_WITH(system-python,
[Use python already on system.]),
,with_system_python=yes)
+AC_ARG_WITH(system-translate-toolkit,
+ AS_HELP_STRING([--with-system-translate-toolkit],
+ [Use translate-toolkit already on system.]))
+
AC_ARG_WITH(system-icu,
AS_HELP_STRING([--with-system-icu],
[Use icu already on system.]))
@@ -4147,6 +4151,30 @@ else
fi
dnl ===================================================================
+dnl Check for system translate-toolkit
+dnl ===================================================================
+AC_MSG_CHECKING([which translate-toolkit to use])
+if test "$with_system_translate_toolkit" = "yes" ; then
+ AC_PATH_PROGS(OO2PO, oo2po)
+ if test -z "$OO2PO"; then
+ AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
+ fi
+
+ AC_PATH_PROGS(PO2OO, po2oo)
+ if test -z "$PO2OO"; then
+ AC_MSG_ERROR([install translate-toolkit or use --without-system-translate-toolkit])
+ fi
+
+ AC_MSG_RESULT([system])
+ SYSTEM_TRANSLATE_TOOLKIT=YES
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_TRANSLATE_TOOLKIT=NO
+ BUILD_TYPE="$BUILD_TYPE TRANSLATE_TOOLKIT"
+fi
+AC_SUBST(SYSTEM_TRANSLATE_TOOLKIT)
+
+dnl ===================================================================
dnl Check for system berkley db
dnl ===================================================================
AC_MSG_CHECKING([which db to use])
diff --git a/set_soenv.in b/set_soenv.in
index 5f7c932..f1a38e8 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1933,6 +1933,7 @@ ToFile( "WITH_EXTRA_GALLERY", "@WITH_EXTRA_GALLERY@", "e" );
ToFile( "WITH_EXTRA_TEMPLATE", "@WITH_EXTRA_TEMPLATE@", "e" );
ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@", "e" );
ToFile( "WITH_EXTRA_FONT", "@WITH_EXTRA_FONT@", "e" );
+ToFile( "SYSTEM_TRANSLATE_TOOLKIT", "@SYSTEM_TRANSLATE_TOOLKIT@", "e" );
ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" );
ToFile( "DB_VERSION", "@DB_VERSION@", "e" );
ToFile( "DB_LIB", "@DB_LIB@", "e" );
commit 4dd33925da72bd790bb7adf2176ba637304869e3
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Mar 24 21:11:13 2011 +0100
download translate-toolkit-1.8.1.tar.bz2
diff --git a/ooo.lst b/ooo.lst
index 8d52a9e..9738419 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -82,5 +82,6 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
+b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
http://www.numbertext.org/linux
881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip
commit 03b89c4b4914a205097129daf6f1af40d7020294
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Mar 24 21:09:13 2011 +0100
search localized strings in the new "translations" module also by GNU make
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 8d43088..635ee5f 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -31,7 +31,7 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target,transex3)
# gb_SrsPartMergeTarget_TRANSEXPRECOMMAND is set by the platforms
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
-gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
commit 463a21059f58071806a1fcb049fda2418bc66e10
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Mar 23 19:50:52 2011 +0100
set build depencencies against the new "translations" module
diff --git a/instsetoo_native/prj/build.lst b/instsetoo_native/prj/build.lst
index a1d0a15..5f3912d 100644
--- a/instsetoo_native/prj/build.lst
+++ b/instsetoo_native/prj/build.lst
@@ -1,4 +1,4 @@
-oon instsetoo_native :: L10N:l10n postprocess packimages testautomation NULL
+oon instsetoo_native :: TRANSLATIONS:translations postprocess packimages testautomation NULL
oon instsetoo_native usr1 - all oon_mkout NULL
oon instsetoo_native\inc_openoffice\unix nmake - u oon_unix NULL
oon instsetoo_native\inc_openoffice\windows\msi_languages nmake - all oon_msilang NULL
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 7b5c9ef..5802805 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp scp2 : L10N:l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp scp2 : TRANSLATIONS:translations i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
cp scp2 usr1 - all cp_mkout NULL
cp scp2\macros nmake - all cp_langmacros NULL
cp scp2\source\templates nmake - all cp_langtemplates NULL
diff --git a/set_soenv.in b/set_soenv.in
index 280f802..5f7c932 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1520,7 +1520,7 @@ my $BUILD_TYPE = "@BUILD_TYPE@";
if ('@WITH_LANG@' ne "")
{
- $BUILD_TYPE = "@BUILD_TYPE@ L10N";
+ $BUILD_TYPE = "@BUILD_TYPE@ TRANSLATIONS";
}
else
{
commit f5eb716bb5aab011a003b13cf7afd510e444879f
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Mar 23 19:46:09 2011 +0100
search translated strings in the new "translations" module
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index bac7568..fc9860a 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -809,7 +809,7 @@ SOLARCOMMONSDFDIR=$(SOLARSDFDIR)
.EXPORT : SOLARBINDIR
-L10N_MODULE*=$(SRC_ROOT)/l10n
+L10N_MODULE*=$(SRC_ROOT)/translations
ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so
.IF "$(WITH_LANG)"!=""
commit 14eb6ceb73ac107d3e7870805eb497782357915a
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Mar 23 19:43:58 2011 +0100
download "traslations" instead of "l10n" repo
the new one stores strings as in PO files
diff --git a/configure.in b/configure.in
index efe1e1a..b41603b 100755
--- a/configure.in
+++ b/configure.in
@@ -7653,7 +7653,7 @@ if test -z "$WITH_LANG"; then
AC_MSG_RESULT([en-US])
else
AC_MSG_RESULT([$WITH_LANG])
- GIT_REPO_NAMES="$GIT_REPO_NAMES l10n"
+ GIT_REPO_NAMES="$GIT_REPO_NAMES translations"
fi
AC_SUBST(WITH_LANG)
AC_SUBST(GIT_REPO_NAMES)
More information about the Libreoffice-commits
mailing list