SGJP / Morfeusz

Commit 33dbf4deb68c720b48ab9b8bfcbca81aa2d022d7

Authored by Michał Lenart
1 parent 7501fa3a

- dodanie informacji o dictID oraz copyright do API 

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/trunk@312 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Inline Side-by-side
Showing 18 changed files with 268 additions and 105 deletions
fsabuilder/morfeusz_builder
  View file @33dbf4d
... ... @@ -178,6 +178,55 @@ def _concatFiles(inputFiles):
178 178 else:
179 179 logging.warn(u'Ignoring line: "%s" - contains space in text form or lemma' % line.strip().decode('utf8'))
180 180  
  181 +def _readDictIdAndCopyright(inputFiles):
  182 + dictId = None
  183 + copyright = None
  184 + for inputFile in inputFiles:
  185 + if inputFile:
  186 + with codecs.open(inputFile, 'r', 'utf8') as f:
  187 + inCopyright = False
  188 + for linenum, line in enumerate(f, start=1):
  189 + if dictId is None and line.startswith(u'#!DICT-ID'):
  190 + dictIdTag, _, dictId = line.strip().partition(u' ')[2]
  191 + exceptions.validate(
  192 + dictIdTag == u'#!DICT-ID',
  193 + u'Dictionary ID tag must be followed by a space character and dictionary ID string')
  194 +
  195 +
  196 + elif copyright is None and line.startswith(u'#<COPYRIGHT>'):
  197 + exceptions.validate(
  198 + line.strip() == u'#<COPYRIGHT>',
  199 + u'%s:%d: Copyright start tag must be the only one in the line' % (inputFile, linenum))
  200 +
  201 + inCopyright = True
  202 + copyright = u''
  203 +
  204 + elif line.startswith(u'#</COPYRIGHT>'):
  205 +
  206 + exceptions.validate(
  207 + inCopyright,
  208 + u'%s:%d: Copyright end tag must be preceded by copyright start tag' % (inputFile, linenum))
  209 +
  210 + exceptions.validate(
  211 + line.strip() == u'#</COPYRIGHT>',
  212 + u'%s:%d: Copyright end tag must be the only one in the line' % (inputFile, linenum))
  213 +
  214 + inCopyright = False
  215 +
  216 + elif inCopyright:
  217 +
  218 + copyright += line
  219 +
  220 + if dictId is None:
  221 + logging.warn(u'No dictionary ID tag found')
  222 + dictId = u''
  223 +
  224 + if copyright is None:
  225 + logging.warn(u'No copyright info found')
  226 + copyright = u''
  227 +
  228 + return (dictId, copyright)
  229 +
181 230 def _readNamesAndQualifiers(inputFiles):
182 231 names = set([u''])
183 232 qualifiers = set([frozenset()])
... ... @@ -255,7 +304,7 @@ def buildGeneratorFromPoliMorf(inputFiles, tagset, namesMap, qualifiersMap, segm
255 304 _printStats(fsa)
256 305 return fsa
257 306  
258   -def _doBuildDictionaryPart(opts, tagset, namesMap, qualifiersMap, isGenerator):
  307 +def _doBuildDictionaryPart(opts, dictId, copyrightTxt, tagset, namesMap, qualifiersMap, isGenerator):
259 308  
260 309 logging.info('reading segmentation rules')
261 310 rulesParserVersion = rulesParser.RulesParser.PARSE4ANALYZER if not isGenerator else rulesParser.RulesParser.PARSE4GENERATOR
... ... @@ -278,7 +327,7 @@ def _doBuildDictionaryPart(opts, tagset, namesMap, qualifiersMap, isGenerator):
278 327 fsa.train(_readTrainData(opts.analyzerTrainFile))
279 328 logging.info('done training')
280 329  
281   - serializer = Serializer.getSerializer(opts.serializationMethod, fsa, tagset, namesMap, qualifiersMap, segmentationRulesData)
  330 + serializer = Serializer.getSerializer(opts.serializationMethod, fsa, dictId, copyrightTxt, tagset, namesMap, qualifiersMap, segmentationRulesData)
282 331 if opts.generatorCpp and isGenerator:
283 332 serializer.serialize2CppFile(opts.generatorCpp, isGenerator=isGenerator)
284 333 if opts.analyzerCpp and not isGenerator:
... ... @@ -300,14 +349,15 @@ def main(opts):
300 349 logging.info('done reading tagset')
301 350  
302 351 logging.info('reading names and qualifiers')
  352 + dictId, copyrightTxt = _readDictIdAndCopyright(opts.inputFiles)
303 353 namesMap, qualifiersMap = _readNamesAndQualifiers(opts.inputFiles)
304 354 logging.info('done reading names and qualifiers')
305 355  
306 356 if not opts.onlyGenerator:
307   - _doBuildDictionaryPart(opts, tagset, namesMap, qualifiersMap, isGenerator=False)
  357 + _doBuildDictionaryPart(opts, dictId, copyrightTxt, tagset, namesMap, qualifiersMap, isGenerator=False)
308 358  
309 359 if not opts.onlyAnalyzer:
310   - _doBuildDictionaryPart(opts, tagset, namesMap, qualifiersMap, isGenerator=True)
  360 + _doBuildDictionaryPart(opts, dictId, copyrightTxt, tagset, namesMap, qualifiersMap, isGenerator=True)
311 361  
312 362 if __name__ == '__main__':
313 363 import os
... ...
fsabuilder/morfeuszbuilder/fsa/serializer.py
  View file @33dbf4d
... ... @@ -20,18 +20,22 @@ class Serializer(object):
20 20  
21 21 def __init__(self, fsa):
22 22 self._fsa = fsa
  23 + self.dictId = None
  24 + self.copyrightTxt = None
23 25 self.tagset = None
24 26 self.namesMap = None
25 27 self.qualifiersMap = None
26 28 self.segmentationRulesData = None
27 29  
28 30 @staticmethod
29   - def getSerializer(serializationMethod, fsa, tagset, namesMap, qualifiersMap, segmentationRulesData):
  31 + def getSerializer(serializationMethod, fsa, dictId, copyrightTxt, tagset, namesMap, qualifiersMap, segmentationRulesData):
30 32 res = {
31 33 SerializationMethod.SIMPLE: SimpleSerializer,
32 34 SerializationMethod.V1: VLengthSerializer1,
33 35 SerializationMethod.V2: VLengthSerializer2,
34 36 }[serializationMethod](fsa)
  37 + res.dictId = dictId
  38 + res.copyrightTxt = copyrightTxt
35 39 res.tagset = tagset
36 40 res.namesMap = namesMap
37 41 res.qualifiersMap = qualifiersMap
... ... @@ -44,7 +48,7 @@ class Serializer(object):
44 48  
45 49 # get the Morfeusz file format version that is being encoded
46 50 def getVersion(self):
47   - return 20
  51 + return 21
48 52  
49 53 def serialize2CppFile(self, fname, isGenerator, headerFilename="data/default_fsa.hpp"):
50 54 res = []
... ... @@ -149,11 +153,18 @@ class Serializer(object):
149 153  
150 154 def serializeEpilogue(self, tagsetData, qualifiersData, segmentationRulesData):
151 155 res = bytearray()
  156 +
  157 + idAndCopyright = bytearray()
  158 + idAndCopyright.extend(serializeString(self.dictId))
  159 + idAndCopyright.extend(serializeString(self.copyrightTxt))
  160 +
152 161 tagsetDataSize = len(tagsetData) if tagsetData else 0
153 162 qualifiersDataSize = len(qualifiersData) if qualifiersData else 0
154 163 # segmentationDataSize = len(segmentationRulesData) if segmentationRulesData else 0
155   - res.extend(htonl(tagsetDataSize + qualifiersDataSize))
156   -
  164 + segrulesDataOffsetInEpilogue = tagsetDataSize + qualifiersDataSize + len(idAndCopyright)
  165 + res.extend(htonl(segrulesDataOffsetInEpilogue))
  166 +
  167 + res.extend(idAndCopyright)
157 168 # add additional data itself
158 169 if tagsetData:
159 170 assert type(tagsetData) == bytearray
... ...
fsabuilder/morfeuszbuilder/tagset/segtypes.py
  View file @33dbf4d
... ... @@ -225,9 +225,7 @@ class SegtypePattern(object):
225 225 patterns2Match = []
226 226 patterns2Match.append(self.pattern.replace('%', '.*'))
227 227 patterns2Match.append(re.sub(r'\:\%$', '', self.pattern).replace('%', '.*'))
228   - # patterns2Match.append(re.sub(r'$', ':%', self.pattern).replace('%', '.*'))
229   - # if self.lemma is None:
230   - # lemma = None
  228 +
231 229 if any([re.match('^'+p+'$', tag) for p in patterns2Match]):
232 230 return self.segnum
233 231 else:
... ...
morfeusz/Dictionary.cpp
  View file @33dbf4d
... ... @@ -39,6 +39,8 @@ namespace morfeusz {
39 39  
40 40 Dictionary::Dictionary()
41 41 : fsa(NULL),
  42 + id(),
  43 + copyright(),
42 44 idResolver(),
43 45 separatorsList(),
44 46 segrulesFSAsMap(),
... ... @@ -50,6 +52,8 @@ namespace morfeusz {
50 52  
51 53 Dictionary::Dictionary(const unsigned char* fsaFileStartPtr, MorfeuszProcessorType processorType)
52 54 : fsa(FSAType::getFSA(fsaFileStartPtr, initializeDeserializer(processorType))),
  55 + id(),
  56 + copyright(),
53 57 idResolver(fsaFileStartPtr, &UTF8CharsetConverter::getInstance()),
54 58 separatorsList(getSeparatorsList(fsaFileStartPtr)),
55 59 segrulesFSAsMap(createSegrulesFSAsMap(fsaFileStartPtr)),
... ... @@ -57,10 +61,14 @@ namespace morfeusz {
57 61 defaultSegrulesFSA(getDefaultSegrulesFSA(this->segrulesFSAsMap, fsaFileStartPtr)),
58 62 availableAgglOptions(getAvailableOptions(segrulesFSAsMap, "aggl")),
59 63 availablePraetOptions(getAvailableOptions(segrulesFSAsMap, "praet")) {
  64 + const unsigned char* currPtr = getEpiloguePtr(fsaFileStartPtr) + 4;
  65 + this->id = readString(currPtr);
  66 + this->copyright = readString(currPtr);
60 67 }
61 68  
62 69 bool Dictionary::isCompatibleWith(const Dictionary& other) const {
63   - return this->idResolver.isCompatibleWith(other.idResolver)
  70 + return this->id == other.id
  71 + && this->idResolver.isCompatibleWith(other.idResolver)
64 72 && this->availableAgglOptions == other.availableAgglOptions
65 73 && this->availablePraetOptions == other.availablePraetOptions
66 74 && this->defaultSegrulesOptions == other.defaultSegrulesOptions
... ...
morfeusz/Dictionary.hpp
  View file @33dbf4d
... ... @@ -32,6 +32,8 @@ namespace morfeusz {
32 32 static Dictionary* getEmpty();
33 33  
34 34 FSAType* fsa;
  35 + std::string id;
  36 + std::string copyright;
35 37 IdResolverImpl idResolver;
36 38 std::vector<uint32_t> separatorsList;
37 39 std::map<SegrulesOptions, SegrulesFSA*> segrulesFSAsMap;
... ...
morfeusz/Environment.cpp
  View file @33dbf4d
... ... @@ -132,6 +132,11 @@ namespace morfeusz {
132 132 bool Environment::isUsable() const {
133 133 return usable;
134 134 }
  135 +
  136 + const Dictionary* Environment::getCurrentDictionary() const {
  137 + return this->dictionary;
  138 + }
  139 +
135 140  
136 141 void Environment::setDictionary(const Dictionary* dict) {
137 142 this->dictionary = dict;
... ...
morfeusz/Environment.hpp
  View file @33dbf4d
... ... @@ -89,6 +89,8 @@ public:
89 89 */
90 90 const IdResolverImpl& getIdResolver() const;
91 91  
  92 + const Dictionary* getCurrentDictionary() const;
  93 +
92 94 /**
93 95 * Sets dictionary by this environment.
94 96 *
... ...
morfeusz/IdResolverImpl.cpp
  View file @33dbf4d
... ... @@ -62,9 +62,13 @@ namespace morfeusz {
62 62 labels(),
63 63 labelsAsSets(),
64 64 charsetConverter(charsetConverter) {
65   - uint32_t fsaSize = readInt32Const(ptr + FSA_DATA_SIZE_OFFSET);
66   - const unsigned char* currPtr = ptr + FSA_DATA_OFFSET + fsaSize + 4;
67   -
  65 +// uint32_t fsaSize = readInt32Const(ptr + FSA_DATA_SIZE_OFFSET);
  66 +// const unsigned char* currPtr = ptr + FSA_DATA_OFFSET + fsaSize;
  67 + const unsigned char* currPtr = getEpiloguePtr(ptr) + 4;
  68 +
  69 + readString(currPtr); // skip dictId
  70 + readString(currPtr); // skip copyright
  71 +
68 72 this->tagsetId = readString(currPtr);
69 73 readTags(currPtr, this->tags.id2String);
70 74 createReverseMapping(this->tags);
... ...
morfeusz/Morfeusz.cpp
  View file @33dbf4d
1 1  
2 2 #include <string>
  3 +#include "const.hpp"
3 4 #include "morfeusz2.h"
4 5 #include "MorfeuszImpl.hpp"
5 6  
... ... @@ -14,6 +15,10 @@ namespace morfeusz {
14 15 string Morfeusz::getDefaultDictName() {
15 16 return MORFEUSZ_DEFAULT_DICT_NAME;
16 17 }
  18 +
  19 + string Morfeusz::getCopyright() {
  20 + return COPYRIGHT_TEXT;
  21 + }
17 22  
18 23 Morfeusz* Morfeusz::createInstance(MorfeuszUsage usage) {
19 24 return new MorfeuszImpl(Morfeusz::getDefaultDictName(), usage);
... ...
morfeusz/MorfeuszImpl.cpp
  View file @33dbf4d
... ... @@ -134,6 +134,14 @@ namespace morfeusz {
134 134 return new MorfeuszImpl(*this);
135 135 }
136 136  
  137 + string MorfeuszImpl::getDictID() const {
  138 + return getAnyEnvironment().getCurrentDictionary()->id;
  139 + }
  140 +
  141 + string MorfeuszImpl::getDictCopyright() const {
  142 + return getAnyEnvironment().getCurrentDictionary()->copyright;
  143 + }
  144 +
137 145 void MorfeuszImpl::setDictionary(const string& dictName) {
138 146  
139 147 if (dictName != currDictionary) {
... ...
morfeusz/MorfeuszImpl.hpp
  View file @33dbf4d
... ... @@ -56,6 +56,10 @@ namespace morfeusz {
56 56  
57 57 virtual ~MorfeuszImpl();
58 58  
  59 + std::string getDictID() const;
  60 +
  61 + std::string getDictCopyright() const;
  62 +
59 63 ResultsIterator* analyse(const std::string& text) const;
60 64  
61 65 ResultsIterator* analyse(const char* text) const;
... ...
morfeusz/const.cpp
  View file @33dbf4d
... ... @@ -2,15 +2,42 @@
2 2 #include "const.hpp"
3 3  
4 4 namespace morfeusz {
5   -
6   -extern const Charset DEFAULT_MORFEUSZ_CHARSET = UTF8;
7   -
8   -extern const unsigned char SHIFT_ORTH_NODE = 1;
9   -
10   -extern const char HOMONYM_SEPARATOR = ':';
11   -
12   -extern const char LABELS_SEPARATOR = '|';
13   -
14   -extern const char FILESYSTEM_PATH_SEPARATOR = '/';
15   -
  5 +
  6 + extern const Charset DEFAULT_MORFEUSZ_CHARSET = UTF8;
  7 +
  8 + extern const unsigned char SHIFT_ORTH_NODE = 1;
  9 +
  10 + extern const char HOMONYM_SEPARATOR = ':';
  11 +
  12 + extern const char LABELS_SEPARATOR = '|';
  13 +
  14 + extern const char FILESYSTEM_PATH_SEPARATOR = '/';
  15 +
  16 + extern const std::string COPYRIGHT_TEXT =
  17 + "Copyright © 2014 by Institute of Computer Science, Polish Academy of\
  18 +Science\
  19 +\
  20 +All rights reserved.\
  21 +\
  22 +Redistribution and use in source and binary forms, with or without\
  23 +modification, are permitted provided that the following conditions are\
  24 +met:\
  25 +\
  26 +Redistributions of source code must retain the above copyright notice,\
  27 +this list of conditions and the following disclaimer.\
  28 +Redistributions in binary form must reproduce the above copyright\
  29 +notice, this list of conditions and the following disclaimer in the\
  30 +documentation and/or other materials provided with the distribution.\
  31 +\
  32 +THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDERS “AS IS” AND ANY EXPRESS\
  33 +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\
  34 +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\
  35 +DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS OR CONTRIBUTORS BE\
  36 +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\
  37 +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\
  38 +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\
  39 +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\
  40 +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\
  41 +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF\
  42 +THE POSSIBILITY OF SUCH DAMAGE.";
16 43 }
... ...
morfeusz/const.hpp
  View file @33dbf4d
... ... @@ -9,6 +9,7 @@
9 9 #define CONST1_HPP
10 10  
11 11 #include "morfeusz2.h"
  12 +#include <string>
12 13  
13 14 namespace morfeusz {
14 15  
... ... @@ -27,6 +28,8 @@ extern const char LABELS_SEPARATOR;
27 28  
28 29 extern const char FILESYSTEM_PATH_SEPARATOR;
29 30  
  31 +extern const std::string COPYRIGHT_TEXT;
  32 +
30 33 }
31 34  
32 35 #endif /* CONST_HPP */
... ...
morfeusz/deserialization/deserializationUtils.hpp
  View file @33dbf4d
... ... @@ -9,6 +9,7 @@
9 9 #define DESERIALIZATIONUTILS_HPP
10 10  
11 11 #include "endianness.hpp"
  12 +#include "fsa/const.hpp"
12 13 #include <iostream>
13 14 #include <vector>
14 15  
... ... @@ -48,6 +49,10 @@ inline std::string readString(const unsigned char*&amp; currPtr) {
48 49 return res;
49 50 }
50 51  
  52 +inline const unsigned char* getEpiloguePtr(const unsigned char* ptr) {
  53 + uint32_t fsaSize = readInt32Const(ptr + FSA_DATA_SIZE_OFFSET);
  54 + return ptr + FSA_DATA_OFFSET + fsaSize;
  55 +}
51 56 }
52 57  
53 58 #endif /* DESERIALIZATIONUTILS_HPP */
... ...
morfeusz/fsa/const.cpp
  View file @33dbf4d
... ... @@ -4,7 +4,7 @@
4 4 namespace morfeusz {
5 5  
6 6 extern const uint32_t MAGIC_NUMBER = 0x8fc2bc1b;
7   -extern const uint8_t VERSION_NUM = 20;
  7 +extern const uint8_t VERSION_NUM = 21;
8 8  
9 9 extern const unsigned int VERSION_NUM_OFFSET = 4;
10 10 extern const unsigned int IMPLEMENTATION_NUM_OFFSET = 5;
... ...
morfeusz/morfeusz2.h
  View file @33dbf4d
... ... @@ -111,6 +111,12 @@ namespace morfeusz {
111 111 * @return
112 112 */
113 113 static std::string getDefaultDictName();
  114 +
  115 + /**
  116 + * Returns morfeusz2 library copyright text.
  117 + * @return
  118 + */
  119 + static std::string getCopyright();
114 120  
115 121 /**
116 122 * Creates actual instance of Morfeusz class.
... ... @@ -131,6 +137,20 @@ namespace morfeusz {
131 137 static Morfeusz* createInstance(const std::string& dictName, MorfeuszUsage usage=BOTH_ANALYSE_AND_GENERATE);
132 138  
133 139 /**
  140 + * Returns current dictionary ID.
  141 + *
  142 + * @return dictionary ID string
  143 + */
  144 + virtual std::string getDictID() const = 0;
  145 +
  146 + /**
  147 + * Returns current dictionary copyright string.
  148 + *
  149 + * @return dictionary copyright string
  150 + */
  151 + virtual std::string getDictCopyright() const = 0;
  152 +
  153 + /**
134 154 * Creates exact copy of Morfeusz object.
135 155 *
136 156 * @remarks NOT THREAD-SAFE (must have exclusive access to this instance. Does not affect other Morfeusz instances).
... ...
morfeusz/segrules/segrules.cpp
  View file @33dbf4d
... ... @@ -14,10 +14,8 @@ static inline void skipSeparatorsList(const unsigned char*&amp; ptr) {
14 14 }
15 15  
16 16 static inline const unsigned char* getSeparatorsListPtr(const unsigned char* ptr) {
17   - const unsigned char* additionalDataPtr = ptr
18   - + FSA_DATA_OFFSET
19   - + readInt32Const(ptr + FSA_DATA_SIZE_OFFSET);
20   - const unsigned char* res = additionalDataPtr + readInt32Const(additionalDataPtr) + 4;
  17 + const unsigned char* epiloguePtr = getEpiloguePtr(ptr);
  18 + const unsigned char* res = epiloguePtr + readInt32Const(epiloguePtr) + 4;
21 19 return res;
22 20 }
23 21  
... ...
nbproject/configurations.xml
  View file @33dbf4d
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<configurationDescriptor version="94">
  2 +<configurationDescriptor version="95">
3 3 <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
4 4 <logicalFolder name="build"
5 5 displayName="build"
... ... @@ -365,6 +365,9 @@
365 365 <pElem>build/morfeusz/wrappers/perl</pElem>
366 366 </incDir>
367 367 <preprocessorList>
  368 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  369 + <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
  370 + <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
368 371 <Elem>morfeusz_perl_EXPORTS</Elem>
369 372 </preprocessorList>
370 373 </ccTool>
... ... @@ -373,6 +376,8 @@
373 376 ex="false"
374 377 tool="1"
375 378 flavor2="4">
  379 + <ccTool flags="1">
  380 + </ccTool>
376 381 </item>
377 382 <item path="build/morfeusz/wrappers/python/swigPYTHON.cpp"
378 383 ex="true"
... ... @@ -403,10 +408,9 @@
403 408 </incDir>
404 409 <preprocessorList>
405 410 <Elem>BUILDING_MORFEUSZ</Elem>
406   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  411 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
407 412 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
408   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
409   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  413 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
410 414 <Elem>NDEBUG</Elem>
411 415 <Elem>libmorfeusz_EXPORTS</Elem>
412 416 </preprocessorList>
... ... @@ -420,10 +424,9 @@
420 424 </incDir>
421 425 <preprocessorList>
422 426 <Elem>BUILDING_MORFEUSZ</Elem>
423   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  427 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
424 428 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
425   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
426   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  429 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
427 430 <Elem>NDEBUG</Elem>
428 431 <Elem>libmorfeusz_EXPORTS</Elem>
429 432 </preprocessorList>
... ... @@ -437,10 +440,9 @@
437 440 </incDir>
438 441 <preprocessorList>
439 442 <Elem>BUILDING_MORFEUSZ</Elem>
440   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  443 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
441 444 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
442   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
443   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  445 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
444 446 <Elem>NDEBUG</Elem>
445 447 <Elem>libmorfeusz_EXPORTS</Elem>
446 448 </preprocessorList>
... ... @@ -454,10 +456,9 @@
454 456 </incDir>
455 457 <preprocessorList>
456 458 <Elem>BUILDING_MORFEUSZ</Elem>
457   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  459 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
458 460 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
459   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
460   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  461 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
461 462 <Elem>NDEBUG</Elem>
462 463 <Elem>libmorfeusz_EXPORTS</Elem>
463 464 </preprocessorList>
... ... @@ -471,10 +472,9 @@
471 472 </incDir>
472 473 <preprocessorList>
473 474 <Elem>BUILDING_MORFEUSZ</Elem>
474   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  475 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
475 476 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
476   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
477   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  477 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
478 478 <Elem>NDEBUG</Elem>
479 479 <Elem>libmorfeusz_EXPORTS</Elem>
480 480 </preprocessorList>
... ... @@ -488,10 +488,9 @@
488 488 </incDir>
489 489 <preprocessorList>
490 490 <Elem>BUILDING_MORFEUSZ</Elem>
491   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  491 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
492 492 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
493   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
494   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  493 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
495 494 <Elem>NDEBUG</Elem>
496 495 <Elem>libmorfeusz_EXPORTS</Elem>
497 496 </preprocessorList>
... ... @@ -505,10 +504,9 @@
505 504 </incDir>
506 505 <preprocessorList>
507 506 <Elem>BUILDING_MORFEUSZ</Elem>
508   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  507 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
509 508 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
510   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
511   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  509 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
512 510 <Elem>NDEBUG</Elem>
513 511 <Elem>libmorfeusz_EXPORTS</Elem>
514 512 </preprocessorList>
... ... @@ -657,19 +655,18 @@
657 655 </incDir>
658 656 <preprocessorList>
659 657 <Elem>BUILDING_MORFEUSZ</Elem>
660   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  658 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
661 659 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
662   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
663   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
664 660 </preprocessorList>
665 661 </ccTool>
666 662 </folder>
667 663 <folder path="build/morfeusz/wrappers/java">
668 664 <ccTool>
669 665 <incDir>
670   - <pElem>/usr/lib/jvm/java-6-openjdk/include</pElem>
  666 + <pElem>/usr/lib/jvm/default-java/include</pElem>
671 667 </incDir>
672 668 <preprocessorList>
  669 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
673 670 <Elem>libjmorfeusz_EXPORTS</Elem>
674 671 </preprocessorList>
675 672 </ccTool>
... ... @@ -776,10 +773,9 @@
776 773 </incDir>
777 774 <preprocessorList>
778 775 <Elem>BUILDING_MORFEUSZ</Elem>
779   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  776 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
780 777 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
781   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
782   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  778 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
783 779 <Elem>NDEBUG</Elem>
784 780 <Elem>libmorfeusz_EXPORTS</Elem>
785 781 </preprocessorList>
... ... @@ -793,10 +789,9 @@
793 789 </incDir>
794 790 <preprocessorList>
795 791 <Elem>BUILDING_MORFEUSZ</Elem>
796   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  792 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
797 793 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
798   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
799   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  794 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
800 795 <Elem>NDEBUG</Elem>
801 796 <Elem>libmorfeusz_EXPORTS</Elem>
802 797 </preprocessorList>
... ... @@ -810,10 +805,9 @@
810 805 </incDir>
811 806 <preprocessorList>
812 807 <Elem>BUILDING_MORFEUSZ</Elem>
813   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  808 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
814 809 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
815   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
816   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  810 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
817 811 <Elem>NDEBUG</Elem>
818 812 <Elem>libmorfeusz_EXPORTS</Elem>
819 813 </preprocessorList>
... ... @@ -827,10 +821,9 @@
827 821 </incDir>
828 822 <preprocessorList>
829 823 <Elem>BUILDING_MORFEUSZ</Elem>
830   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  824 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
831 825 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
832   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
833   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  826 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
834 827 <Elem>NDEBUG</Elem>
835 828 <Elem>libmorfeusz_EXPORTS</Elem>
836 829 </preprocessorList>
... ... @@ -844,10 +837,9 @@
844 837 </incDir>
845 838 <preprocessorList>
846 839 <Elem>BUILDING_MORFEUSZ</Elem>
847   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  840 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
848 841 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
849   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
850   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  842 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
851 843 <Elem>NDEBUG</Elem>
852 844 <Elem>libmorfeusz_EXPORTS</Elem>
853 845 </preprocessorList>
... ... @@ -861,10 +853,9 @@
861 853 </incDir>
862 854 <preprocessorList>
863 855 <Elem>BUILDING_MORFEUSZ</Elem>
864   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  856 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
865 857 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
866   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
867   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  858 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
868 859 <Elem>NDEBUG</Elem>
869 860 <Elem>libmorfeusz_EXPORTS</Elem>
870 861 </preprocessorList>
... ... @@ -878,10 +869,9 @@
878 869 </incDir>
879 870 <preprocessorList>
880 871 <Elem>BUILDING_MORFEUSZ</Elem>
881   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  872 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
882 873 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
883   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
884   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  874 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
885 875 <Elem>NDEBUG</Elem>
886 876 <Elem>libmorfeusz_EXPORTS</Elem>
887 877 </preprocessorList>
... ... @@ -895,10 +885,9 @@
895 885 </incDir>
896 886 <preprocessorList>
897 887 <Elem>BUILDING_MORFEUSZ</Elem>
898   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  888 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
899 889 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
900   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
901   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  890 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
902 891 <Elem>NDEBUG</Elem>
903 892 <Elem>libmorfeusz_EXPORTS</Elem>
904 893 </preprocessorList>
... ... @@ -912,39 +901,54 @@
912 901 </incDir>
913 902 <preprocessorList>
914 903 <Elem>BUILDING_MORFEUSZ</Elem>
915   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  904 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
916 905 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
917   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
918   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  906 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
919 907 <Elem>NDEBUG</Elem>
920 908 <Elem>libmorfeusz_EXPORTS</Elem>
921 909 </preprocessorList>
922 910 </ccTool>
923 911 </item>
924 912 <item path="morfeusz/c_api/ResultsManager.cpp" ex="false" tool="1" flavor2="4">
  913 + <ccTool flags="1">
  914 + </ccTool>
925 915 </item>
926 916 <item path="morfeusz/case/CaseConverter.cpp" ex="false" tool="1" flavor2="4">
  917 + <ccTool flags="1">
  918 + </ccTool>
927 919 </item>
928 920 <item path="morfeusz/case/CasePatternHelper.cpp"
929 921 ex="false"
930 922 tool="1"
931 923 flavor2="4">
  924 + <ccTool flags="1">
  925 + </ccTool>
932 926 </item>
933 927 <item path="morfeusz/case/caseconv.cpp" ex="false" tool="1" flavor2="4">
  928 + <ccTool flags="1">
  929 + </ccTool>
934 930 </item>
935 931 <item path="morfeusz/charset/CharsetConverter.cpp"
936 932 ex="false"
937 933 tool="1"
938 934 flavor2="4">
  935 + <ccTool flags="1">
  936 + </ccTool>
939 937 </item>
940 938 <item path="morfeusz/charset/TextReader.cpp" ex="false" tool="1" flavor2="4">
  939 + <ccTool flags="1">
  940 + </ccTool>
941 941 </item>
942 942 <item path="morfeusz/charset/conversion_tables.cpp"
943 943 ex="false"
944 944 tool="1"
945 945 flavor2="4">
  946 + <ccTool flags="1">
  947 + </ccTool>
946 948 </item>
947 949 <item path="morfeusz/cli/cli.cpp" ex="false" tool="1" flavor2="4">
  950 + <ccTool flags="1">
  951 + </ccTool>
948 952 </item>
949 953 <item path="morfeusz/const.cpp" ex="false" tool="1" flavor2="4">
950 954 <ccTool flags="1">
... ... @@ -954,10 +958,9 @@
954 958 </incDir>
955 959 <preprocessorList>
956 960 <Elem>BUILDING_MORFEUSZ</Elem>
957   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  961 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
958 962 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
959   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
960   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  963 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
961 964 <Elem>NDEBUG</Elem>
962 965 <Elem>libmorfeusz_EXPORTS</Elem>
963 966 </preprocessorList>
... ... @@ -967,28 +970,40 @@
967 970 ex="false"
968 971 tool="1"
969 972 flavor2="4">
  973 + <ccTool flags="1">
  974 + </ccTool>
970 975 </item>
971 976 <item path="morfeusz/deserialization/MorphDeserializer.cpp"
972 977 ex="false"
973 978 tool="1"
974 979 flavor2="4">
  980 + <ccTool flags="1">
  981 + </ccTool>
975 982 </item>
976 983 <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder.cpp"
977 984 ex="false"
978 985 tool="1"
979 986 flavor2="4">
  987 + <ccTool flags="1">
  988 + </ccTool>
980 989 </item>
981 990 <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder4Analyzer.cpp"
982 991 ex="false"
983 992 tool="1"
984 993 flavor2="4">
  994 + <ccTool flags="1">
  995 + </ccTool>
985 996 </item>
986 997 <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder4Generator.cpp"
987 998 ex="false"
988 999 tool="1"
989 1000 flavor2="4">
  1001 + <ccTool flags="1">
  1002 + </ccTool>
990 1003 </item>
991 1004 <item path="morfeusz/fsa/const.cpp" ex="false" tool="1" flavor2="4">
  1005 + <ccTool flags="1">
  1006 + </ccTool>
992 1007 </item>
993 1008 <item path="morfeusz/morfeusz2_c.cpp" ex="false" tool="1" flavor2="4">
994 1009 <ccTool flags="1">
... ... @@ -998,10 +1013,9 @@
998 1013 </incDir>
999 1014 <preprocessorList>
1000 1015 <Elem>BUILDING_MORFEUSZ</Elem>
1001   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  1016 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
1002 1017 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
1003   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
1004   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  1018 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
1005 1019 <Elem>NDEBUG</Elem>
1006 1020 <Elem>libmorfeusz_EXPORTS</Elem>
1007 1021 </preprocessorList>
... ... @@ -1015,10 +1029,9 @@
1015 1029 </incDir>
1016 1030 <preprocessorList>
1017 1031 <Elem>BUILDING_MORFEUSZ</Elem>
1018   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  1032 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
1019 1033 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
1020   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
1021   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  1034 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
1022 1035 <Elem>NDEBUG</Elem>
1023 1036 </preprocessorList>
1024 1037 </ccTool>
... ... @@ -1031,17 +1044,20 @@
1031 1044 </incDir>
1032 1045 <preprocessorList>
1033 1046 <Elem>BUILDING_MORFEUSZ</Elem>
1034   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  1047 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
1035 1048 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
1036   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
1037   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  1049 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
1038 1050 <Elem>NDEBUG</Elem>
1039 1051 </preprocessorList>
1040 1052 </ccTool>
1041 1053 </item>
1042 1054 <item path="morfeusz/segrules/SegrulesFSA.cpp" ex="false" tool="1" flavor2="4">
  1055 + <ccTool flags="1">
  1056 + </ccTool>
1043 1057 </item>
1044 1058 <item path="morfeusz/segrules/segrules.cpp" ex="false" tool="1" flavor2="4">
  1059 + <ccTool flags="1">
  1060 + </ccTool>
1045 1061 </item>
1046 1062 <item path="morfeusz/test_runner.cpp" ex="false" tool="1" flavor2="4">
1047 1063 <ccTool flags="0">
... ... @@ -1051,10 +1067,9 @@
1051 1067 </incDir>
1052 1068 <preprocessorList>
1053 1069 <Elem>BUILDING_MORFEUSZ</Elem>
1054   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  1070 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
1055 1071 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
1056   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
1057   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  1072 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
1058 1073 <Elem>NDEBUG</Elem>
1059 1074 </preprocessorList>
1060 1075 </ccTool>
... ... @@ -1069,10 +1084,9 @@
1069 1084 </incDir>
1070 1085 <preprocessorList>
1071 1086 <Elem>BUILDING_MORFEUSZ</Elem>
1072   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  1087 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
1073 1088 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
1074   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
1075   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  1089 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
1076 1090 <Elem>NDEBUG</Elem>
1077 1091 </preprocessorList>
1078 1092 </ccTool>
... ... @@ -1085,10 +1099,9 @@
1085 1099 </incDir>
1086 1100 <preprocessorList>
1087 1101 <Elem>BUILDING_MORFEUSZ</Elem>
1088   - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem>
  1102 + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem>
1089 1103 <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem>
1090   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem>
1091   - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem>
  1104 + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem>
1092 1105 <Elem>NDEBUG</Elem>
1093 1106 </preprocessorList>
1094 1107 </ccTool>
... ...