[Libreoffice-commits] .: ooo.lst.in translate_toolkit/makefile.mk translate_toolkit/prj translate_toolkit/translate-toolkit-1.8.1-skipsource.patch
Tomáš Chvátal
tchvatal at kemper.freedesktop.org
Thu Nov 3 07:35:23 PDT 2011
ooo.lst.in | 1
translate_toolkit/makefile.mk | 80 ----------
translate_toolkit/prj/build.lst | 3
translate_toolkit/prj/d.lst | 35 ----
translate_toolkit/translate-toolkit-1.8.1-skipsource.patch | 99 -------------
5 files changed, 218 deletions(-)
New commits:
commit 3433ac9b0f350d5cfa86d92239cd41e6c75dbeb1
Author: Tomas Chvatal <tchvatal at suse.cz>
Date: Thu Nov 3 16:32:53 2011 +0100
Drop translate_toolkit folder and its internal download.
Signed-off-by: Tomas Chvatal <tchvatal at suse.cz>
diff --git a/ooo.lst.in b/ooo.lst.in
index 223ec9b..5a45936 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -94,7 +94,6 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
@GOOGLE_DOCS_EXTENSION_PACK@
http://dev-www.libreoffice.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
-b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
http://ooo.itc.hu/oxygenoffice/download/libreoffice/
@OOOP_GALLERY_PACK@
@OOOP_TEMPLATES_PACK@
diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk
deleted file mode 100644
index b311001..0000000
--- a/translate_toolkit/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Petr Mladek <pmladek at suse.cz>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-# Ted <ted at bear.com>
-# Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=trt
-TARGET=trt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_TRANSLATE_TOOLKIT)" == "YES"
- at all:
- @echo "Using system translate toolkit..."
-.ENDIF
-
-# --- Python paths --------------------------------------------------
-
-.IF "$(SYSTEM_PYTHON)" == "YES"
-PY_CMD=$(PYTHON)
-.ELSE # "$(SYSTEM_PYTHON)" == "YES"
-.IF "$(OS)"=="MACOSX"
-# the framework only gets delivered as zip, so call it from python's output-dir
-PY_CMD=$(SRC_ROOT)/python/$(INPATH)/misc/build/python-inst/OOoPython.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/OOoPython
-.ELSE
-PY_CMD=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python
-# watch for the path delimiter
-.IF "$(GUI)"=="WNT"
-PYTHONPATH:=$(SOLARLIBDIR);$(SOLARLIBDIR)/python;$(SOLARLIBDIR)/python/lib-dynload
-.ELSE # "$(GUI)"=="WNT"
-PYTHONPATH:=$(SOLARLIBDIR):$(SOLARLIBDIR)/python:$(SOLARLIBDIR)/python/lib-dynload
-.ENDIF # "$(GUI)"=="WNT"
-.EXPORT: PYTHONPATH
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF # "$(SYSTEM_PYTHON)" == "YES"
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=translate-toolkit-1.8.1
-TARFILE_MD5=b4cae0700aa1c2aef7eb7f345365e6f1
-PATCH_FILES=translate-toolkit-1.8.1-skipsource.patch
-BUILD_ACTION=$(PY_CMD) setup.py build
-BUILD_DIR=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
diff --git a/translate_toolkit/prj/build.lst b/translate_toolkit/prj/build.lst
deleted file mode 100644
index f87945c..0000000
--- a/translate_toolkit/prj/build.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-trt translate_toolkit : solenv PYTHON:python NULL
-trt translate_toolkit usr1 - all trt_mkout NULL
-trt translate_toolkit nmake - all translate_toolkit NULL
diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst
deleted file mode 100644
index 31d61b0..0000000
--- a/translate_toolkit/prj/d.lst
+++ /dev/null
@@ -1,35 +0,0 @@
-mkdir: %_DEST%\bin\translate
-mkdir: %_DEST%\bin\translate\convert
-mkdir: %_DEST%\bin\translate\filters
-mkdir: %_DEST%\bin\translate\lang
-mkdir: %_DEST%\bin\translate\misc
-mkdir: %_DEST%\bin\translate\misc\typecheck
-mkdir: %_DEST%\bin\translate\storage
-mkdir: %_DEST%\bin\translate\storage\placeables
-mkdir: %_DEST%\bin\translate\storage\versioncontrol
-mkdir: %_DEST%\bin\translate\storage\xml_extract
-mkdir: %_DEST%\bin\translate\search
-mkdir: %_DEST%\bin\translate\search\indexing
-mkdir: %_DEST%\bin\translate\services
-mkdir: %_DEST%\bin\translate\share
-mkdir: %_DEST%\bin\translate\share\langmodels
-mkdir: %_DEST%\bin\translate\tools
-
-..\%__SRC%\misc\build\translate-toolkit-*\translate\* %_DEST%\bin\translate\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\convert\* %_DEST%\bin\translate\convert\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\filters\* %_DEST%\bin\translate\filters\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\lang\* %_DEST%\bin\translate\lang\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\misc\* %_DEST%\bin\translate\misc\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\misc/typecheck\* %_DEST%\bin\translate\misc/typecheck\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage\* %_DEST%\bin\translate\storage\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/placeables\* %_DEST%\bin\translate\storage/placeables\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/versioncontrol\* %_DEST%\bin\translate\storage/versioncontrol\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\storage/xml_extract\* %_DEST%\bin\translate\storage/xml_extract\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\search\* %_DEST%\bin\translate\search\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\search/indexing\* %_DEST%\bin\translate\search/indexing\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\services\* %_DEST%\bin\translate\services\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\share\* %_DEST%\bin\translate\share\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\share\langmodels\* %_DEST%\bin\translate\share\langmodels\*
-..\%__SRC%\misc\build\translate-toolkit-*\translate\tools\* %_DEST%\bin\translate\tools\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\oo2po %_DEST%\bin\*
-..\%__SRC%\misc\build\translate-toolkit-*\build\scripts-*\po2oo %_DEST%\bin\*
diff --git a/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch b/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch
deleted file mode 100644
index c4cd7a0..0000000
--- a/translate_toolkit/translate-toolkit-1.8.1-skipsource.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Index: convert/po2oo.py
-===================================================================
---- misc/translate-toolkit-1.8.1/translate/convert/po2oo.py (revision 17314)
-+++ misc/build/translate-toolkit-1.8.1/translate/convert/po2oo.py (working copy)
-@@ -188,7 +188,7 @@
- filter = oocheckfilter(options, [checks.OpenOfficeChecker, checks.StandardUnitChecker], checks.openofficeconfig)
-
-
--def convertoo(inputfile, outputfile, templatefile, sourcelanguage=None, targetlanguage=None, timestamp=None, includefuzzy=False, multifilestyle="single", filteraction=None):
-+def convertoo(inputfile, outputfile, templatefile, sourcelanguage=None, targetlanguage=None, timestamp=None, includefuzzy=False, multifilestyle="single", skip_source=False, filteraction=None):
- inputstore = factory.getobject(inputfile)
- inputstore.filename = getattr(inputfile, 'name', '')
- if not targetlanguage:
-@@ -205,7 +205,7 @@
- convertor = reoo(templatefile, languages=languages, timestamp=timestamp, includefuzzy=includefuzzy, long_keys=multifilestyle != "single", filteraction=filteraction)
- outputstore = convertor.convertstore(inputstore)
- # TODO: check if we need to manually delete missing items
-- outputfile.write(str(outputstore))
-+ outputfile.write(outputstore.__str__(skip_source, targetlanguage))
- return True
-
-
-@@ -223,6 +223,7 @@
- help="don't change the timestamps of the strings")
- parser.add_option("", "--nonrecursiveoutput", dest="allowrecursiveoutput", default=True, action="store_false", help="don't treat the output oo as a recursive store")
- parser.add_option("", "--nonrecursivetemplate", dest="allowrecursivetemplate", default=True, action="store_false", help="don't treat the template oo as a recursive store")
-+ parser.add_option("", "--skipsource", dest="skip_source", default=False, action="store_true", help="don't output the source language, but fallback to it where needed")
- parser.add_option("", "--filteraction", dest="filteraction", default="none", metavar="ACTION",
- help="action on pofilter failure: none (default), warn, exclude-serious, exclude-all")
- parser.add_fuzzy_option()
-@@ -230,6 +231,7 @@
- parser.passthrough.append("sourcelanguage")
- parser.passthrough.append("targetlanguage")
- parser.passthrough.append("timestamp")
-+ parser.passthrough.append("skip_source")
- parser.passthrough.append("filteraction")
- parser.run(argv)
-
-Index: convert/test_po2oo.py
-===================================================================
---- misc/translate-toolkit-1.8.1/translate/convert/test_po2oo.py (revision 17280)
-+++ misc/build/translate-toolkit-1.8.1/translate/convert/test_po2oo.py (working copy)
-@@ -170,6 +170,7 @@
- options = self.help_check(options, "--nonrecursiveoutput")
- options = self.help_check(options, "--nonrecursivetemplate")
- options = self.help_check(options, "--filteraction")
-+ options = self.help_check(options, "--skipsource")
- options = self.help_check(options, "--fuzzy")
- options = self.help_check(options, "--nofuzzy")
- options = self.help_check(options, "-t TEMPLATE, --template=TEMPLATE")
-Index: storage/oo.py
-===================================================================
---- misc/translate-toolkit-1.8.1/translate/storage/oo.py (revision 17301)
-+++ misc/build/translate-toolkit-1.8.1/translate/storage/oo.py (working copy)
-@@ -246,9 +246,18 @@
- """convert to a string. double check that unicode is handled"""
- return encode_if_needed_utf8(self.getoutput())
-
-- def getoutput(self):
-+ def getoutput(self, skip_source=False, fallback_lang=None):
- """return the lines in tab-delimited form"""
-- return "\r\n".join([str(line) for line in self.lines])
-+ if skip_source:
-+ lines = self.lines[1:]
-+ if not lines:
-+ # Untranslated, so let's do fall-back: (bug 1883)
-+ new_line = ooline(self.lines[0].getparts())
-+ new_line.languageid = fallback_lang
-+ lines = [new_line]
-+ else:
-+ lines = self.lines
-+ return "\r\n".join([str(line) for line in lines])
-
-
- class oofile:
-@@ -295,11 +304,11 @@
- thisline = ooline(parts)
- self.addline(thisline)
-
-- def __str__(self):
-+ def __str__(self, skip_source=False, fallback_lang=None):
- """convert to a string. double check that unicode is handled"""
-- return encode_if_needed_utf8(self.getoutput())
-+ return encode_if_needed_utf8(self.getoutput(skip_source, fallback_lang))
-
-- def getoutput(self):
-+ def getoutput(self, skip_source=False, fallback_lang=None):
- """converts all the lines back to tab-delimited form"""
- lines = []
- for oe in self.units:
-@@ -307,7 +316,7 @@
- warnings.warn("contains %d lines (should be 2 at most): languages %r" % (len(oe.lines), oe.languages))
- oekeys = [line.getkey() for line in oe.lines]
- warnings.warn("contains %d lines (should be 2 at most): keys %r" % (len(oe.lines), oekeys))
-- oeline = str(oe) + "\r\n"
-+ oeline = oe.getoutput(skip_source, fallback_lang) + "\r\n"
- lines.append(oeline)
- return "".join(lines)
-
More information about the Libreoffice-commits
mailing list