Commit d5d8b1a3fa96c803b9f86fef8d0b5384c25b5f1e
1 parent
5083bb56
- testy poprawione tak, by valgrind się nie czepiał.
- dodanie programiku do odpalania wersji z formatem ze starego morfeusza git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/trunk@316 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Showing
7 changed files
with
155 additions
and
140 deletions
CMakeLists.txt
... | ... | @@ -22,7 +22,7 @@ elseif (INPUT_DICTIONARIES) |
22 | 22 | elseif (NOT SKIP_DICTIONARY_BUILDING) |
23 | 23 | message (WARNING "Will build WITHOUT DICTIONARY. Set INPUT_DICTIONARIES option to build with dictionary.") |
24 | 24 | endif () |
25 | -set (CMAKE_BUILD_TYPE Release) | |
25 | +set (CMAKE_BUILD_TYPE Debug) | |
26 | 26 | #~ set (CMAKE_SKIP_RPATH ON) |
27 | 27 | |
28 | 28 | message ("Version=${Morfeusz_VERSION}") |
... | ... |
morfeusz/CMakeLists.txt
... | ... | @@ -74,6 +74,7 @@ set(SRC_FILES |
74 | 74 | deserialization/MorphDeserializer.cpp |
75 | 75 | morfeusz2_c.cpp |
76 | 76 | c_api/ResultsManager.cpp |
77 | + morfeusz_analyzer_old.cpp | |
77 | 78 | ) |
78 | 79 | |
79 | 80 | if (EMBEDDED_DEFAULT_DICT) |
... | ... | @@ -88,9 +89,11 @@ add_library (libmorfeusz SHARED ${SRC_FILES}) |
88 | 89 | set_target_properties (libmorfeusz PROPERTIES OUTPUT_NAME "morfeusz2") |
89 | 90 | |
90 | 91 | add_executable (morfeusz_analyzer morfeusz_analyzer.cpp) |
92 | +add_executable (morfeusz_analyzer_old morfeusz_analyzer_old.cpp) | |
91 | 93 | add_executable (morfeusz_generator morfeusz_generator.cpp) |
92 | 94 | |
93 | 95 | target_link_libraries (morfeusz_analyzer libmorfeusz) |
96 | +target_link_libraries (morfeusz_analyzer_old libmorfeusz) | |
94 | 97 | target_link_libraries (morfeusz_generator libmorfeusz) |
95 | 98 | |
96 | 99 | add_subdirectory (wrappers) |
... | ... |
morfeusz/cli/cli.cpp
... | ... | @@ -235,7 +235,7 @@ namespace morfeusz { |
235 | 235 | 1, // Number of args expected. |
236 | 236 | 0, // Delimiter if expecting multiple args. |
237 | 237 | "token numbering strategy\n\ |
238 | - * SEPARATE_NUMBERING (default) - Start from 0 and reset counter for every line\n\ | |
238 | + * SEPARATE_NUMBERING (default) - Start from 0 and reset counter for each line of input text.\n\ | |
239 | 239 | * CONTINUOUS_NUMBERING - start from 0 and never reset counter\n", // Help description. |
240 | 240 | // "-token-numbering", // Flag token. |
241 | 241 | "--token-numbering" // Flag token. |
... | ... |
morfeusz/morfeusz2_c.cpp
... | ... | @@ -27,7 +27,8 @@ InterpMorf* morfeusz_analyse(char *tekst) { |
27 | 27 | static ResultsManager resultsManager(morfeuszInstance); |
28 | 28 | static vector<MorphInterpretation> results; |
29 | 29 | results.clear(); |
30 | - morfeuszInstance->analyse(string(tekst), results); | |
30 | + string input(tekst); | |
31 | + morfeuszInstance->analyse(input, results); | |
31 | 32 | return resultsManager.convertResults(results); |
32 | 33 | } |
33 | 34 | |
... | ... |
morfeusz/morfeusz_analyzer_old.cpp
0 → 100644
1 | +/* | |
2 | + * Copied from old version of morfeusz. | |
3 | + */ | |
4 | +#include <stdio.h> | |
5 | +#include "morfeusz2_c.h" | |
6 | + | |
7 | +#define BUFLEN 10000 | |
8 | + | |
9 | +int main() { | |
10 | + InterpMorf *mo; | |
11 | + char buf[BUFLEN]; | |
12 | + | |
13 | + // morfeusz_set_option(MORFOPT_ENCODING, MORFEUSZ_ISO8859_2); | |
14 | +#ifdef __WIN32 | |
15 | + morfeusz_set_option(MORFOPT_ENCODING, MORFEUSZ_CP852); | |
16 | +#else | |
17 | + morfeusz_set_option(MORFOPT_ENCODING, MORFEUSZ_UTF_8); | |
18 | +#endif | |
19 | + fprintf(stderr, "%s\n\n", morfeusz_about()); | |
20 | + | |
21 | + | |
22 | + while (fgets(buf, BUFLEN, stdin)) { | |
23 | + int i = 0, prevp = -1; | |
24 | + mo = morfeusz_analyse(buf); | |
25 | + if (mo[0].p == -1) continue; | |
26 | + printf("["); | |
27 | + while (mo[i].p != -1) { | |
28 | + if (prevp != -1) | |
29 | + if (prevp != mo[i].p) printf("]\n["); | |
30 | + else printf("; "); | |
31 | + printf("%s,%s,%s", | |
32 | +// mo[i].p, mo[i].k, | |
33 | + mo[i].forma, | |
34 | + mo[i].haslo == NULL ? "?" : mo[i].haslo, | |
35 | + mo[i].interp == NULL ? "?" : mo[i].interp); | |
36 | + prevp = mo[i].p; | |
37 | + i++; | |
38 | + } | |
39 | + printf("]\n"); | |
40 | + } | |
41 | + return 0; | |
42 | +} | |
... | ... |
morfeusz/tests/TestCAPI.cpp
... | ... | @@ -30,7 +30,7 @@ void TestCAPI::tearDown() { |
30 | 30 | void TestCAPI::testTwoSimpleInvocations() { |
31 | 31 | cerr << "testTwoSimpleInvocations" << endl; |
32 | 32 | |
33 | - char* text = const_cast<char*> ("AAaaBBbbCCcc DDDD."); | |
33 | + char* text = "AAaaBBbbCCcc DDDD."; | |
34 | 34 | InterpMorf* results = morfeusz_analyse(text); |
35 | 35 | CPPUNIT_ASSERT_EQUAL(0, results[0].p); |
36 | 36 | CPPUNIT_ASSERT_EQUAL(1, results[0].k); |
... | ... | @@ -51,7 +51,7 @@ void TestCAPI::testTwoSimpleInvocations() { |
51 | 51 | // CPPUNIT_ASSERT_EQUAL(string("ign"), string(results[2].interp)); |
52 | 52 | CPPUNIT_ASSERT_EQUAL(-1, results[3].p); |
53 | 53 | |
54 | - char* text1 = const_cast<char*> (string("EEeeFFff").c_str()); | |
54 | + char* text1 = "EEeeFFff"; | |
55 | 55 | results = morfeusz_analyse(text1); |
56 | 56 | CPPUNIT_ASSERT_EQUAL(0, results[0].p); |
57 | 57 | CPPUNIT_ASSERT_EQUAL(1, results[0].k); |
... | ... | @@ -68,7 +68,7 @@ void TestCAPI::testWhitespaceKEEP() { |
68 | 68 | |
69 | 69 | CPPUNIT_ASSERT_EQUAL(1, morfeusz_set_option(MORFOPT_WHITESPACE, MORFEUSZ_KEEP_WHITESPACE)); |
70 | 70 | |
71 | - char* text = const_cast<char*> (string("AAaaBBbbCCcc .").c_str()); | |
71 | + char* text = "AAaaBBbbCCcc ."; | |
72 | 72 | InterpMorf* results = morfeusz_analyse(text); |
73 | 73 | CPPUNIT_ASSERT_EQUAL(0, results[0].p); |
74 | 74 | CPPUNIT_ASSERT_EQUAL(1, results[0].k); |
... | ... | @@ -96,7 +96,7 @@ void TestCAPI::testWhitespaceAPPEND() { |
96 | 96 | |
97 | 97 | CPPUNIT_ASSERT_EQUAL(1, morfeusz_set_option(MORFOPT_WHITESPACE, MORFEUSZ_APPEND_WHITESPACE)); |
98 | 98 | |
99 | - char* text = const_cast<char*> (string("AAaaBBbbCCcc .").c_str()); | |
99 | + char* text = "AAaaBBbbCCcc ."; | |
100 | 100 | InterpMorf* results = morfeusz_analyse(text); |
101 | 101 | CPPUNIT_ASSERT_EQUAL(0, results[0].p); |
102 | 102 | CPPUNIT_ASSERT_EQUAL(1, results[0].k); |
... | ... | @@ -135,7 +135,7 @@ void TestCAPI::testTokenNumberingCONTINUOUS() { |
135 | 135 | CPPUNIT_ASSERT_EQUAL(1, morfeusz_set_option(MORFOPT_WHITESPACE, MORFEUSZ_SKIP_WHITESPACE)); |
136 | 136 | CPPUNIT_ASSERT_EQUAL(1, morfeusz_set_option(MORFOPT_TOKEN_NUMBERING, MORFEUSZ_CONTINUOUS_TOKEN_NUMBERING)); |
137 | 137 | |
138 | - InterpMorf* results = morfeusz_analyse(const_cast<char*>("aaaabbbb bbbbcccc.")); | |
138 | + InterpMorf* results = morfeusz_analyse("aaaabbbb bbbbcccc."); | |
139 | 139 | CPPUNIT_ASSERT_EQUAL(0, results[0].p); |
140 | 140 | CPPUNIT_ASSERT_EQUAL(1, results[0].k); |
141 | 141 | CPPUNIT_ASSERT_EQUAL(string("aaaabbbb"), string(results[0].forma)); |
... | ... |
nbproject/configurations.xml
... | ... | @@ -210,8 +210,9 @@ |
210 | 210 | <rebuildPropChanged>false</rebuildPropChanged> |
211 | 211 | </toolsSet> |
212 | 212 | <flagsDictionary> |
213 | - <element flagsID="0" commonFlags="-std=c++98 -O3"/> | |
213 | + <element flagsID="0" commonFlags="-std=c++98"/> | |
214 | 214 | <element flagsID="1" commonFlags="-std=c++98 -O3 -fPIC"/> |
215 | + <element flagsID="2" commonFlags="-std=c++98 -fPIC"/> | |
215 | 216 | </flagsDictionary> |
216 | 217 | <codeAssistance> |
217 | 218 | <includeAdditional>true</includeAdditional> |
... | ... | @@ -253,6 +254,7 @@ |
253 | 254 | <pElem>build/fsa</pElem> |
254 | 255 | </incDir> |
255 | 256 | <preprocessorList> |
257 | + <Elem>NDEBUG</Elem> | |
256 | 258 | <Elem>_OPTIMIZE__=1</Elem> |
257 | 259 | <Elem>__PIC__=2</Elem> |
258 | 260 | <Elem>__pic__=2</Elem> |
... | ... | @@ -273,6 +275,7 @@ |
273 | 275 | <pElem>build/fsa</pElem> |
274 | 276 | </incDir> |
275 | 277 | <preprocessorList> |
278 | + <Elem>NDEBUG</Elem> | |
276 | 279 | <Elem>_OPTIMIZE__=1</Elem> |
277 | 280 | <Elem>__PIC__=2</Elem> |
278 | 281 | <Elem>__pic__=2</Elem> |
... | ... | @@ -365,6 +368,10 @@ |
365 | 368 | <pElem>build/morfeusz/wrappers/perl</pElem> |
366 | 369 | </incDir> |
367 | 370 | <preprocessorList> |
371 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
372 | + <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem> | |
373 | + <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem> | |
374 | + <Elem>NDEBUG</Elem> | |
368 | 375 | <Elem>morfeusz_perl_EXPORTS</Elem> |
369 | 376 | </preprocessorList> |
370 | 377 | </ccTool> |
... | ... | @@ -373,6 +380,8 @@ |
373 | 380 | ex="false" |
374 | 381 | tool="1" |
375 | 382 | flavor2="4"> |
383 | + <ccTool flags="2"> | |
384 | + </ccTool> | |
376 | 385 | </item> |
377 | 386 | <item path="build/morfeusz/wrappers/python/swigPYTHON.cpp" |
378 | 387 | ex="true" |
... | ... | @@ -403,11 +412,9 @@ |
403 | 412 | </incDir> |
404 | 413 | <preprocessorList> |
405 | 414 | <Elem>BUILDING_MORFEUSZ</Elem> |
406 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
415 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
407 | 416 | <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> | |
410 | - <Elem>NDEBUG</Elem> | |
417 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
411 | 418 | <Elem>libmorfeusz_EXPORTS</Elem> |
412 | 419 | </preprocessorList> |
413 | 420 | </ccTool> |
... | ... | @@ -420,11 +427,9 @@ |
420 | 427 | </incDir> |
421 | 428 | <preprocessorList> |
422 | 429 | <Elem>BUILDING_MORFEUSZ</Elem> |
423 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
430 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
424 | 431 | <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> | |
427 | - <Elem>NDEBUG</Elem> | |
432 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
428 | 433 | <Elem>libmorfeusz_EXPORTS</Elem> |
429 | 434 | </preprocessorList> |
430 | 435 | </ccTool> |
... | ... | @@ -437,11 +442,9 @@ |
437 | 442 | </incDir> |
438 | 443 | <preprocessorList> |
439 | 444 | <Elem>BUILDING_MORFEUSZ</Elem> |
440 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
445 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
441 | 446 | <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> | |
444 | - <Elem>NDEBUG</Elem> | |
447 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
445 | 448 | <Elem>libmorfeusz_EXPORTS</Elem> |
446 | 449 | </preprocessorList> |
447 | 450 | </ccTool> |
... | ... | @@ -454,11 +457,9 @@ |
454 | 457 | </incDir> |
455 | 458 | <preprocessorList> |
456 | 459 | <Elem>BUILDING_MORFEUSZ</Elem> |
457 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
460 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
458 | 461 | <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>NDEBUG</Elem> | |
462 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
462 | 463 | <Elem>libmorfeusz_EXPORTS</Elem> |
463 | 464 | </preprocessorList> |
464 | 465 | </ccTool> |
... | ... | @@ -471,11 +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> | |
478 | - <Elem>NDEBUG</Elem> | |
477 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
479 | 478 | <Elem>libmorfeusz_EXPORTS</Elem> |
480 | 479 | </preprocessorList> |
481 | 480 | </ccTool> |
... | ... | @@ -488,11 +487,9 @@ |
488 | 487 | </incDir> |
489 | 488 | <preprocessorList> |
490 | 489 | <Elem>BUILDING_MORFEUSZ</Elem> |
491 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
490 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
492 | 491 | <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> | |
495 | - <Elem>NDEBUG</Elem> | |
492 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
496 | 493 | <Elem>libmorfeusz_EXPORTS</Elem> |
497 | 494 | </preprocessorList> |
498 | 495 | </ccTool> |
... | ... | @@ -505,11 +502,9 @@ |
505 | 502 | </incDir> |
506 | 503 | <preprocessorList> |
507 | 504 | <Elem>BUILDING_MORFEUSZ</Elem> |
508 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
505 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
509 | 506 | <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> | |
512 | - <Elem>NDEBUG</Elem> | |
507 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
513 | 508 | <Elem>libmorfeusz_EXPORTS</Elem> |
514 | 509 | </preprocessorList> |
515 | 510 | </ccTool> |
... | ... | @@ -643,13 +638,6 @@ |
643 | 638 | <output>${TESTDIR}/TestFiles/f9</output> |
644 | 639 | </linkerTool> |
645 | 640 | </folder> |
646 | - <folder path="build"> | |
647 | - <ccTool> | |
648 | - <preprocessorList> | |
649 | - <Elem>NDEBUG</Elem> | |
650 | - </preprocessorList> | |
651 | - </ccTool> | |
652 | - </folder> | |
653 | 641 | <folder path="build/morfeusz"> |
654 | 642 | <ccTool> |
655 | 643 | <incDir> |
... | ... | @@ -657,19 +645,18 @@ |
657 | 645 | </incDir> |
658 | 646 | <preprocessorList> |
659 | 647 | <Elem>BUILDING_MORFEUSZ</Elem> |
660 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
648 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
661 | 649 | <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 | 650 | </preprocessorList> |
665 | 651 | </ccTool> |
666 | 652 | </folder> |
667 | 653 | <folder path="build/morfeusz/wrappers/java"> |
668 | 654 | <ccTool> |
669 | 655 | <incDir> |
670 | - <pElem>/usr/lib/jvm/java-6-openjdk/include</pElem> | |
656 | + <pElem>/usr/lib/jvm/default-java/include</pElem> | |
671 | 657 | </incDir> |
672 | 658 | <preprocessorList> |
659 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
673 | 660 | <Elem>libjmorfeusz_EXPORTS</Elem> |
674 | 661 | </preprocessorList> |
675 | 662 | </ccTool> |
... | ... | @@ -692,7 +679,6 @@ |
692 | 679 | <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> |
693 | 680 | <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> |
694 | 681 | <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> |
695 | - <Elem>NDEBUG</Elem> | |
696 | 682 | <Elem>morfeusz_perl_EXPORTS</Elem> |
697 | 683 | </preprocessorList> |
698 | 684 | </ccTool> |
... | ... | @@ -769,212 +755,192 @@ |
769 | 755 | ex="false" |
770 | 756 | tool="1" |
771 | 757 | flavor2="4"> |
772 | - <ccTool flags="1"> | |
758 | + <ccTool flags="2"> | |
773 | 759 | <incDir> |
774 | 760 | <pElem>morfeusz</pElem> |
775 | 761 | <pElem>build/morfeusz</pElem> |
776 | 762 | </incDir> |
777 | 763 | <preprocessorList> |
778 | 764 | <Elem>BUILDING_MORFEUSZ</Elem> |
779 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
765 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
780 | 766 | <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> | |
783 | - <Elem>NDEBUG</Elem> | |
767 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
784 | 768 | <Elem>libmorfeusz_EXPORTS</Elem> |
785 | 769 | </preprocessorList> |
786 | 770 | </ccTool> |
787 | 771 | </item> |
788 | 772 | <item path="morfeusz/Dictionary.cpp" ex="false" tool="1" flavor2="4"> |
789 | - <ccTool flags="1"> | |
773 | + <ccTool flags="2"> | |
790 | 774 | <incDir> |
791 | 775 | <pElem>morfeusz</pElem> |
792 | 776 | <pElem>build/morfeusz</pElem> |
793 | 777 | </incDir> |
794 | 778 | <preprocessorList> |
795 | 779 | <Elem>BUILDING_MORFEUSZ</Elem> |
796 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
780 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
797 | 781 | <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> | |
800 | - <Elem>NDEBUG</Elem> | |
782 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
801 | 783 | <Elem>libmorfeusz_EXPORTS</Elem> |
802 | 784 | </preprocessorList> |
803 | 785 | </ccTool> |
804 | 786 | </item> |
805 | 787 | <item path="morfeusz/Environment.cpp" ex="false" tool="1" flavor2="4"> |
806 | - <ccTool flags="1"> | |
788 | + <ccTool flags="2"> | |
807 | 789 | <incDir> |
808 | 790 | <pElem>morfeusz</pElem> |
809 | 791 | <pElem>build/morfeusz</pElem> |
810 | 792 | </incDir> |
811 | 793 | <preprocessorList> |
812 | 794 | <Elem>BUILDING_MORFEUSZ</Elem> |
813 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
795 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
814 | 796 | <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> | |
817 | - <Elem>NDEBUG</Elem> | |
797 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
818 | 798 | <Elem>libmorfeusz_EXPORTS</Elem> |
819 | 799 | </preprocessorList> |
820 | 800 | </ccTool> |
821 | 801 | </item> |
822 | 802 | <item path="morfeusz/IdResolverImpl.cpp" ex="false" tool="1" flavor2="4"> |
823 | - <ccTool flags="1"> | |
803 | + <ccTool flags="2"> | |
824 | 804 | <incDir> |
825 | 805 | <pElem>morfeusz</pElem> |
826 | 806 | <pElem>build/morfeusz</pElem> |
827 | 807 | </incDir> |
828 | 808 | <preprocessorList> |
829 | 809 | <Elem>BUILDING_MORFEUSZ</Elem> |
830 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
810 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
831 | 811 | <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> | |
834 | - <Elem>NDEBUG</Elem> | |
812 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
835 | 813 | <Elem>libmorfeusz_EXPORTS</Elem> |
836 | 814 | </preprocessorList> |
837 | 815 | </ccTool> |
838 | 816 | </item> |
839 | 817 | <item path="morfeusz/InflexionGraph.cpp" ex="false" tool="1" flavor2="4"> |
840 | - <ccTool flags="1"> | |
818 | + <ccTool flags="2"> | |
841 | 819 | <incDir> |
842 | 820 | <pElem>morfeusz</pElem> |
843 | 821 | <pElem>build/morfeusz</pElem> |
844 | 822 | </incDir> |
845 | 823 | <preprocessorList> |
846 | 824 | <Elem>BUILDING_MORFEUSZ</Elem> |
847 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
825 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
848 | 826 | <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> | |
851 | - <Elem>NDEBUG</Elem> | |
827 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
852 | 828 | <Elem>libmorfeusz_EXPORTS</Elem> |
853 | 829 | </preprocessorList> |
854 | 830 | </ccTool> |
855 | 831 | </item> |
856 | 832 | <item path="morfeusz/Morfeusz.cpp" ex="false" tool="1" flavor2="4"> |
857 | - <ccTool flags="1"> | |
833 | + <ccTool flags="2"> | |
858 | 834 | <incDir> |
859 | 835 | <pElem>morfeusz</pElem> |
860 | 836 | <pElem>build/morfeusz</pElem> |
861 | 837 | </incDir> |
862 | 838 | <preprocessorList> |
863 | 839 | <Elem>BUILDING_MORFEUSZ</Elem> |
864 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
840 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
865 | 841 | <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> | |
868 | - <Elem>NDEBUG</Elem> | |
842 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
869 | 843 | <Elem>libmorfeusz_EXPORTS</Elem> |
870 | 844 | </preprocessorList> |
871 | 845 | </ccTool> |
872 | 846 | </item> |
873 | 847 | <item path="morfeusz/MorfeuszImpl.cpp" ex="false" tool="1" flavor2="4"> |
874 | - <ccTool flags="1"> | |
848 | + <ccTool flags="2"> | |
875 | 849 | <incDir> |
876 | 850 | <pElem>morfeusz</pElem> |
877 | 851 | <pElem>build/morfeusz</pElem> |
878 | 852 | </incDir> |
879 | 853 | <preprocessorList> |
880 | 854 | <Elem>BUILDING_MORFEUSZ</Elem> |
881 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
855 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
882 | 856 | <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> | |
885 | - <Elem>NDEBUG</Elem> | |
857 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
886 | 858 | <Elem>libmorfeusz_EXPORTS</Elem> |
887 | 859 | </preprocessorList> |
888 | 860 | </ccTool> |
889 | 861 | </item> |
890 | 862 | <item path="morfeusz/MorphInterpretation.cpp" ex="false" tool="1" flavor2="4"> |
891 | - <ccTool flags="1"> | |
863 | + <ccTool flags="2"> | |
892 | 864 | <incDir> |
893 | 865 | <pElem>morfeusz</pElem> |
894 | 866 | <pElem>build/morfeusz</pElem> |
895 | 867 | </incDir> |
896 | 868 | <preprocessorList> |
897 | 869 | <Elem>BUILDING_MORFEUSZ</Elem> |
898 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
870 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
899 | 871 | <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> | |
902 | - <Elem>NDEBUG</Elem> | |
872 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
903 | 873 | <Elem>libmorfeusz_EXPORTS</Elem> |
904 | 874 | </preprocessorList> |
905 | 875 | </ccTool> |
906 | 876 | </item> |
907 | 877 | <item path="morfeusz/ResultsIteratorImpl.cpp" ex="false" tool="1" flavor2="4"> |
908 | - <ccTool flags="1"> | |
878 | + <ccTool flags="2"> | |
909 | 879 | <incDir> |
910 | 880 | <pElem>morfeusz</pElem> |
911 | 881 | <pElem>build/morfeusz</pElem> |
912 | 882 | </incDir> |
913 | 883 | <preprocessorList> |
914 | 884 | <Elem>BUILDING_MORFEUSZ</Elem> |
915 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
885 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
916 | 886 | <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> | |
919 | - <Elem>NDEBUG</Elem> | |
887 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
920 | 888 | <Elem>libmorfeusz_EXPORTS</Elem> |
921 | 889 | </preprocessorList> |
922 | 890 | </ccTool> |
923 | 891 | </item> |
924 | 892 | <item path="morfeusz/c_api/ResultsManager.cpp" ex="false" tool="1" flavor2="4"> |
925 | - <ccTool flags="1"> | |
893 | + <ccTool flags="2"> | |
926 | 894 | </ccTool> |
927 | 895 | </item> |
928 | 896 | <item path="morfeusz/case/CaseConverter.cpp" ex="false" tool="1" flavor2="4"> |
929 | - <ccTool flags="1"> | |
897 | + <ccTool flags="2"> | |
930 | 898 | </ccTool> |
931 | 899 | </item> |
932 | 900 | <item path="morfeusz/case/CasePatternHelper.cpp" |
933 | 901 | ex="false" |
934 | 902 | tool="1" |
935 | 903 | flavor2="4"> |
936 | - <ccTool flags="1"> | |
904 | + <ccTool flags="2"> | |
937 | 905 | </ccTool> |
938 | 906 | </item> |
939 | 907 | <item path="morfeusz/case/caseconv.cpp" ex="false" tool="1" flavor2="4"> |
940 | - <ccTool flags="1"> | |
908 | + <ccTool flags="2"> | |
941 | 909 | </ccTool> |
942 | 910 | </item> |
943 | 911 | <item path="morfeusz/charset/CharsetConverter.cpp" |
944 | 912 | ex="false" |
945 | 913 | tool="1" |
946 | 914 | flavor2="4"> |
947 | - <ccTool flags="1"> | |
915 | + <ccTool flags="2"> | |
948 | 916 | </ccTool> |
949 | 917 | </item> |
950 | 918 | <item path="morfeusz/charset/TextReader.cpp" ex="false" tool="1" flavor2="4"> |
951 | - <ccTool flags="1"> | |
919 | + <ccTool flags="2"> | |
952 | 920 | </ccTool> |
953 | 921 | </item> |
954 | 922 | <item path="morfeusz/charset/conversion_tables.cpp" |
955 | 923 | ex="false" |
956 | 924 | tool="1" |
957 | 925 | flavor2="4"> |
958 | - <ccTool flags="1"> | |
926 | + <ccTool flags="2"> | |
959 | 927 | </ccTool> |
960 | 928 | </item> |
961 | 929 | <item path="morfeusz/cli/cli.cpp" ex="false" tool="1" flavor2="4"> |
962 | - <ccTool flags="1"> | |
930 | + <ccTool flags="2"> | |
963 | 931 | </ccTool> |
964 | 932 | </item> |
965 | 933 | <item path="morfeusz/const.cpp" ex="false" tool="1" flavor2="4"> |
966 | - <ccTool flags="1"> | |
934 | + <ccTool flags="2"> | |
967 | 935 | <incDir> |
968 | 936 | <pElem>morfeusz</pElem> |
969 | 937 | <pElem>build/morfeusz</pElem> |
970 | 938 | </incDir> |
971 | 939 | <preprocessorList> |
972 | 940 | <Elem>BUILDING_MORFEUSZ</Elem> |
973 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
941 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
974 | 942 | <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> |
975 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem> | |
976 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem> | |
977 | - <Elem>NDEBUG</Elem> | |
943 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
978 | 944 | <Elem>libmorfeusz_EXPORTS</Elem> |
979 | 945 | </preprocessorList> |
980 | 946 | </ccTool> |
... | ... | @@ -983,54 +949,52 @@ |
983 | 949 | ex="false" |
984 | 950 | tool="1" |
985 | 951 | flavor2="4"> |
986 | - <ccTool flags="1"> | |
952 | + <ccTool flags="2"> | |
987 | 953 | </ccTool> |
988 | 954 | </item> |
989 | 955 | <item path="morfeusz/deserialization/MorphDeserializer.cpp" |
990 | 956 | ex="false" |
991 | 957 | tool="1" |
992 | 958 | flavor2="4"> |
993 | - <ccTool flags="1"> | |
959 | + <ccTool flags="2"> | |
994 | 960 | </ccTool> |
995 | 961 | </item> |
996 | 962 | <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder.cpp" |
997 | 963 | ex="false" |
998 | 964 | tool="1" |
999 | 965 | flavor2="4"> |
1000 | - <ccTool flags="1"> | |
966 | + <ccTool flags="2"> | |
1001 | 967 | </ccTool> |
1002 | 968 | </item> |
1003 | 969 | <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder4Analyzer.cpp" |
1004 | 970 | ex="false" |
1005 | 971 | tool="1" |
1006 | 972 | flavor2="4"> |
1007 | - <ccTool flags="1"> | |
973 | + <ccTool flags="2"> | |
1008 | 974 | </ccTool> |
1009 | 975 | </item> |
1010 | 976 | <item path="morfeusz/deserialization/morphInterps/InterpretedChunksDecoder4Generator.cpp" |
1011 | 977 | ex="false" |
1012 | 978 | tool="1" |
1013 | 979 | flavor2="4"> |
1014 | - <ccTool flags="1"> | |
980 | + <ccTool flags="2"> | |
1015 | 981 | </ccTool> |
1016 | 982 | </item> |
1017 | 983 | <item path="morfeusz/fsa/const.cpp" ex="false" tool="1" flavor2="4"> |
1018 | - <ccTool flags="1"> | |
984 | + <ccTool flags="2"> | |
1019 | 985 | </ccTool> |
1020 | 986 | </item> |
1021 | 987 | <item path="morfeusz/morfeusz2_c.cpp" ex="false" tool="1" flavor2="4"> |
1022 | - <ccTool flags="1"> | |
988 | + <ccTool flags="2"> | |
1023 | 989 | <incDir> |
1024 | 990 | <pElem>morfeusz</pElem> |
1025 | 991 | <pElem>build/morfeusz</pElem> |
1026 | 992 | </incDir> |
1027 | 993 | <preprocessorList> |
1028 | 994 | <Elem>BUILDING_MORFEUSZ</Elem> |
1029 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
995 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
1030 | 996 | <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> |
1031 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem> | |
1032 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem> | |
1033 | - <Elem>NDEBUG</Elem> | |
997 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
1034 | 998 | <Elem>libmorfeusz_EXPORTS</Elem> |
1035 | 999 | </preprocessorList> |
1036 | 1000 | </ccTool> |
... | ... | @@ -1043,11 +1007,24 @@ |
1043 | 1007 | </incDir> |
1044 | 1008 | <preprocessorList> |
1045 | 1009 | <Elem>BUILDING_MORFEUSZ</Elem> |
1046 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
1010 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
1047 | 1011 | <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> |
1048 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem> | |
1049 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem> | |
1050 | - <Elem>NDEBUG</Elem> | |
1012 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
1013 | + </preprocessorList> | |
1014 | + </ccTool> | |
1015 | + </item> | |
1016 | + <item path="morfeusz/morfeusz_analyzer_old.cpp" ex="false" tool="1" flavor2="4"> | |
1017 | + <ccTool flags="2"> | |
1018 | + <incDir> | |
1019 | + <pElem>morfeusz</pElem> | |
1020 | + <pElem>build/morfeusz</pElem> | |
1021 | + </incDir> | |
1022 | + <preprocessorList> | |
1023 | + <Elem>BUILDING_MORFEUSZ</Elem> | |
1024 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
1025 | + <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> | |
1026 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
1027 | + <Elem>libmorfeusz_EXPORTS</Elem> | |
1051 | 1028 | </preprocessorList> |
1052 | 1029 | </ccTool> |
1053 | 1030 | </item> |
... | ... | @@ -1059,20 +1036,18 @@ |
1059 | 1036 | </incDir> |
1060 | 1037 | <preprocessorList> |
1061 | 1038 | <Elem>BUILDING_MORFEUSZ</Elem> |
1062 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
1039 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
1063 | 1040 | <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> |
1064 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem> | |
1065 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem> | |
1066 | - <Elem>NDEBUG</Elem> | |
1041 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
1067 | 1042 | </preprocessorList> |
1068 | 1043 | </ccTool> |
1069 | 1044 | </item> |
1070 | 1045 | <item path="morfeusz/segrules/SegrulesFSA.cpp" ex="false" tool="1" flavor2="4"> |
1071 | - <ccTool flags="1"> | |
1046 | + <ccTool flags="2"> | |
1072 | 1047 | </ccTool> |
1073 | 1048 | </item> |
1074 | 1049 | <item path="morfeusz/segrules/segrules.cpp" ex="false" tool="1" flavor2="4"> |
1075 | - <ccTool flags="1"> | |
1050 | + <ccTool flags="2"> | |
1076 | 1051 | </ccTool> |
1077 | 1052 | </item> |
1078 | 1053 | <item path="morfeusz/test_runner.cpp" ex="false" tool="1" flavor2="4"> |
... | ... | @@ -1083,11 +1058,9 @@ |
1083 | 1058 | </incDir> |
1084 | 1059 | <preprocessorList> |
1085 | 1060 | <Elem>BUILDING_MORFEUSZ</Elem> |
1086 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
1061 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
1087 | 1062 | <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> |
1088 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem> | |
1089 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem> | |
1090 | - <Elem>NDEBUG</Elem> | |
1063 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
1091 | 1064 | </preprocessorList> |
1092 | 1065 | </ccTool> |
1093 | 1066 | </item> |
... | ... | @@ -1101,11 +1074,9 @@ |
1101 | 1074 | </incDir> |
1102 | 1075 | <preprocessorList> |
1103 | 1076 | <Elem>BUILDING_MORFEUSZ</Elem> |
1104 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
1077 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
1105 | 1078 | <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> |
1106 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem> | |
1107 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem> | |
1108 | - <Elem>NDEBUG</Elem> | |
1079 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
1109 | 1080 | </preprocessorList> |
1110 | 1081 | </ccTool> |
1111 | 1082 | </item> |
... | ... | @@ -1117,11 +1088,9 @@ |
1117 | 1088 | </incDir> |
1118 | 1089 | <preprocessorList> |
1119 | 1090 | <Elem>BUILDING_MORFEUSZ</Elem> |
1120 | - <Elem>MORFEUSZ2_VERSION="2.0.0_dupa-20140831"</Elem> | |
1091 | + <Elem>MORFEUSZ2_VERSION="2.0.0_dupa"</Elem> | |
1121 | 1092 | <Elem>MORFEUSZ_DEFAULT_DICT_NAME="dupa"</Elem> |
1122 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH1="/usr/local/share/morfeusz/dictionaries"</Elem> | |
1123 | - <Elem>MORFEUSZ_DICTIONARY_SEARCH_PATH2="/usr/share/morfeusz/dictionaries"</Elem> | |
1124 | - <Elem>NDEBUG</Elem> | |
1093 | + <Elem>MORFEUSZ_EMBEDDED_DEFAULT_DICT</Elem> | |
1125 | 1094 | </preprocessorList> |
1126 | 1095 | </ccTool> |
1127 | 1096 | </item> |
... | ... |