configmgr/Library_configmgr.mk | 81 +++++++++++++++++++++++++++++++
configmgr/Module_configmgr.mk | 4 +
configmgr/inc/makefile.mk | 35 -------------
configmgr/prj/d.lst | 4 -
configmgr/prj/makefile.mk | 1
configmgr/source/broadcaster.cxx | 13 ++---
configmgr/source/makefile.mk | 94 -------------------------------------
configmgr/source/modifications.cxx | 4 +
configmgr/source/update.cxx | 3 -
configmgr/source/xcdparser.cxx | 8 +--
10 files changed, 102 insertions(+), 145 deletions(-)
New commits:
commit 28b86ca7b704d2789cad69f7516203434202c082
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Dec 14 09:20:15 2011 +0100
Replaced remaining OSL_ASSERT in configmgr.
diff --git a/configmgr/source/broadcaster.cxx b/configmgr/source/broadcaster.cxx
index 15d69d6..8bf70c2 100644
--- a/configmgr/source/broadcaster.cxx
+++ b/configmgr/source/broadcaster.cxx
@@ -28,6 +28,8 @@
#include "sal/config.h"
+#include <cassert>
+
#include "com/sun/star/beans/XPropertiesChangeListener.hpp"
#include "com/sun/star/beans/XPropertyChangeListener.hpp"
#include "com/sun/star/container/XContainerListener.hpp"
@@ -40,7 +42,6 @@
#include "com/sun/star/uno/XInterface.hpp"
#include "com/sun/star/util/XChangesListener.hpp"
#include "cppuhelper/exc_hlp.hxx"
-#include "osl/diagnose.hxx"
#include "rtl/string.h"
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.h"
@@ -217,7 +218,7 @@ Broadcaster::DisposeNotification::DisposeNotification(
css::lang::EventObject const & theEvent):
listener(theListener), event(theEvent)
{
- OSL_ASSERT(theListener.is());
+ assert(theListener.is());
}
Broadcaster::ContainerNotification::ContainerNotification(
@@ -226,7 +227,7 @@ Broadcaster::ContainerNotification::ContainerNotification(
css::container::ContainerEvent const & theEvent):
listener(theListener), event(theEvent)
{
- OSL_ASSERT(theListener.is());
+ assert(theListener.is());
}
Broadcaster::PropertyChangeNotification::PropertyChangeNotification(
@@ -235,7 +236,7 @@
Broadcaster::PropertyChangeNotification::PropertyChangeNotification(
css::beans::PropertyChangeEvent const & theEvent):
listener(theListener), event(theEvent)
{
- OSL_ASSERT(theListener.is());
+ assert(theListener.is());
}
Broadcaster::PropertiesChangeNotification::PropertiesChangeNotification(
@@ -244,7 +245,7 @@
Broadcaster::PropertiesChangeNotification::PropertiesChangeNotification(
css::uno::Sequence< css::beans::PropertyChangeEvent > const & theEvent):
listener(theListener), event(theEvent)
{
- OSL_ASSERT(theListener.is());
+ assert(theListener.is());
}
Broadcaster::ChangesNotification::ChangesNotification(
@@ -252,7 +253,7 @@ Broadcaster::ChangesNotification::ChangesNotification(
css::util::ChangesEvent const & theEvent):
listener(theListener), event(theEvent)
{
- OSL_ASSERT(theListener.is());
+ assert(theListener.is());
}
}
diff --git a/configmgr/source/modifications.cxx
b/configmgr/source/modifications.cxx
index 4aabd30..f8d3a44 100644
--- a/configmgr/source/modifications.cxx
+++ b/configmgr/source/modifications.cxx
@@ -28,6 +28,8 @@
#include "sal/config.h"
+#include <cassert>
+
#include "rtl/ustring.hxx"
#include "modifications.hxx"
@@ -60,7 +62,7 @@ void Modifications::add(Path const & path) {
}
void Modifications::remove(Path const & path) {
- OSL_ASSERT(!path.empty());
+ assert(!path.empty());
Node * p = &root_;
for (Path::const_iterator i(path.begin());;) {
Node::Children::iterator j(p->children.find(*i));
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 5022c07..fb17066 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -28,6 +28,7 @@
#include "sal/config.h"
+#include <cassert>
#include <set>
#include "boost/noncopyable.hpp"
@@ -75,7 +76,7 @@ public:
Service(css::uno::Reference< css::uno::XComponentContext > const context):
context_(context)
{
- OSL_ASSERT(context.is());
+ assert(context.is());
lock_ = lock();
}
diff --git a/configmgr/source/xcdparser.cxx b/configmgr/source/xcdparser.cxx
index 7dfb36d..84c12bd 100644
--- a/configmgr/source/xcdparser.cxx
+++ b/configmgr/source/xcdparser.cxx
@@ -28,12 +28,12 @@
#include "sal/config.h"
+#include <cassert>
#include <climits>
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/RuntimeException.hpp"
#include "com/sun/star/uno/XInterface.hpp"
-#include "osl/diagnose.hxx"
#include "rtl/string.h"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
@@ -69,7 +69,7 @@ bool XcdParser::startElement(
xmlreader::XmlReader & reader, int nsId, xmlreader::Span const & name)
{
if (nestedParser_.is()) {
- OSL_ASSERT(nesting_ != LONG_MAX);
+ assert(nesting_ != LONG_MAX);
++nesting_;
return nestedParser_->startElement(reader, nsId, name);
}
@@ -145,7 +145,7 @@ bool XcdParser::startElement(
}
break;
default: // STATE_DEPENDENCY
- OSL_ASSERT(false); // this cannot happen
+ assert(false); // this cannot happen
break;
}
throw css::uno::RuntimeException(
@@ -170,7 +170,7 @@ void XcdParser::endElement(xmlreader::XmlReader const &
reader) {
case STATE_COMPONENTS:
break;
default:
- OSL_ASSERT(false); // this cannot happen
+ assert(false); // this cannot happen
break;
}
}
commit ce1f52d69a2dfb0d34f41b7c9538775588db079c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Dec 14 09:15:27 2011 +0100
Ported configmgr to gbuild.
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
new file mode 100644
index 0000000..2210871
--- /dev/null
+++ b/configmgr/Library_configmgr.mk
@@ -0,0 +1,81 @@
+##
+## 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) 2011 Red Hat, Inc., Stephan Bergmann <sberg...@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,configmgr))
+
+$(eval $(call gb_Library_add_exception_objects,configmgr, \
+ configmgr/source/access \
+ configmgr/source/broadcaster \
+ configmgr/source/childaccess \
+ configmgr/source/components \
+ configmgr/source/configurationprovider \
+ configmgr/source/configurationregistry \
+ configmgr/source/data \
+ configmgr/source/defaultprovider \
+ configmgr/source/groupnode \
+ configmgr/source/localizedpropertynode \
+ configmgr/source/localizedvaluenode \
+ configmgr/source/lock \
+ configmgr/source/modifications \
+ configmgr/source/node \
+ configmgr/source/nodemap \
+ configmgr/source/parsemanager \
+ configmgr/source/partial \
+ configmgr/source/propertynode \
+ configmgr/source/readonlyaccess \
+ configmgr/source/readwriteaccess \
+ configmgr/source/rootaccess \
+ configmgr/source/rootnode \
+ configmgr/source/services \
+ configmgr/source/setnode \
+ configmgr/source/type \
+ configmgr/source/update \
+ configmgr/source/valueparser \
+ configmgr/source/writemodfile \
+ configmgr/source/xcdparser \
+ configmgr/source/xcsparser \
+ configmgr/source/xcuparser \
+ configmgr/source/xmldata \
+))
+
+$(eval $(call gb_Library_add_api,configmgr, \
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,configmgr, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ xmlreader \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call
gb_Library_set_componentfile,configmgr,configmgr/source/configmgr))
diff --git a/configmgr/Module_configmgr.mk b/configmgr/Module_configmgr.mk
index 0481c29..dabe99a 100644
--- a/configmgr/Module_configmgr.mk
+++ b/configmgr/Module_configmgr.mk
@@ -28,6 +28,10 @@
$(eval $(call gb_Module_Module,configmgr))
+$(eval $(call gb_Module_add_targets,configmgr,\
+ Library_configmgr \
+))
+
$(eval $(call gb_Module_add_subsequentcheck_targets,configmgr,\
JunitTest_configmgr_unoapi \
))
diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk
deleted file mode 100755
index 57c635f..0000000
--- a/configmgr/inc/makefile.mk
+++ /dev/null
@@ -1,35 +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 = configmgr
-TARGET = inc
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-
diff --git a/configmgr/prj/d.lst b/configmgr/prj/d.lst
index eb33e57..e69de29 100644
--- a/configmgr/prj/d.lst
+++ b/configmgr/prj/d.lst
@@ -1,4 +0,0 @@
-..\%__SRC%\bin\*.uno.dll %_DEST%\bin\*.uno.dll
-..\%__SRC%\lib\*.uno.dylib %_DEST%\lib\*.uno.dylib
-..\%__SRC%\lib\*.uno.so %_DEST%\lib\*.uno.so
-..\%__SRC%\misc\configmgr.component %_DEST%\xml\configmgr.component
diff --git a/configmgr/prj/makefile.mk b/configmgr/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/configmgr/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/configmgr/source/makefile.mk b/configmgr/source/makefile.mk
deleted file mode 100644
index f52b4f4..0000000
--- a/configmgr/source/makefile.mk
+++ /dev/null
@@ -1,94 +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 = configmgr
-TARGET = configmgr
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-DLLPRE =
-
-SLOFILES = \
- $(SLO)/access.obj \
- $(SLO)/broadcaster.obj \
- $(SLO)/childaccess.obj \
- $(SLO)/components.obj \
- $(SLO)/configurationprovider.obj \
- $(SLO)/configurationregistry.obj \
- $(SLO)/data.obj \
- $(SLO)/defaultprovider.obj \
- $(SLO)/groupnode.obj \
- $(SLO)/localizedpropertynode.obj \
- $(SLO)/localizedvaluenode.obj \
- $(SLO)/lock.obj \
- $(SLO)/modifications.obj \
- $(SLO)/node.obj \
- $(SLO)/nodemap.obj \
- $(SLO)/parsemanager.obj \
- $(SLO)/partial.obj \
- $(SLO)/propertynode.obj \
- $(SLO)/readonlyaccess.obj \
- $(SLO)/readwriteaccess.obj \
- $(SLO)/rootaccess.obj \
- $(SLO)/rootnode.obj \
- $(SLO)/services.obj \
- $(SLO)/setnode.obj \
- $(SLO)/type.obj \
- $(SLO)/update.obj \
- $(SLO)/valueparser.obj \
- $(SLO)/writemodfile.obj \
- $(SLO)/xcdparser.obj \
- $(SLO)/xcsparser.obj \
- $(SLO)/xcuparser.obj \
- $(SLO)/xmldata.obj
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1STDLIBS = \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALHELPERLIB) \
- $(SALLIB) \
- $(XMLREADERLIB)
-SHL1TARGET = $(ENFORCEDSHLPREFIX)configmgr.uno
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
-
-ALLTAR : $(MISC)/configmgr.component
-
-$(MISC)/configmgr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- configmgr.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt configmgr.component
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
