[Libreoffice-commits] .: 5 commits - android/qa configure.in desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Module_desktop.mk desktop/prj desktop/source Library_merged.mk sdext/prj swext/prj sw/prj tail_build/prj xmlhelp/inc xmlhelp/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Jan 16 06:54:43 PST 2012
Library_merged.mk | 7 +
android/qa/sc/Makefile | 1
configure.in | 4 -
desktop/Library_deployment.mk | 16 +++-
desktop/Library_deploymentmisc.mk | 7 +
desktop/Module_desktop.mk | 6 -
desktop/prj/build.lst | 2
desktop/source/deployment/manager/dp_activepackages.cxx | 31 +++++++
desktop/source/deployment/manager/dp_activepackages.hxx | 5 +
desktop/source/deployment/manager/dp_extensionmanager.hxx | 1
desktop/source/deployment/manager/dp_managerfac.cxx | 1
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 15 ++-
desktop/source/deployment/registry/help/dp_help.cxx | 6 +
sdext/prj/build.lst | 2
sw/prj/build.lst | 2
swext/prj/build.lst | 2
tail_build/prj/build.lst | 2
xmlhelp/inc/makefile.mk | 40 ----------
xmlhelp/prj/build.lst | 11 +-
19 files changed, 94 insertions(+), 67 deletions(-)
New commits:
commit 081d76c3faa9f242e70f94a253d334e29b7e6595
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Jan 16 16:42:51 2012 +0200
Attempt to manage without Berkeley DB on iOS and Android
Berkeley DB is used for help index and extension database. (Possibly
only for a backward-compatible format of the latter, I am not sure.)
Neither use makes much sense on Android and iOS.
The existing help is for LO on desktop OSes anyway, help for LO-based
apps on iOS and Android will naturally be quite different.
On iOS there will definitely be no "extensions", and probably we don't
want to bother with such on Android either.
diff --git a/Library_merged.mk b/Library_merged.mk
index 9fe9c2d..b2e49b0 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -49,11 +49,16 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
))
$(eval $(call gb_Library_use_externals,merged,\
- berkeleydb \
icuuc \
zlib \
))
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+$(eval $(call gb_Library_use_externals,merged,\
+ berkeleydb \
+))
+endif
+
# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
$(eval $(call gb_Library_add_library_objects,merged,\
$(gb_MERGEDLIBS) \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index cd09db1..22d4eba 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -60,7 +60,6 @@ copy-stuff:
bootstrap.uno \
comphelpgcc3 \
configmgr.uno \
- db-4.7 \
fontconfig \
forlo \
foruilo \
diff --git a/configure.in b/configure.in
index 84c1dcc..1fccd1e 100644
--- a/configure.in
+++ b/configure.in
@@ -5819,10 +5819,12 @@ or install the Berkeley db development package.])
SCPDEFS="$SCPDEFS -DSYSTEM_DB"
MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS libdb-4.8.dll"
-else
+elif test $_os != iOS -a $_os != Android; then
AC_MSG_RESULT([internal])
SYSTEM_DB=NO
BUILD_TYPE="$BUILD_TYPE BERKELEYDB"
+else
+ AC_MSG_RESULT([none])
fi
AC_SUBST(SYSTEM_DB)
AC_SUBST(SYSTEM_DB_CFLAGS)
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 91561c8..7e455ef 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_linked_libs,deployment,\
cppu \
cppuhelper \
deploymentmisc \
- helplinker \
sal \
svl \
tl \
@@ -54,15 +53,16 @@ $(eval $(call gb_Library_add_linked_libs,deployment,\
$(gb_STDLIBS) \
))
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Library_use_externals,deployment,\
berkeleydb \
))
+endif
$(eval $(call gb_Library_set_componentfile,deployment,desktop/source/deployment/deployment))
$(eval $(call gb_Library_add_exception_objects,deployment,\
desktop/source/deployment/dp_log \
- desktop/source/deployment/dp_persmap \
desktop/source/deployment/dp_services \
desktop/source/deployment/dp_xml \
desktop/source/deployment/manager/dp_activepackages \
@@ -92,4 +92,16 @@ $(eval $(call gb_Library_add_exception_objects,deployment,\
desktop/source/deployment/registry/sfwk/dp_sfwk \
))
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
+$(eval $(call gb_Library_add_linked_libs,deployment,\
+ helplinker \
+))
+
+$(eval $(call gb_Library_add_exception_objects,deployment,\
+ desktop/source/deployment/dp_persmap \
+))
+
+endif
+
# vim: set ts=4 sw=4 et:
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index d4bf211..abcc0e2 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -54,12 +54,19 @@ $(eval $(call gb_Library_add_linked_libs,deploymentmisc,\
$(gb_STDLIBS) \
))
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Library_use_externals,deploymentmisc,\
berkeleydb \
))
+endif
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
desktop/source/deployment/misc/db \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,deploymentmisc,\
desktop/source/deployment/misc/dp_dependencies \
desktop/source/deployment/misc/dp_descriptioninfoset \
desktop/source/deployment/misc/dp_identifier \
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index 47a86c5..b7b99f5 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -43,8 +43,6 @@
#include <boost/unordered_map.hpp>
#include "dp_identifier.hxx"
-#include "dp_persmap.h"
-
#include "dp_activepackages.hxx"
// Old format of database entry:
@@ -126,7 +124,15 @@ namespace dp_manager {
ActivePackages::ActivePackages() {}
-ActivePackages::ActivePackages(::rtl::OUString const & url) : m_map(url) {}
+ActivePackages::ActivePackages(::rtl::OUString const & url)
+#if !defined(ANDROID) && !defined(IOS)
+ : m_map(url)
+#endif
+{
+#if defined(ANDROID) || defined(IOS)
+ (void)url;
+#endif
+}
ActivePackages::~ActivePackages() {}
@@ -140,6 +146,7 @@ bool ActivePackages::get(
Data * data, ::rtl::OUString const & id, ::rtl::OUString const & fileName)
const
{
+#if !defined(ANDROID) && !defined(IOS)
::rtl::OString v;
if (m_map.get(&v, newKey(id))) {
if (data != NULL) {
@@ -154,10 +161,17 @@ bool ActivePackages::get(
} else {
return false;
}
+#else
+ (void) data;
+ (void) id;
+ (void) fileName;
+ return false;
+#endif
}
ActivePackages::Entries ActivePackages::getEntries() const {
Entries es;
+#if !defined(ANDROID) && !defined(IOS)
::dp_misc::t_string2string_map m(m_map.getEntries());
for (::dp_misc::t_string2string_map::const_iterator i(m.begin());
i != m.end(); ++i)
@@ -178,10 +192,12 @@ ActivePackages::Entries ActivePackages::getEntries() const {
decodeOldData(fn, i->second)));
}
}
+#endif
return es;
}
void ActivePackages::put(::rtl::OUString const & id, Data const & data) {
+#if !defined(ANDROID) && !defined(IOS)
::rtl::OStringBuffer b;
b.append(
::rtl::OUStringToOString(data.temporaryName, RTL_TEXTENCODING_UTF8));
@@ -194,12 +210,21 @@ void ActivePackages::put(::rtl::OUString const & id, Data const & data) {
b.append(separator);
b.append(::rtl::OUStringToOString(data.failedPrerequisites, RTL_TEXTENCODING_UTF8));
m_map.put(newKey(id), b.makeStringAndClear());
+#else
+ (void) id;
+ (void) data;
+#endif
}
void ActivePackages::erase(
::rtl::OUString const & id, ::rtl::OUString const & fileName)
{
+#if !defined(ANDROID) && !defined(IOS)
m_map.erase(newKey(id), true) || m_map.erase(oldKey(fileName), true);
+#else
+ (void) id;
+ (void) fileName;
+#endif
}
}
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 61057bc..b724844 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -34,7 +34,9 @@
#include <utility>
#include <vector>
+#if !defined(ANDROID) && !defined(IOS)
#include "dp_persmap.h"
+#endif
namespace rtl { class OUString; }
@@ -91,8 +93,9 @@ public:
private:
ActivePackages(ActivePackages &); // not defined
void operator =(ActivePackages &); // not defined
-
+#if !defined(ANDROID) && !defined(IOS)
::dp_misc::PersistentMap m_map;
+#endif
};
}
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 6c6bd5c..f1a99db 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -40,6 +40,7 @@
#include "com/sun/star/deployment/XPackageManager.hpp"
#include "osl/mutex.hxx"
#include <list>
+#include <boost/unordered_map.hpp>
namespace css = ::com::sun::star;
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index 2bd2fa7..701d1a6 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -32,6 +32,7 @@
#include "cppuhelper/compbase1.hxx"
#include "comphelper/servicedecl.hxx"
#include "com/sun/star/deployment/thePackageManagerFactory.hpp"
+#include <boost/unordered_map.hpp>
using namespace ::dp_misc;
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 85f404c..12e5f50 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -32,7 +32,9 @@
#include "dp_configuration.hrc"
#include "dp_backend.h"
+#if !defined(ANDROID) && !defined(IOS)
#include "dp_persmap.h"
+#endif
#include "dp_ucb.h"
#include "rtl/string.hxx"
#include "rtl/ustrbuf.hxx"
@@ -118,10 +120,10 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
OUString const & url, OUString const & mediaType, sal_Bool bRemoved,
OUString const & identifier,
Reference<XCommandEnvironment> const & xCmdEnv );
-
+#if !defined(ANDROID) && !defined(IOS)
// for backwards compatibility - nil if no (compatible) back-compat db present
::std::auto_ptr<PersistentMap> m_registeredPackages;
-
+#endif
virtual void SAL_CALL disposing();
const Reference<deployment::XPackageTypeInfo> m_xConfDataTypeInfo;
@@ -224,6 +226,8 @@ BackendImpl::BackendImpl(
deleteUnusedFolders(OUString(), folders);
configmgrini_verify_init( xCmdEnv );
+
+#if !defined(ANDROID) && !defined(IOS)
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<PersistentMap> pMap;
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -247,6 +251,7 @@ BackendImpl::BackendImpl(
}
}
m_registeredPackages = pMap;
+#endif
}
}
@@ -566,13 +571,14 @@ BackendImpl::PackageImpl::isRegistered_(
bool bReg = false;
if (that->hasActiveEntry(getURL()))
bReg = true;
+#if !defined(ANDROID) && !defined(IOS)
if (!bReg && that->m_registeredPackages.get())
{
// fallback for user extension registered in berkeley DB
bReg = that->m_registeredPackages->has(
rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8 ));
}
-
+#endif
return beans::Optional< beans::Ambiguous<sal_Bool> >(
true, beans::Ambiguous<sal_Bool>( bReg, false ) );
}
@@ -754,6 +760,7 @@ void BackendImpl::PackageImpl::processPackage_(
}
else // revoke
{
+#if !defined(ANDROID) && !defined(IOS)
if (!that->removeFromConfigmgrIni(m_isSchema, url, xCmdEnv) &&
that->m_registeredPackages.get()) {
// Obsolete package database handling - should be removed for LibreOffice 4.0
@@ -803,7 +810,7 @@ void BackendImpl::PackageImpl::processPackage_(
OSL_ASSERT(0);
}
}
-
+#endif
::boost::optional<ConfigurationBackendDb::Data> data = that->readDataFromDb(url);
//If an xcu file was life deployed then always a data entry is written.
//If the xcu file was already in the configmr.ini then there is also
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 73f4601..d121833 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -39,7 +39,9 @@
#include "svl/inettype.hxx"
#include "unotools/pathoptions.hxx"
+#if !defined(ANDROID) && !defined(IOS)
#include <l10ntools/compilehelp.hxx>
+#endif
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
#include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
@@ -397,6 +399,7 @@ void BackendImpl::implProcessHelp(
data.dataUrl = xPackage->getURL();
if (!package->extensionContainsCompiledHelp())
{
+#if !defined(ANDROID) && !defined(IOS)
const OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
data.dataUrl = sHelpFolder;
@@ -593,6 +596,9 @@ void BackendImpl::implProcessHelp(
}
}
}
+#else
+ (void) xCmdEnv;
+#endif
}
//Writing the data entry replaces writing the flag file. If we got to this
//point the registration was successful.
commit 6c1852c5526a947f2fb6007dc6a85da588e04b61
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Jan 16 16:37:49 2012 +0200
Do build Library_deployment also for non-desktop OSes
Whether anything in it will eventually be used in LO-based apps on
such OSes, no idea, but no harm building it.
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 6b016d5..559097e 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
AllLangResTarget_deploymentgui \
AllLangResTarget_dkt \
Executable_soffice.bin \
+ Library_deployment \
Library_deploymentmisc \
Library_offacc \
Library_sofficeapp \
@@ -56,7 +57,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
Executable_unopkg.bin \
- Library_deployment \
Library_deploymentgui \
Library_migrationoo2 \
Library_migrationoo3 \
commit 38bb16572873ca46d83fbe3b0877eb2088347135
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Mon Jan 16 11:56:35 2012 +0200
Include soffice.bin but exclude Executable_unopkg.bin for non-desktop OSes
Not that I know if soffice.bin as it currently is will make sense on
Android or iOS eventually, but just for experimentation...
Don't bother with Library_unopkgapp for non-desktop OSes as we don't
build Executable_unopkg.bin for them either.
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 17fe079..6b016d5 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -41,11 +41,11 @@ $(eval $(call gb_Module_add_targets,desktop,\
AllLangResTarget_deployment \
AllLangResTarget_deploymentgui \
AllLangResTarget_dkt \
+ Executable_soffice.bin \
Library_deploymentmisc \
Library_offacc \
Library_sofficeapp \
Library_spl \
- Library_unopkgapp \
Package_branding \
Package_intro \
Zip_brand \
@@ -55,12 +55,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
- Executable_soffice.bin \
Executable_unopkg.bin \
Library_deployment \
Library_deploymentgui \
Library_migrationoo2 \
Library_migrationoo3 \
+ Library_unopkgapp \
Package_scripts \
Pagein_calc \
Pagein_common \
commit 08651bcc738928cc20afd84b02c4307b590794c3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Jan 13 15:09:40 2012 +0200
Try without xmlhelp on non-desktop OSes
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 73be88f..3d8cb8b 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,3 +1,3 @@
-dt desktop : TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx xmlhelp sal unoil officecfg offapi filter LIBXSLT:libxslt NULL
+dt desktop : TRANSLATIONS:translations sfx2 stoc BERKELEYDB:berkeleydb sysui BOOST:boost svx DESKTOP:xmlhelp sal unoil officecfg offapi filter LIBXSLT:libxslt NULL
dt desktop usr1 - all dt_mkout NULL
dt desktop\prj nmake - all dt_prj NULL
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst
index 4c1be7a..fc92fb4 100644
--- a/sdext/prj/build.lst
+++ b/sdext/prj/build.lst
@@ -1,4 +1,4 @@
-dx sdext : TRANSLATIONS:translations offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt xmlhelp NULL
+dx sdext : TRANSLATIONS:translations offapi comphelper unotools readlicense_oo cppu tools cppuhelper sal javaunohelper officecfg XPDF:xpdf LIBXSLT:libxslt DESKTOP:xmlhelp NULL
dx sdext usr1 - all sdext_mkout NULL
dx sdext\prj get - all sdext_prj NULL
dx sdext\source\minimizer nmake - all sdext_minimizer sdext_minimizer_rdoooe sdext_minimizer_rdooo sdext_inc NULL
diff --git a/sw/prj/build.lst b/sw/prj/build.lst
index 37b464d..42986b8 100644
--- a/sw/prj/build.lst
+++ b/sw/prj/build.lst
@@ -1,2 +1,2 @@
-sw sw : filter TRANSLATIONS:translations configmgr connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test xmlhelp NULL
+sw sw : filter TRANSLATIONS:translations configmgr connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL
sw sw\prj nmake - all sw_prj NULL
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index 314cbd8..beff554 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,3 +1,3 @@
-swext swext : officecfg TRANSLATIONS:translations DESKTOP:l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL
+swext swext : officecfg TRANSLATIONS:translations DESKTOP:l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml DESKTOP:xmlhelp NULL
swext swext\prj nmake - all swext_prj NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 289a1ad..d40c15c 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 HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools 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 XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools 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 XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl DESKTOP:xmlhelp xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit ee0a5a04fed6a56eddb0655bb6ff014c63c48b8e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Jan 13 14:53:32 2012 +0200
There is nothing to build in xmlhelp/inc
diff --git a/xmlhelp/inc/makefile.mk b/xmlhelp/inc/makefile.mk
deleted file mode 100755
index 7bf85a3..0000000
--- a/xmlhelp/inc/makefile.mk
+++ /dev/null
@@ -1,40 +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=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index 4594f27..446a9df 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,9 +1,8 @@
xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper DESKTOP:l10ntools unotools NULL
xh xmlhelp usr1 - all xh_mkout NULL
-xh xmlhelp\inc nmake - all xh_inc NULL
-xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL
-xh xmlhelp\source\com\sun\star\help nmake - all xh_help xh_inc NULL
-xh xmlhelp\source\cxxhelp\util nmake - all xh_cutil xh_inc NULL
-xh xmlhelp\source\cxxhelp\qe nmake - all xh_qe xh_inc NULL
-xh xmlhelp\source\cxxhelp\provider nmake - all xh_provider xh_inc NULL
+xh xmlhelp\source\treeview nmake - all xh_treeview NULL
+xh xmlhelp\source\com\sun\star\help nmake - all xh_help 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
More information about the Libreoffice-commits
mailing list