diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | extensions/AllLangResTarget_abp.mk | 48 | ||||
| -rw-r--r-- | extensions/Library_abp.mk | 91 | ||||
| -rw-r--r-- | extensions/Module_extensions.mk | 2 | ||||
| -rw-r--r-- | extensions/prj/build.lst | 3 | ||||
| -rw-r--r-- | extensions/source/abpilot/exports.dxp | 1 | ||||
| -rw-r--r-- | extensions/source/abpilot/makefile.mk | 115 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 |
8 files changed, 144 insertions, 119 deletions
diff --git a/Repository.mk b/Repository.mk index 26a8f9a83ecc..adc87e2dbcc2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -113,6 +113,7 @@ endif $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ PptImporter \ + abp \ adabas \ adabasui \ agg \ diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk new file mode 100644 index 000000000000..30371f93a648 --- /dev/null +++ b/extensions/AllLangResTarget_abp.mk @@ -0,0 +1,48 @@ +# -*- 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_AllLangResTarget_AllLangResTarget,abp)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,abp,extensions/res)) + +$(eval $(call gb_AllLangResTarget_add_srs,abp,abp/res)) + +$(eval $(call gb_SrsTarget_SrsTarget,abp/res)) + +$(eval $(call gb_SrsTarget_set_include,abp/res,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/extensions/inc) \ +)) + +$(eval $(call gb_SrsTarget_add_files,abp/res,\ + extensions/source/abpilot/abspilot.src \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk new file mode 100644 index 000000000000..411c2d823ccf --- /dev/null +++ b/extensions/Library_abp.mk @@ -0,0 +1,91 @@ +# -*- 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,abp)) + +$(eval $(call gb_Library_set_componentfile,abp,extensions/source/abpilot/abp)) + +$(eval $(call gb_Library_set_include,abp,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/extensions/inc) \ + -I$(realpath $(SRCDIR)/extensions/source/inc) \ +)) + +ifneq ($(WITH_MOZILLA),NO) +ifneq ($(SYSTEM_MOZILLA),YES) +$(eval $(call gb_Library_add_defs,abp,\ + -DWITH_MOZILLA \ +)) +endif +endif + +$(eval $(call gb_Library_add_defs,abp,\ + -DCOMPMOD_NAMESPACE=abp \ + -DCOMPMOD_RESPREFIX=abp \ +)) + +$(eval $(call gb_Library_add_api,abp,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_exception_objects,abp,\ + extensions/source/abpilot/abpfinalpage \ + extensions/source/abpilot/abpservices \ + extensions/source/abpilot/abspage \ + extensions/source/abpilot/abspilot \ + extensions/source/abpilot/admininvokationimpl \ + extensions/source/abpilot/admininvokationpage \ + extensions/source/abpilot/datasourcehandling \ + extensions/source/abpilot/fieldmappingimpl \ + extensions/source/abpilot/fieldmappingpage \ + extensions/source/abpilot/moduleabp \ + extensions/source/abpilot/tableselectionpage \ + extensions/source/abpilot/typeselectionpage \ + extensions/source/abpilot/unodialogabp \ +)) + +$(eval $(call gb_Library_add_linked_libs,abp,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ + sfx \ + svl \ + svt \ + svxcore \ + svx \ + tk \ + tl \ + utl \ + vcl \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 12c47f90104f..4bd1aa12574a 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_abp \ AllLangResTarget_bib \ AllLangResTarget_dbp \ AllLangResTarget_pcr \ @@ -34,6 +35,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_upd \ AllLangResTarget_updchk \ Configuration_updchk \ + Library_abp \ Library_bib \ Library_dbp \ Library_log \ diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index 338c79061e28..e6bf64aa3120 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -7,8 +7,7 @@ ex extensions\source\activex\msidl nmake - w ex_axmsidl ex_in ex extensions\source\activex\main nmake - w ex_axmain ex_axmsidl.w ex_inc NULL ex extensions\source\resource nmake - all ex_resrc ex_inc NULL ex extensions\source\xmlextract nmake - all ex_xmlextr ex_inc NULL -ex extensions\source\abpilot nmake - all ex_abpilot ex_inc NULL -ex extensions\util nmake - all ex_util ex_abpilot NULL +ex extensions\util nmake - all ex_util NULL ex extensions\prj nmake - all ex_prj NULL # Fails at the moment diff --git a/extensions/source/abpilot/exports.dxp b/extensions/source/abpilot/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/extensions/source/abpilot/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk deleted file mode 100644 index 7f84828247bb..000000000000 --- a/extensions/source/abpilot/makefile.mk +++ /dev/null @@ -1,115 +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=..$/.. -PRJINC=..$/inc - -PRJNAME=extensions -TARGET=abp -USE_DEFFILE=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=abp -CDEFS+=-DCOMPMOD_RESPREFIX=abp - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/abpfinalpage.obj \ - $(SLO)$/abpservices.obj \ - $(SLO)$/abspage.obj \ - $(SLO)$/abspilot.obj \ - $(SLO)$/admininvokationimpl.obj \ - $(SLO)$/admininvokationpage.obj \ - $(SLO)$/datasourcehandling.obj \ - $(SLO)$/fieldmappingimpl.obj \ - $(SLO)$/fieldmappingpage.obj \ - $(SLO)$/moduleabp.obj \ - $(SLO)$/tableselectionpage.obj \ - $(SLO)$/typeselectionpage.obj \ - $(SLO)$/unodialogabp.obj \ - -SLOFILES= \ - $(EXCEPTIONSFILES) - - -.IF "$(WITH_MOZILLA)" != "NO" -.IF "$(SYSTEM_MOZILLA)" != "YES" -CDEFS+=-DWITH_MOZILLA -.ENDIF -.ENDIF - -SRS1NAME=$(TARGET) -SRC1FILES= abspilot.src - -RESLIB1NAME=abp -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES= $(SRS)$/abp.srs - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS= \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SFXLIB) \ - $(SVLLIB) \ - $(SVTLIB) \ - $(SVTOOLLIB) \ - $(SVXCORELIB) \ - $(SVXLIB) \ - $(TKLIB) \ - $(TOOLSLIB) \ - $(UNOTOOLSLIB) \ - $(VCLLIB) \ - -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1IMPLIB= i$(TARGET) -SHL1DEPN= $(SHL1LIBS) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/abp.component - -$(MISC)/abp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - abp.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt abp.component diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 1865bfdfcb40..1dfc4c9c40df 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -165,13 +165,13 @@ my_components = \ .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" my_components += \ - abp \ component/desktop/source/deployment/deployment \ component/desktop/source/deployment/gui/deploymentgui \ component/desktop/source/migration/services/migrationoo2 \ component/desktop/source/migration/services/migrationoo3 \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ + component/extensions/source/abpilot/abp \ component/extensions/source/bibliography/bib \ component/extensions/source/dbpilots/dbp \ component/extensions/source/logging/log \ |