Attachment #54800 for issue #91158

View | Details | Raw Unified | Return to issue 91158
Collapse All | Expand All

Lines 1-4 Link Here

(-)xmlhelp/prj/build.lst (-1 / +1 lines)
1	xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools lucene NULL	1	xh xmlhelp : ucbhelper LIBXSLT:libxslt jut unoil BERKELEYDB:berkeleydb svtools LUCENE:lucene NULL
2	xh xmlhelp usr1 - all xh_mkout NULL	2	xh xmlhelp usr1 - all xh_mkout NULL
3	xh xmlhelp\inc nmake - all xh_inc NULL	3	xh xmlhelp\inc nmake - all xh_inc NULL
4	xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL	4	xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL

Lines 100-106 Link Here

(-)xmlhelp/source/com/sun/star/help/makefile.mk (-1 / +6 lines)
100	$(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class \	100	$(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class \
101	$(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class	101	$(CLASSDIR)$/$(PACKAGE)$/HelpFileDocument.class
102		102
103	JARFILES = lucene-core-2.3.jar ridl.jar jurt.jar unoil.jar juh.jar	103	JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
		104	.IF "$(SYSTEM_LUCENE)" == "YES"
		105	JARFILES += lucene-core-2.3.jar
		106	.ELSE
		107	XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
		108	.ENDIF
104	JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))	109	JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
105		110
106	JARTARGET = LuceneHelpWrapper.jar	111	JARTARGET = LuceneHelpWrapper.jar

Lines 476-483 Link Here

(-)scp2/source/ooo/file_ooo.scp (+2 lines)
476	#endif	476	#endif
477		477
478	#ifdef SOLAR_JAVA	478	#ifdef SOLAR_JAVA
		479	#ifndef SYSTEM_LUCENE
479	STD_JAR_FILE( gid_File_Jar_Lucene, lucene-core-2.3 )	480	STD_JAR_FILE( gid_File_Jar_Lucene, lucene-core-2.3 )
480	#endif	481	#endif
		482	#endif
481		483
482	#ifdef SOLAR_JAVA	484	#ifdef SOLAR_JAVA
483	UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )	485	UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )

Lines 339-344 Link Here

(-)config_office/configure.in (+28 lines)
339	AC_ARG_WITH(system-db,	339	AC_ARG_WITH(system-db,
340	[ --with-system-db Use berkeley db already on system	340	[ --with-system-db Use berkeley db already on system
341	],,)	341	],,)
		342	AC_ARG_WITH(system-lucene,
		343	[ --with-system-lucene Use hsqldb already on system
		344	],,)
		345	AC_ARG_WITH(lucene-core-jar,
		346	[ --with-lucene-core-jar=JARFILE Specify path to jarfile manually ],
		347	[ LUCENE_CORE_JAR="$withval"
		348	])
342	AC_ARG_WITH(system-hsqldb,	349	AC_ARG_WITH(system-hsqldb,
343	[ --with-system-hsqldb Use hsqldb already on system	350	[ --with-system-hsqldb Use hsqldb already on system
344	],,)	351	],,)
Lines 3660-3665 Link Here
3660	AC_SUBST(DB_JAR)	3675	AC_SUBST(DB_JAR)
3661		3676
3662	dnl ===================================================================	3677	dnl ===================================================================
		3678	dnl Check for system lucene
		3679	dnl ===================================================================
		3680	AC_MSG_CHECKING([which lucene to use])
		3681	if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
		3682	test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
		3683	AC_MSG_RESULT([external])
		3684	SYSTEM_LUCENE=YES
		3685	if test -z $LUCENE_CORE_JAR; then
		3686	LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar
		3687	fi
		3688	AC_CHECK_FILE($LUCENE_CORE_JAR, [],
		3689	[AC_MSG_ERROR(lucene-core.jar not found.)], [])
		3690	else
		3691	AC_MSG_RESULT([internal])
		3692	SYSTEM_LUCENE=NO
		3693	BUILD_TYPE="$BUILD_TYPE LUCENE"
		3694	fi
		3695	AC_SUBST(SYSTEM_LUCENE)
		3696	AC_SUBST(LUCENE_CORE_JAR)
		3697
		3698	dnl ===================================================================
3663	dnl Check for system hsqldb	3699	dnl Check for system hsqldb
3664	dnl ===================================================================	3700	dnl ===================================================================
3665	AC_MSG_CHECKING([which hsqldb to use])	3701	AC_MSG_CHECKING([which hsqldb to use])

Lines 1969-1974 Link Here

(-)config_office/set_soenv.in (+2 lines)
1969	ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );	1969	ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
1970	ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" );	1970	ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" );
1971	ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );	1971	ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" );
		1972	ToFile( "SYSTEM_LUCENE", "@SYSTEM_LUCENE@", "e" );
		1973	ToFile( "LUCENE_CORE_JAR", "@LUCENE_CORE_JAR@", "e" );
1972	ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );	1974	ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" );
1973	ToFile( "BSH_JAR", "@BSH_JAR@", "e" );	1975	ToFile( "BSH_JAR", "@BSH_JAR@", "e" );
1974	ToFile( "SYSTEM_XML_APIS", "@SYSTEM_XML_APIS@", "e" );	1976	ToFile( "SYSTEM_XML_APIS", "@SYSTEM_XML_APIS@", "e" );

Lines 91-97 Link Here

(-)solenv/config/sdev300.ini (-1 / +1 lines)
91	{	91	{
92	BIG_SVX TRUE	92	BIG_SVX TRUE
93	BMP_WRITES_FLAG TRUE	93	BMP_WRITES_FLAG TRUE
94	BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF	94	BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES FREETYPE HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT XALAN SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF LUCENE
95	RES_ENUS TRUE	95	RES_ENUS TRUE
96	RES_GER TRUE	96	RES_GER TRUE
97	NO_REC_RES TRUE	97	NO_REC_RES TRUE

Lines 1-6 Link Here

(-)helpcontent2/settings.pmk (-1 / +6 lines)
1	.INCLUDE : $(INCCOM)$/aux_langs.mk	1	.INCLUDE : $(INCCOM)$/aux_langs.mk
2		2
3	my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar	3	my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/LuceneHelpWrapper.jar$
		4	.IF "$(SYSTEM_LUCENE)" == "YES"
		5	my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)
		6	.ELSE
		7	my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(SOLARBINDIR)/lucene-core-2.3.jar
		8	.ENDIF
4		9
5	.IF "$(SYSTEM_DB)" != "YES"	10	.IF "$(SYSTEM_DB)" != "YES"
6	JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)	11	JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)

Return to issue 91158