[Libreoffice-commits] .: 3 commits - config_host.mk.in configure.in Makefile Module_tail_build.mk postprocess/packcomponents RepositoryExternal.mk Repository.mk tail_build/prj xmlhelp/Library_tvhlp1.mk xmlhelp/Library_ucpchelp1.mk xmlhelp/Makefile xmlhelp/Module_xmlhelp.mk xmlhelp/Package_xml.mk xmlhelp/prj xmlhelp/source xmlhelp/util xmlhelp/Zip_helpxsl.mk
David Tardon
dtardon at kemper.freedesktop.org
Sat Apr 7 07:44:35 PDT 2012
Makefile | 2
Module_tail_build.mk | 1
Repository.mk | 3
RepositoryExternal.mk | 33 +++++++++
config_host.mk.in | 3
configure.in | 12 +--
postprocess/packcomponents/makefile.mk | 4 -
tail_build/prj/build.lst | 2
xmlhelp/Library_tvhlp1.mk | 54 +++++++++++++++
xmlhelp/Library_ucpchelp1.mk | 97 ++++++++++++++++++++++++++++
xmlhelp/Makefile | 7 ++
xmlhelp/Module_xmlhelp.mk | 37 ++++++++++
xmlhelp/Package_xml.mk | 32 +++++++++
xmlhelp/Zip_helpxsl.mk | 36 ++++++++++
xmlhelp/prj/build.lst | 6 -
xmlhelp/prj/d.lst | 10 --
xmlhelp/prj/makefile.mk | 1
xmlhelp/source/cxxhelp/provider/makefile.mk | 96 ---------------------------
xmlhelp/source/cxxhelp/qe/makefile.mk | 51 --------------
xmlhelp/source/cxxhelp/util/makefile.mk | 52 ---------------
xmlhelp/source/treeview/makefile.mk | 77 ----------------------
xmlhelp/util/makefile.mk | 95 ---------------------------
22 files changed, 314 insertions(+), 397 deletions(-)
New commits:
commit 21ec3dbaa600f4d13792a6ea49090083a8f1150b
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 16:14:01 2012 +0200
move xmlhelp to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index dcbbdda..44b8413 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -92,6 +92,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
writerfilter \
writerperfect \
xmerge \
+ xmlhelp \
xmloff \
xmlscript \
xmlsecurity \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 9b0442b..9d02e0c 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil uno
test unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil uno
test unotools ure xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 69bd2f3630d83dbcab4cfb9d9ff7ccc6b7f2a139
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 16:12:22 2012 +0200
gbuildize xmlhelp
diff --git a/Makefile b/Makefile
index d412f16..1bfb75b 100644
--- a/Makefile
+++ b/Makefile
@@ -133,6 +133,7 @@ writerfilter\
writerperfect\
xmerge\
xml2cmp\
+xmlhelp\
xmloff\
xmlreader\
xmlscript\
@@ -236,7 +237,6 @@ udm\
unodevtools\
vigra\
x11_extensions\
-xmlhelp\
xpdf\
xsltml\
zlib\
diff --git a/Repository.mk b/Repository.mk
index 8f72da9..7775190 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -381,10 +381,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
subsequenttest \
test \
textconv_dict \
+ tvhlp1 \
ucb1 \
ucpdav1 \
ucpfile1 \
ucpftp1 \
+ ucpchelp1 \
ucphier1 \
ucppkg1 \
unoexceptionprotector \
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 711e1a0..c8067e2 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -171,8 +171,8 @@ my_components += \
component/fpicker/source/generic/fpicker \
component/fpicker/source/office/fps_office \
syssh \
- tvhlp1 \
- ucpchelp1 \
+ component/xmlhelp/source/treeview/tvhlp1 \
+ component/xmlhelp/util/ucpchelp1 \
.ENDIF
diff --git a/xmlhelp/Library_tvhlp1.mk b/xmlhelp/Library_tvhlp1.mk
new file mode 100644
index 0000000..75c8726
--- /dev/null
+++ b/xmlhelp/Library_tvhlp1.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,tvhlp1))
+
+$(eval $(call gb_Library_set_componentfile,tvhlp1,xmlhelp/source/treeview/tvhlp1))
+
+$(eval $(call gb_Library_add_api,tvhlp1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_externals,tvhlp1,\
+ expat_utf8 \
+))
+
+$(eval $(call gb_Library_add_linked_libs,tvhlp1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ utl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,tvhlp1,\
+ xmlhelp/source/treeview/tvfactory \
+ xmlhelp/source/treeview/tvread \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
new file mode 100644
index 0000000..d9006b8
--- /dev/null
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -0,0 +1,97 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,ucpchelp1))
+
+$(eval $(call gb_Library_set_componentfile,ucpchelp1,xmlhelp/util/ucpchelp1))
+
+# TODO: is this still relevant?
+# GCC versions 4.2.x introduced a warning "allocating zero-element array"
+# Allocating zero-element arrays is an allowed if not somewhat dubious
+# technique though, so this warning is plain wrong and has been fixed
+# in gcc 4.3. Unfortunately there is no way at all to suppress this warning.
+# Some files in this directory use zero allocated arrays, we need to
+# diable the WaE mechanism for the GCC 4.2.x series.
+# .IF "$(COM)"=="GCC"
+# .IF "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
+# CFLAGSWERRCXX:=
+# .ENDIF # "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
+# .ENDIF # "$(COM)"=="GCC"
+
+ifeq ($(GUI)$(COM),WNTMSC)
+$(eval $(call gb_Library_add_cxxflags,ucpchelp1,\
+ -GR \
+))
+endif
+
+$(eval $(call gb_Library_set_include,ucpchelp1,\
+ -I$(SRCDIR)/xmlhelp/source/cxxhelp/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,ucpchelp1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_externals,ucpchelp1,\
+ berkeleydb \
+ clucene \
+ expat_utf8 \
+ libxml2 \
+ libxslt \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ucpchelp1,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ helplinker \
+ sal \
+ ucbhelper \
+ utl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
+ xmlhelp/source/cxxhelp/provider/bufferedinputstream \
+ xmlhelp/source/cxxhelp/provider/content \
+ xmlhelp/source/cxxhelp/provider/contentcaps \
+ xmlhelp/source/cxxhelp/provider/databases \
+ xmlhelp/source/cxxhelp/provider/db \
+ xmlhelp/source/cxxhelp/provider/inputstream \
+ xmlhelp/source/cxxhelp/provider/provider \
+ xmlhelp/source/cxxhelp/provider/resultset \
+ xmlhelp/source/cxxhelp/provider/resultsetbase \
+ xmlhelp/source/cxxhelp/provider/resultsetforquery \
+ xmlhelp/source/cxxhelp/provider/resultsetforroot \
+ xmlhelp/source/cxxhelp/provider/services \
+ xmlhelp/source/cxxhelp/provider/urlparameter \
+ xmlhelp/source/cxxhelp/qe/DocGenerator \
+ xmlhelp/source/cxxhelp/util/Decompressor \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/xmlhelp/Makefile b/xmlhelp/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/xmlhelp/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlhelp/Module_xmlhelp.mk b/xmlhelp/Module_xmlhelp.mk
new file mode 100644
index 0000000..aa4dd94
--- /dev/null
+++ b/xmlhelp/Module_xmlhelp.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,xmlhelp))
+
+$(eval $(call gb_Module_add_targets,xmlhelp,\
+ Library_tvhlp1 \
+ Library_ucpchelp1 \
+ Package_xml \
+ Zip_helpxsl \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/xmlhelp/Package_xml.mk b/xmlhelp/Package_xml.mk
new file mode 100644
index 0000000..5e23bb6
--- /dev/null
+++ b/xmlhelp/Package_xml.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,xmlhelp_xml,$(SRCDIR)/xmlhelp/util))
+
+$(eval $(call gb_Package_add_file,xml/ucpchelp.xml,ucpchelp.xml))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/xmlhelp/Zip_helpxsl.mk b/xmlhelp/Zip_helpxsl.mk
new file mode 100644
index 0000000..3dfae65
--- /dev/null
+++ b/xmlhelp/Zip_helpxsl.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,helpxsl,$(SRCDIR)/xmlhelp/util))
+
+$(eval $(call gb_Zip_add_files,helpxsl,\
+ idxcaption.xsl \
+ idxcontent.xsl \
+ main_transform.xsl \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index 166d9cf..d9aa682 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,7 +1,3 @@
xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb javaunohelper DESKTOP:l10ntools unotools NULL
xh xmlhelp usr1 - all xh_mkout NULL
-xh xmlhelp\source\treeview nmake - all xh_treeview NULL
-xh xmlhelp\source\cxxhelp\util nmake - all xh_cutil NULL
-xh xmlhelp\source\cxxhelp\qe nmake - all xh_qe NULL
-xh xmlhelp\source\cxxhelp\provider nmake - all xh_provider NULL
-xh xmlhelp\util nmake - all xh_util xh_cutil xh_qe xh_provider NULL
+xh xmlhelp\prj nmake - all xh_prj NULL
diff --git a/xmlhelp/prj/d.lst b/xmlhelp/prj/d.lst
index 8ce9628..e69de29 100644
--- a/xmlhelp/prj/d.lst
+++ b/xmlhelp/prj/d.lst
@@ -1,10 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.*
-..\%__SRC%\lib\lib*.so %_DEST%\lib
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.*
-..\%__SRC%\class\*.jar %_DEST%\bin\*.*
-..\util\ucpchelp.xml %_DEST%\xml\ucpchelp.xml
-..\util\*.xsl %_DEST%\bin\*.*
-..\%__SRC%\bin\helpxsl.zip %_DEST%\pck\helpxsl.zip
-..\%__SRC%\misc\CLuceneHelpWrapper.component %_DEST%\xml\CLuceneHelpWrapper.component
-..\%__SRC%\misc\tvhlp1.component %_DEST%\xml\tvhlp1.component
-..\%__SRC%\misc\ucpchelp1.component %_DEST%\xml\ucpchelp1.component
diff --git a/xmlhelp/prj/makefile.mk b/xmlhelp/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/xmlhelp/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
deleted file mode 100644
index b709797..0000000
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=xmlhelp
-TARGET=chelp
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-
-# --- Settings ---------------------------------------------------------
-
-.INCLUDE: settings.mk
-
-# GCC versions 4.2.x introduced a warning "allocating zero-element array"
-# Allocating zero-element arrays is an allowed if not somewhat dubious
-# technique though, so this warning is plain wrong and has been fixed
-# in gcc 4.3. Unfortunately there is no way at all to suppress this warning.
-# Some files in this directory use zero allocated arrays, we need to
-# diable the WaE mechanism for the GCC 4.2.x series.
-.IF "$(COM)"=="GCC"
-.IF "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
-CFLAGSWERRCXX:=
-.ENDIF # "$(CCNUMVER)">="000400020000" && "$(CCNUMVER)"<="000400020003"
-.ENDIF # "$(COM)"=="GCC"
-
-CFLAGS += -DHAVE_EXPAT_H
-
-CFLAGS+= $(SYSTEM_DB_CFLAGS)
-
-.IF "$(SYSTEM_LIBXML)" == "YES"
-CFLAGS+= $(LIBXML_CFLAGS)
-.ELSE
-LIBXMLINCDIR=external$/libxml
-CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
-.ENDIF
-
-.IF "$(SYSTEM_LIBXSLT)" == "YES"
-CFLAGS+= $(LIBXSLT_CFLAGS)
-.ELSE
-LIBXSLTINCDIR=external$/libxslt
-CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="MSC"
-CFLAGS+=-GR
-.ENDIF
-.ENDIF
-
-# --- General -----------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/services.obj \
- $(SLO)$/provider.obj \
- $(SLO)$/content.obj \
- $(SLO)$/resultset.obj \
- $(SLO)$/resultsetbase.obj \
- $(SLO)$/resultsetforroot.obj \
- $(SLO)$/resultsetforquery.obj \
- $(SLO)$/contentcaps.obj \
- $(SLO)$/urlparameter.obj \
- $(SLO)$/inputstream.obj \
- $(SLO)$/databases.obj \
- $(SLO)$/db.obj \
- $(SLO)$/bufferedinputstream.obj
-
-# --- Targets ----------------------------------------------------------
-
-.INCLUDE: target.mk
-
diff --git a/xmlhelp/source/cxxhelp/qe/makefile.mk b/xmlhelp/source/cxxhelp/qe/makefile.mk
deleted file mode 100644
index db3502d..0000000
--- a/xmlhelp/source/cxxhelp/qe/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME= xmlhelp
-TARGET= jaqe
-AUTOSEG= TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="MSC"
-CFLAGS+=-GR
-.ENDIF
-.ENDIF
-
-SLOFILES=$(SLO)$/DocGenerator.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmlhelp/source/cxxhelp/util/makefile.mk b/xmlhelp/source/cxxhelp/util/makefile.mk
deleted file mode 100644
index 28e625a..0000000
--- a/xmlhelp/source/cxxhelp/util/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME= xmlhelp
-TARGET= jautil
-AUTOSEG= TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="MSC"
-CFLAGS+=-GR
-.ENDIF
-.ENDIF
-
-SLOFILES=\
- $(SLO)$/Decompressor.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk
deleted file mode 100644
index e82846b..0000000
--- a/xmlhelp/source/treeview/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=xmlhelp
-TARGET=tvhlp
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-TVHLP_MAJOR=1
-
-.INCLUDE: settings.mk
-
-.IF "$(SYSTEM_EXPAT)" == "YES"
-CFLAGS+=-DSYSTEM_EXPAT
-.ENDIF
-
-SLOFILES=\
- $(SLO)$/tvfactory.obj \
- $(SLO)$/tvread.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(TVHLP_MAJOR)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(TARGET)
-SHL1STDLIBS=\
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(EXPATASCII3RDLIB) \
- $(UNOTOOLSLIB) \
- $(SALLIB)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1DES=UCB : Treeview help
-
-
-.INCLUDE: target.mk
-
-
-
-ALLTAR : $(MISC)/tvhlp1.component
-
-$(MISC)/tvhlp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- tvhlp1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt tvhlp1.component
diff --git a/xmlhelp/util/delzip b/xmlhelp/util/delzip
deleted file mode 100755
index e69de29..0000000
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
deleted file mode 100644
index 90bf75b..0000000
--- a/xmlhelp/util/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-UCP_VERSION=1
-UCP_NAME=chelp
-
-PRJ=..
-PRJNAME=xmlhelp
-TARGET=ucp$(UCP_NAME)
-UCPHELP_MAJOR=1
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings ---------------------------------------------------------
-
-.INCLUDE: settings.mk
-
-.IF "$(GUI)"=="WNT"
-.IF "$(COM)"=="MSC"
-CFLAGS+=-GR
-.ENDIF
-.ENDIF
-
-# --- Shared-Library ---------------------------------------------------
-
-SHL1TARGET=$(TARGET)$(UCP_VERSION)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# Add additional libs here.
-SHL1STDLIBS= \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(HELPLINKERLIB) \
- $(CLUCENELIB) \
- $(SALLIB) \
- $(EXPATASCII3RDLIB) \
- $(UNOTOOLSLIB) \
- $(UCBHELPERLIB) \
- $(BERKELEYLIB) \
- $(XSLTLIB)
-
-SHL1LIBS = \
- $(SLB)$/jaqe.lib \
- $(SLB)$/jautil.lib \
- $(SLB)$/chelp.lib
-
-# --- Def-File ---------------------------------------------------------
-
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ----------------------------------------------------------
-
-ZIP1TARGET=helpxsl
-ZIP1FLAGS= -u -r
-ZIP1LIST=main_transform*.xsl idxcaption.xsl idxcontent.xsl
-
-
-.INCLUDE: target.mk
-
-
-ALLTAR : $(MISC)/ucpchelp1.component
-
-$(MISC)/ucpchelp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ucpchelp1.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ucpchelp1.component
commit 22c60cbbfbee2aaae9710af020e150a30a17a49e
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 7 15:50:47 2012 +0200
add external for clucene
diff --git a/Repository.mk b/Repository.mk
index 4484e5f..8f72da9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -358,7 +358,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
avmediagst \
avmediawin \
cached1 \
- clucene \
collator_data \
deployment \
deploymentgui \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c6a033c..fab2995 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1120,6 +1120,39 @@ endef
endif # SYSTEM_POPPLER
+ifeq ($(SYSTEM_CLUCENE),YES)
+
+define gb_LinkTarget__use_clucene
+$(call gb_LinkTarget_add_defs,$(1),\
+ $(filter-out -I%,$(CLUCENE_CFLAGS)) \
+)
+
+$(call gb_LinkTarget_set_include,$(1),\
+ $(filter -I%,$(CLUCENE_CFLAGS)) \
+ $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(CLUCENE_LIBS) \
+)
+
+endef
+
+else # !SYSTEM_CLUCENE
+
+define gb_LinkTarget__use_clucene
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ clucene \
+)
+
+endef
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
+ clucene \
+))
+
+endif # SYSTEM_CLUCENE
+
# MacOSX-only frameworks ############################################
# (in alphabetical order)
diff --git a/config_host.mk.in b/config_host.mk.in
index 0e896d8..6a2cfce 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -41,6 +41,8 @@ export CDR_CFLAGS=@CDR_CFLAGS@
export CDR_LIBS=@CDR_LIBS@
export CLASSPATH=@CLASSPATH@
export CL_X64=@CL_X64@
+export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
+export CLUCENE_LIBS=@CLUCENE_LIBS@
export COM=@COM@
export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
export COMEX=@COMEX@
@@ -448,6 +450,7 @@ export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@
export SYSTEM_BOOST=@SYSTEM_BOOST@
export SYSTEM_BSH=@SYSTEM_BSH@
export SYSTEM_CAIRO=@SYSTEM_CAIRO@
+export SYSTEM_CLUCENE=@SYSTEM_CLUCENE@
export SYSTEM_CPPUNIT=@SYSTEM_CPPUNIT@
export SYSTEM_CURL=@SYSTEM_CURL@
export SYSTEM_DB=@SYSTEM_DB@
diff --git a/configure.in b/configure.in
index 2158d03..a7841e6 100644
--- a/configure.in
+++ b/configure.in
@@ -5855,13 +5855,13 @@ AC_MSG_CHECKING([which clucene to use])
if test "$with_system_clucene" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_CLUCENE=YES
- PKG_CHECK_MODULES(LIBCLUCENE, libclucene-core)
+ PKG_CHECK_MODULES(CLUCENE, libclucene-core)
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
save_CPPFLAGS=$CPPFLAGS
- CXXFLAGS="$CXXFLAGS $LIBCLUCENE_CFLAGS"
- CPPFLAGS="$CPPFLAGS $LIBCLUCENE_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $CLUCENE_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $CLUCENE_CFLAGS"
dnl http://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446
dnl https://bugzilla.redhat.com/show_bug.cgi?id=794795
AC_CHECK_HEADER([CLucene/analysis/cjk/CJKAnalyzer.h], [],
@@ -5870,15 +5870,15 @@ if test "$with_system_clucene" = "yes"; then
CPPFLAGS=$save_CPPFLAGS
AC_LANG_POP([C++])
- LIBCLUCENE_LIBS="$LIBCLUCENE_LIBS -lclucene-contribs-lib"
+ CLUCENE_LIBS="$CLUCENE_LIBS -lclucene-contribs-lib"
else
AC_MSG_RESULT([internal])
SYSTEM_CLUCENE=NO
BUILD_TYPE="$BUILD_TYPE CLUCENE"
fi
AC_SUBST(SYSTEM_CLUCENE)
-AC_SUBST(LIBCLUCENE_CFLAGS)
-AC_SUBST(LIBCLUCENE_LIBS)
+AC_SUBST(CLUCENE_CFLAGS)
+AC_SUBST(CLUCENE_LIBS)
dnl ===================================================================
dnl Check for system expat
More information about the Libreoffice-commits
mailing list