From 4265f28d829e056582255b47488a3415483181a6 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 26 Feb 2011 17:29:28 +0100 Subject: CWS gnumake4: convert basebmp to new build system [hg:a0f3dc4a5f5a] --- basebmp/Library_basebmp.mk | 61 +++++++++++++++++++++++++++++ basebmp/Makefile | 38 ++++++++++++++++++ basebmp/Module_basebmp.mk | 35 +++++++++++++++++ basebmp/Package_inc.mk | 64 ++++++++++++++++++++++++++++++ basebmp/inc/basebmp/bitmapdevice.hxx | 9 ++++- basebmp/prj/build.lst | 5 +-- basebmp/prj/d.lst | 9 ----- basebmp/prj/makefile.mk | 40 +++++++++++++++++++ basebmp/source/makefile.mk | 76 ------------------------------------ basebmp/util/basebmp.flt | 4 -- basebmp/util/makefile.mk | 66 ------------------------------- 11 files changed, 247 insertions(+), 160 deletions(-) create mode 100644 basebmp/Library_basebmp.mk create mode 100644 basebmp/Makefile create mode 100644 basebmp/Module_basebmp.mk create mode 100644 basebmp/Package_inc.mk create mode 100644 basebmp/prj/makefile.mk delete mode 100644 basebmp/source/makefile.mk delete mode 100644 basebmp/util/basebmp.flt delete mode 100644 basebmp/util/makefile.mk (limited to 'basebmp') diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk new file mode 100644 index 000000000000..703ddc396494 --- /dev/null +++ b/basebmp/Library_basebmp.mk @@ -0,0 +1,61 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,basebmp)) + +$(eval $(call gb_Library_add_package_headers,basebmp,basebmp_inc)) + +$(eval $(call gb_Library_set_include,basebmp,\ + -I$(SRCDIR)/basebmp/inc/ \ + -I$(SRCDIR)/basebmp/inc/pch \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,basebmp,\ + $$(DEFS) \ + -DBASEBMP_DLLIMPLEMENTATION \ +)) + +# add libraries to be linked to basebmp; again these names need to be given as +# specified in Repository.mk +$(eval $(call gb_Library_add_linked_libs,basebmp,\ + sal \ + basegfx \ + stl \ + $(gb_STDLIBS) \ +)) + +# add all source files that shall be compiled with exceptions enabled +# the name is relative to $(SRCROOT) and must not contain an extension +$(eval $(call gb_Library_add_exception_objects,basebmp,\ + basebmp/source/bitmapdevice \ + basebmp/source/debug \ + basebmp/source/polypolygonrenderer \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/basebmp/Makefile b/basebmp/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/basebmp/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk new file mode 100644 index 000000000000..284544863cee --- /dev/null +++ b/basebmp/Module_basebmp.mk @@ -0,0 +1,35 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,basebmp)) + +$(eval $(call gb_Module_add_targets,basebmp,\ + Library_basebmp \ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk new file mode 100644 index 000000000000..d38f58ca8ef6 --- /dev/null +++ b/basebmp/Package_inc.mk @@ -0,0 +1,64 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessor.hxx,basebmp/accessor.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessoradapters.hxx,basebmp/accessoradapters.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessorfunctors.hxx,basebmp/accessorfunctors.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessortraits.hxx,basebmp/accessortraits.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/clippedlinerenderer.hxx,basebmp/clippedlinerenderer.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colorblendaccessoradapter.hxx,basebmp/colorblendaccessoradapter.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colormisc.hxx,basebmp/colormisc.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colortraits.hxx,basebmp/colortraits.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/compositeiterator.hxx,basebmp/compositeiterator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/endian.hxx,basebmp/endian.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/fillimage.hxx,basebmp/fillimage.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/genericcolorimageaccessor.hxx,basebmp/genericcolorimageaccessor.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/greylevelformats.hxx,basebmp/greylevelformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/iteratortraits.hxx,basebmp/iteratortraits.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/linerenderer.hxx,basebmp/linerenderer.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/metafunctions.hxx,basebmp/metafunctions.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/nonstandarditerator.hxx,basebmp/nonstandarditerator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/packedpixeliterator.hxx,basebmp/packedpixeliterator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteformats.hxx,basebmp/paletteformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteimageaccessor.hxx,basebmp/paletteimageaccessor.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixelformatadapters.hxx,basebmp/pixelformatadapters.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixeliterator.hxx,basebmp/pixeliterator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/polypolygonrenderer.hxx,basebmp/polypolygonrenderer.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/rgb24pixelformats.hxx,basebmp/rgb24pixelformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/rgbmaskpixelformats.hxx,basebmp/rgbmaskpixelformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scaleimage.hxx,basebmp/scaleimage.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scanlineformats.hxx,basebmp/scanlineformats.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/stridedarrayiterator.hxx,basebmp/stridedarrayiterator.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/tools.hxx,basebmp/tools.hxx)) +$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/truecolormaskaccessor.hxx,basebmp/truecolormaskaccessor.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx index b1c513444fe6..134318b5aaf4 100644 --- a/basebmp/inc/basebmp/bitmapdevice.hxx +++ b/basebmp/inc/basebmp/bitmapdevice.hxx @@ -38,6 +38,13 @@ #include #include +#if defined BASEBMP_DLLIMPLEMENTATION +#define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define BASEBMP_DLLPRIVATE SAL_DLLPRIVATE + namespace basegfx { class B2IPoint; @@ -71,7 +78,7 @@ struct ImplBitmapDevice; works best when given as an eight bit grey bitmap. Everything else is accepted, but potentially slow. */ -class BitmapDevice : public boost::enable_shared_from_this, +class BASEBMP_DLLPUBLIC BitmapDevice : public boost::enable_shared_from_this, private boost::noncopyable { public: diff --git a/basebmp/prj/build.lst b/basebmp/prj/build.lst index b68e8f2eb6fd..2b0fa1e0f72a 100644 --- a/basebmp/prj/build.lst +++ b/basebmp/prj/build.lst @@ -1,5 +1,2 @@ bx basebmp : sal VIGRA:vigra basegfx BOOST:boost NULL -bx basebmp usr1 - all bx_mkout NULL -bx basebmp\source nmake - all bx_source NULL -bx basebmp\util nmake - all bx_util bx_source NULL -bx basebmp\test nmake - all bx_test bx_util NULL +bx basebmp\prj nmake - all bx_prj NULL diff --git a/basebmp/prj/d.lst b/basebmp/prj/d.lst index e94118c72b9d..e69de29bb2d1 100644 --- a/basebmp/prj/d.lst +++ b/basebmp/prj/d.lst @@ -1,9 +0,0 @@ -..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib%_EXT%\ibasebmp.lib - -..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin%_EXT%\basebmp?????.dll - -..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib%_EXT%\libbasebmp*.* -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a - -mkdir: %_DEST%\inc%_EXT%\basebmp -..\inc\basebmp\*.hxx %_DEST%\inc%_EXT%\basebmp\*.hxx diff --git a/basebmp/prj/makefile.mk b/basebmp/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/basebmp/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk deleted file mode 100644 index 55b27cfa7565..000000000000 --- a/basebmp/source/makefile.mk +++ /dev/null @@ -1,76 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/ - -PRJNAME=basebmp -TARGET=wrapper -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - - -# TODO(F3) unify BASEBMP_NO_NESTED_TEMPLATE_PARAMETER and -# VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS -# -# - VIGRA_WITHOUT_NESTED_TEMPLATES_PARAMS avoids template parameters -# to templates - the template keyword is broken for SunCC -# - VIGRA_HAS_LONG_LONG enables long long overloads (but appears to not work -# reliably in some environments, and is thus not enabled) -# - VIGRA_HAS_LONG_DOUBLE enables long double overloads - -.IF "$(OS)"!="WNT" -CDEFS+= -DVIGRA_HAS_LONG_DOUBLE -.ENDIF - -.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" -CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER -DVIGRA_WITHOUT_NESTED_TEMPLATE_PARAMS -.ENDIF - -# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail -# if compiled with default -xalias_level (and optimization level -xO3) -.IF "$(OS)"=="SOLARIS" -# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx -.IF "$(CCNUMVER)"!="00050005" -CDEFS+=-xalias_level=compatible -.ENDIF -.ENDIF - -# --- Common ---------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/bitmapdevice.obj \ - $(SLO)$/debug.obj \ - $(SLO)$/polypolygonrenderer.obj - -# $(SLO)$/genericintegerimageaccessor.obj \ - -# ========================================================================== - -.INCLUDE : target.mk diff --git a/basebmp/util/basebmp.flt b/basebmp/util/basebmp.flt deleted file mode 100644 index 28a1dd1b65c6..000000000000 --- a/basebmp/util/basebmp.flt +++ /dev/null @@ -1,4 +0,0 @@ -__CT -Impl -IMP -internal \ No newline at end of file diff --git a/basebmp/util/makefile.mk b/basebmp/util/makefile.mk deleted file mode 100644 index bc86ebd6bac4..000000000000 --- a/basebmp/util/makefile.mk +++ /dev/null @@ -1,66 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=basebmp -TARGET=basebmp - -# --- Settings --------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein --------------------------------------------------- - -LIB1TARGET=$(SLB)$/basebmp.lib -LIB1FILES=\ - $(SLB)$/wrapper.lib - -SHL1TARGET= basebmp$(DLLPOSTFIX) -SHL1IMPLIB= ibasebmp - -SHL1STDLIBS=\ - $(SALLIB) \ - $(BASEGFXLIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1LIBS= $(SLB)$/basebmp.lib - -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(LIB1TARGET) - -DEF1DES =BaseBMP -DEFLIB1NAME =basebmp - -# --- Targets ----------------------------------------------------------- - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt : makefile.mk - @$(TYPE) $(TARGET).flt > $@ - -- cgit