Author: pfg
Date: Wed Nov 30 01:45:54 2011
New Revision: 1208206
URL: http://svn.apache.org/viewvc?rev=1208206&view=rev
Log:
i113873 - Russian dictionary for integration. Shamelessly based on a
LibreOffice commit by Andras Timar. Thanks!
Added:
incubator/ooo/trunk/main/dictionaries/ru_RU/README_ru_RU.txt
Removed:
incubator/ooo/trunk/main/dictionaries/ru_RU/th_ru_RU_v2.zip
Modified:
incubator/ooo/trunk/main/dictionaries/ru_RU/description.xml
incubator/ooo/trunk/main/dictionaries/ru_RU/dictionaries.xcu
incubator/ooo/trunk/main/dictionaries/ru_RU/makefile.mk
incubator/ooo/trunk/main/dictionaries/ru_RU/manifest.xml
Added: incubator/ooo/trunk/main/dictionaries/ru_RU/README_ru_RU.txt
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dictionaries/ru_RU/README_ru_RU.txt?rev=1208206&view=auto
==============================================================================
--- incubator/ooo/trunk/main/dictionaries/ru_RU/README_ru_RU.txt (added)
+++ incubator/ooo/trunk/main/dictionaries/ru_RU/README_ru_RU.txt Wed Nov 30
01:45:54 2011
@@ -0,0 +1,28 @@
+* Copyright (c) 1997-2008, Alexander I. Lebedev
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+* Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+* Modified versions must be clearly marked as such.
+* The name of Alexander I. Lebedev may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
Modified: incubator/ooo/trunk/main/dictionaries/ru_RU/description.xml
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dictionaries/ru_RU/description.xml?rev=1208206&r1=1208205&r2=1208206&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dictionaries/ru_RU/description.xml (original)
+++ incubator/ooo/trunk/main/dictionaries/ru_RU/description.xml Wed Nov 30
01:45:54 2011
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006";
xmlns:d="http://openoffice.org/extensions/description/2006";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <version value="2008.07.01" />
+ <version value="2011.01.29" />
<identifier value="org.openoffice.ru.hunspell.dictionaries" />
<display-name>
- <name lang="en">Russian hyphenation dictionary and thesaurus</name>
+ <name lang="en-US">Russian spelling dictionary, hyphenation rules, and
thesaurus</name>
</display-name>
<platform value="all" />
<dependencies>
Modified: incubator/ooo/trunk/main/dictionaries/ru_RU/dictionaries.xcu
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dictionaries/ru_RU/dictionaries.xcu?rev=1208206&r1=1208205&r2=1208206&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dictionaries/ru_RU/dictionaries.xcu (original)
+++ incubator/ooo/trunk/main/dictionaries/ru_RU/dictionaries.xcu Wed Nov 30
01:45:54 2011
@@ -2,6 +2,17 @@
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="Linguistic"
oor:package="org.openoffice.Office">
<node oor:name="ServiceManager">
<node oor:name="Dictionaries">
+ <node oor:name="HunSpellDic_ru-RU" oor:op="fuse">
+ <prop oor:name="Locations" oor:type="oor:string-list">
+ <value>%origin%/ru_RU.aff %origin%/ru_RU.dic</value>
+ </prop>
+ <prop oor:name="Format" oor:type="xs:string">
+ <value>DICT_SPELL</value>
+ </prop>
+ <prop oor:name="Locales" oor:type="oor:string-list">
+ <value>ru-RU</value>
+ </prop>
+ </node>
<node oor:name="HyphDic_ru-RU" oor:op="fuse">
<prop oor:name="Locations" oor:type="oor:string-list">
<value>%origin%/hyph_ru_RU.dic</value>
Modified: incubator/ooo/trunk/main/dictionaries/ru_RU/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dictionaries/ru_RU/makefile.mk?rev=1208206&r1=1208205&r2=1208206&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dictionaries/ru_RU/makefile.mk (original)
+++ incubator/ooo/trunk/main/dictionaries/ru_RU/makefile.mk Wed Nov 30 01:45:54
2011
@@ -47,27 +47,34 @@ EXTENSION_ZIPNAME:=dict-ru
# --- Extension packaging ------------------------------------------
+.IF "$(WITH_LANG)" != ""
+DESCRIPTION_SRC:=$(MISC)/$(EXTENSIONNAME)_in/description.xml
+.ENDIF
+
# just copy:
COMPONENT_FILES= \
- $(EXTENSIONDIR)$/hyph_ru_RU.dic
+ $(EXTENSIONDIR)$/hyph_ru_RU.dic \
+ $(EXTENSIONDIR)$/th_ru_RU_v2.dat \
+ $(EXTENSIONDIR)$/ru_RU.aff \
+ $(EXTENSIONDIR)$/ru_RU.dic \
+ $(EXTENSIONDIR)$/README_thes_ru_RU.txt
COMPONENT_CONFIGDEST=.
COMPONENT_XCU= \
$(EXTENSIONDIR)$/dictionaries.xcu
# disable fetching default OOo license text
-CUSTOM_LICENSE=README_thes_ru_RU.txt
+CUSTOM_LICENSE=README_ru_RU.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-COMPONENT_ZIP:=$(PWD)$/th_ru_RU_v2.zip
COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/th_ru_RU_v2.dat
+ $(EXTENSIONDIR)$/th_ru_RU_v2.idx
# add own targets to packing dependencies (need to be done before
# packing the xtension
# EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
-EXTENSION_PACKDEPS=$(COMPONENT_UNZIP_FILES) $(EXTENSIONDIR)$/th_ru_RU_v2.idx
+EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
# global settings for extension packing
.INCLUDE : extension_pre.mk
@@ -75,11 +82,13 @@ EXTENSION_PACKDEPS=$(COMPONENT_UNZIP_FIL
# global targets for extension packing
.INCLUDE : extension_post.mk
-.IF "$(COMPONENT_UNZIP_FILES)"!=""
-$(COMPONENT_UNZIP_FILES) .SILENT .UPDATEALL : "$(COMPONENT_ZIP)"
- $(COMMAND_ECHO)-$(MKDIRHIER) $(EXTENSIONDIR)
- cd $(EXTENSIONDIR) && unzip -o $< $(COMPONENT_UNZIP_FILES:f:t" ")
-.ENDIF # "$(COMPONENT_UNZIP_FILES)"!=""
+#.INCLUDE : $(PRJ)$/prj$/tests.mk
$(EXTENSIONDIR)$/th_ru_RU_v2.idx : "$(EXTENSIONDIR)$/th_ru_RU_v2.dat"
- $(PERL) $(SOLARBINDIR)$/th_gen_idx.pl -o
$(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
+ $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o
$(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
+
+.IF "$(WITH_LANG)" != ""
+$(DESCRIPTION_SRC) : description.xml
+ @@-$(MKDIRHIER) $(@:d)
+ $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $< -o $@ -m $(LOCALIZESDF) -l all
+.ENDIF
Modified: incubator/ooo/trunk/main/dictionaries/ru_RU/manifest.xml
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/dictionaries/ru_RU/manifest.xml?rev=1208206&r1=1208205&r2=1208206&view=diff
==============================================================================
--- incubator/ooo/trunk/main/dictionaries/ru_RU/manifest.xml (original)
+++ incubator/ooo/trunk/main/dictionaries/ru_RU/manifest.xml Wed Nov 30
01:45:54 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN"
"Manifest.dtd">
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest";>
- <manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
+ <manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="dictionaries.xcu"/>
</manifest:manifest>
