diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | extensions/Library_log.mk | 64 | ||||
| -rw-r--r-- | extensions/Module_extensions.mk | 1 | ||||
| -rw-r--r-- | extensions/prj/build.lst | 3 | ||||
| -rw-r--r-- | extensions/source/logging/makefile.mk | 84 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 |
6 files changed, 68 insertions, 87 deletions
diff --git a/Repository.mk b/Repository.mk index c689d3428ed0..67f6f87d7981 100644 --- a/Repository.mk +++ b/Repository.mk @@ -192,6 +192,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ iti \ lng \ lnth \ + log \ lwpft \ MacOSXSpell \ merged \ diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk new file mode 100644 index 000000000000..fc7c2d349535 --- /dev/null +++ b/extensions/Library_log.mk @@ -0,0 +1,64 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# 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. +# +# The Initial Developer of the Original Code is +# Peter Foley <pefoley2@verizon.net> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# 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,log)) + +$(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log)) + +$(eval $(call gb_Library_add_api,log,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_noexception_objects,log,\ + extensions/source/logging/log_module \ + extensions/source/logging/logrecord \ +)) + +$(eval $(call gb_Library_add_exception_objects,log,\ + extensions/source/logging/consolehandler \ + extensions/source/logging/csvformatter \ + extensions/source/logging/filehandler \ + extensions/source/logging/log_services \ + extensions/source/logging/logger \ + extensions/source/logging/loggerconfig \ + extensions/source/logging/loghandler \ + extensions/source/logging/plaintextformatter \ +)) + +$(eval $(call gb_Library_add_linked_libs,log,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index ebf6d26d19ad..c7d364105ddd 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_updchk \ Configuration_updchk \ Library_bib \ + Library_log \ Library_pcr \ Library_scn \ Library_updatecheckui \ diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index 2a76f92db053..d95b30d34e71 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -9,8 +9,7 @@ ex extensions\source\resource nmake - all ex_resrc ex_inc ex extensions\source\xmlextract nmake - all ex_xmlextr ex_inc NULL ex extensions\source\dbpilots nmake - all ex_dbpilots ex_inc NULL ex extensions\source\abpilot nmake - all ex_abpilot ex_inc NULL -ex extensions\source\logging nmake - all ex_logging ex_inc NULL -ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging NULL +ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots NULL ex extensions\prj nmake - all ex_prj NULL # Fails at the moment diff --git a/extensions/source/logging/makefile.mk b/extensions/source/logging/makefile.mk deleted file mode 100644 index 1436576e89ba..000000000000 --- a/extensions/source/logging/makefile.mk +++ /dev/null @@ -1,84 +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=extensions -TARGET=log - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -# ... object files ............................ -EXCEPTIONSFILES= \ - $(SLO)$/consolehandler.obj \ - $(SLO)$/csvformatter.obj \ - $(SLO)$/filehandler.obj \ - $(SLO)$/log_services.obj \ - $(SLO)$/logger.obj \ - $(SLO)$/loggerconfig.obj \ - $(SLO)$/loghandler.obj \ - $(SLO)$/plaintextformatter.obj \ - -SLOFILES= \ - $(EXCEPTIONSFILES) \ - $(SLO)$/log_module.obj \ - $(SLO)$/logrecord.obj \ - -# --- library ----------------------------------- - -LIB1TARGET=$(SLB)$/$(TARGET)_t.lib -LIB1FILES=\ - $(SLB)$/$(TARGET).lib - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS= \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1LIBS=$(LIB1TARGET) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/log.component - -$(MISC)/log.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - log.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt log.component diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 1a52db095ccd..a03dd331d454 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,6 +173,7 @@ my_components += \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ component/extensions/source/bibliography/bib \ + component/extensions/source/logging/log \ component/extensions/source/propctrlr/pcr \ component/extensions/source/scanner/scn \ component/extensions/source/update/check/updchk.uno \ @@ -181,7 +182,6 @@ my_components += \ dbp \ fpicker \ fps_office \ - log \ res \ syssh \ tvhlp1 \ |