diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-15 10:03:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-23 10:31:15 +0000 |
| commit | 15704e6319c1194944df6c25a9d1ce413f309610 (patch) | |
| tree | 102dc3a0246050c2eaba15fa166049eaef92e1f9 /scp2 | |
| parent | 5f7667e9c193f281c344fb38408028235c871a15 (diff) | |
bootstrap replacement c++ help component
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 11 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 11 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 6 |
4 files changed, 13 insertions, 19 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 59aa150d2b6a..76f65c59afdf 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1243,6 +1243,17 @@ File gid_File_Lib_Tvhlp1 #endif End +File gid_File_Lib_CLuceneHelpWrapper + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + Name = STRING(CONCAT2(libCLuceneHelpWrapper,UNXSUFFIX)); + #else + Name = "libCLuceneHelpWrapper.dll"; + #endif +End + File gid_File_Lib_Ucb1 LIB_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 3fd19c5567d7..33279783e9ba 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -403,17 +403,6 @@ End #ifdef SOLAR_JAVA -#ifndef SYSTEM_LUCENE -STD_JAR_FILE( gid_File_Jar_Lucene_Core, lucene-core-2.3 ) -STD_JAR_FILE( gid_File_Jar_Lucene_Analyzers, lucene-analyzers-2.3 ) -#endif -#endif - -#ifdef SOLAR_JAVA -STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper ) -#endif - -#ifdef SOLAR_JAVA #ifndef MACOSX diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 244cf558d9df..bd1036b38cdc 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -194,10 +194,6 @@ SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\" SCPDEFS+=-DGCJ .ENDIF -.IF "$(SYSTEM_LUCENE)" == "YES" -SCPDEFS+=-DSYSTEM_LUCENE -.ENDIF - .IF "$(SYSTEM_ICU)" == "YES" SCPDEFS+=\ -DSYSTEM_ICU \ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 563652325165..5f6684aa8ef3 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -159,9 +159,6 @@ Module gid_Module_Root_Files_3 gid_File_Jar_Xflatxml, gid_File_Jar_Xmerge, gid_File_Jar_Xmergebridge, - gid_File_Jar_Lucene_Core, - gid_File_Jar_Lucene_Analyzers, - gid_File_Jar_Lucenehelpwrapper, gid_File_Rdb_Offapi, gid_Starregistry_Services_Rdb); End @@ -339,8 +336,9 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Dlgprov, gid_File_Lib_Stringresource, gid_File_Lib_Ldapbe2, - gid_File_Lib_Comphelper2, gid_File_Lib_Cached1, + gid_File_Lib_CLuceneHelpWrapper, + gid_File_Lib_Comphelper2, gid_File_Lib_Curl, gid_Unixlink_File_Lib_Curl, gid_File_Lib_Db, |