diff options
author | Peter Foley <pefoley2@verizon.net> | 2011-12-18 00:13:28 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-12-18 00:13:28 +0100 |
commit | ead4cd1fa535f1bdbda4c99217e727903f058e50 (patch) | |
tree | 8c63f824f4c601a093974277ea8f01df394107a0 | |
parent | 2e6705a7287cdd046ed73e4e81dddd9b87d9279e (diff) |
extensions: convert dbpilots to gbuild
-rw-r--r-- | Repository.mk | 1 | ||||
-rw-r--r-- | extensions/AllLangResTarget_dbp.mk | 50 | ||||
-rw-r--r-- | extensions/Library_dbp.mk | 77 | ||||
-rw-r--r-- | extensions/Module_extensions.mk | 2 | ||||
-rw-r--r-- | extensions/prj/build.lst | 3 | ||||
-rw-r--r-- | extensions/source/dbpilots/makefile.mk | 111 | ||||
-rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 |
7 files changed, 132 insertions, 114 deletions
diff --git a/Repository.mk b/Repository.mk index 67f6f87d7981..26a8f9a83ecc 100644 --- a/Repository.mk +++ b/Repository.mk @@ -145,6 +145,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ dba \ dbaxml \ dbmm \ + dbp \ dbtools \ dbu \ deploymentmisc \ diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk new file mode 100644 index 000000000000..657694af7e22 --- /dev/null +++ b/extensions/AllLangResTarget_dbp.mk @@ -0,0 +1,50 @@ +# -*- 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,dbp)) + +$(eval $(call gb_AllLangResTarget_add_srs,dbp,dbp/res)) + +$(eval $(call gb_SrsTarget_SrsTarget,dbp/res)) + +$(eval $(call gb_SrsTarget_set_include,dbp/res,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/extensions/inc) \ +)) + +$(eval $(call gb_SrsTarget_add_files,dbp/res,\ + extensions/source/dbpilots/commonpagesdbp.src \ + extensions/source/dbpilots/dbpilots.src \ + extensions/source/dbpilots/gridpages.src \ + extensions/source/dbpilots/groupboxpages.src \ + extensions/source/dbpilots/listcombopages.src \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk new file mode 100644 index 000000000000..c7fd685cc3ce --- /dev/null +++ b/extensions/Library_dbp.mk @@ -0,0 +1,77 @@ +# -*- 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,dbp)) + +$(eval $(call gb_Library_set_componentfile,dbp,extensions/source/dbpilots/dbp)) + +$(eval $(call gb_Library_set_include,dbp,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/extensions/inc) \ + -I$(realpath $(SRCDIR)/extensions/source/inc) \ +)) + +$(eval $(call gb_Library_add_defs,dbp,\ + -DCOMPMOD_NAMESPACE=dbp \ +)) + +$(eval $(call gb_Library_add_api,dbp,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_exception_objects,dbp,\ + extensions/source/dbpilots/commonpagesdbp \ + extensions/source/dbpilots/controlwizard \ + extensions/source/dbpilots/dbpservices \ + extensions/source/dbpilots/dbptools \ + extensions/source/dbpilots/gridwizard \ + extensions/source/dbpilots/groupboxwiz \ + extensions/source/dbpilots/listcombowizard \ + extensions/source/dbpilots/moduledbp \ + extensions/source/dbpilots/optiongrouplayouter \ + extensions/source/dbpilots/wizardservices \ +)) + +$(eval $(call gb_Library_add_linked_libs,dbp,\ + svt \ + vcl \ + tl \ + svl \ + sfx \ + dbtools \ + utl \ + comphelper \ + cppuhelper \ + cppu \ + sal \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index c7d364105ddd..12c47f90104f 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -28,12 +28,14 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_bib \ + AllLangResTarget_dbp \ AllLangResTarget_pcr \ AllLangResTarget_san \ AllLangResTarget_upd \ AllLangResTarget_updchk \ Configuration_updchk \ Library_bib \ + Library_dbp \ Library_log \ Library_pcr \ Library_scn \ diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index d95b30d34e71..338c79061e28 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -7,9 +7,8 @@ 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\dbpilots nmake - all ex_dbpilots ex_inc NULL ex extensions\source\abpilot nmake - all ex_abpilot ex_inc NULL -ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots NULL +ex extensions\util nmake - all ex_util ex_abpilot NULL ex extensions\prj nmake - all ex_prj NULL # Fails at the moment diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk deleted file mode 100644 index e37ab0a546ac..000000000000 --- a/extensions/source/dbpilots/makefile.mk +++ /dev/null @@ -1,111 +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=dbp -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=dbp - -# --- Files -------------------------------------------------------- - -CXXFILES= dbptools.cxx \ - gridwizard.cxx \ - listcombowizard.cxx \ - optiongrouplayouter.cxx \ - commonpagesdbp.cxx \ - groupboxwiz.cxx \ - wizardservices.cxx \ - controlwizard.cxx \ - moduledbp.cxx \ - dbpservices.cxx - -SLOFILES= $(SLO)$/dbptools.obj \ - $(SLO)$/gridwizard.obj \ - $(SLO)$/listcombowizard.obj \ - $(SLO)$/optiongrouplayouter.obj \ - $(SLO)$/commonpagesdbp.obj \ - $(SLO)$/groupboxwiz.obj \ - $(SLO)$/wizardservices.obj \ - $(SLO)$/controlwizard.obj \ - $(SLO)$/moduledbp.obj \ - $(SLO)$/dbpservices.obj - - -SRS1NAME=$(TARGET) -SRC1FILES= gridpages.src \ - commonpagesdbp.src \ - dbpilots.src \ - groupboxpages.src \ - listcombopages.src - -RESLIB1NAME=dbp -RESLIB1SRSFILES= $(SRS)$/dbp.srs - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS= \ - $(SVTOOLLIB) \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(SVLLIB) \ - $(SFXLIB) \ - $(DBTOOLSLIB) \ - $(UNOTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1IMPLIB= i$(TARGET) -SHL1DEPN= $(SHL1LIBS) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/dbp.component - -$(MISC)/dbp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - dbp.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt dbp.component diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index a03dd331d454..1865bfdfcb40 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,13 +173,13 @@ my_components += \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ component/extensions/source/bibliography/bib \ + component/extensions/source/dbpilots/dbp \ component/extensions/source/logging/log \ component/extensions/source/propctrlr/pcr \ component/extensions/source/scanner/scn \ component/extensions/source/update/check/updchk.uno \ component/extensions/source/update/feed/updatefeed \ component/extensions/source/update/ui/updchk \ - dbp \ fpicker \ fps_office \ res \ |