Author: arist
Date: Wed Nov 14 22:51:58 2012
New Revision: 1409501
URL: http://svn.apache.org/viewvc?rev=1409501&view=rev
Log:
gnumake4_016_a0f3dc4a5f5a.patch
# HG changeset patch
# User mba
# Date 1298737768 -3600
# Node ID a0f3dc4a5f5ae4e7fe33511ea3f91d306714c6a4
# Parent 91f62ad41944b1df9343b86d3be2ba23b85a9734
CWS gnumake4: convert basebmp to new build system
Added:
incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk (with props)
incubator/ooo/branches/gbuild/main/basebmp/Makefile (with props)
incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk (with props)
incubator/ooo/branches/gbuild/main/basebmp/Package_inc.mk (with props)
incubator/ooo/branches/gbuild/main/basebmp/prj/makefile.mk (with props)
Modified:
incubator/ooo/branches/gbuild/main/Module_ooo.mk
incubator/ooo/branches/gbuild/main/basebmp/inc/basebmp/bitmapdevice.hxx
incubator/ooo/branches/gbuild/main/basebmp/prj/build.lst
incubator/ooo/branches/gbuild/main/basebmp/prj/d.lst
Modified: incubator/ooo/branches/gbuild/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/Module_ooo.mk?rev=1409501&r1=1409500&r2=1409501&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/Module_ooo.mk (original)
+++ incubator/ooo/branches/gbuild/main/Module_ooo.mk Wed Nov 14 22:51:58 2012
@@ -24,6 +24,7 @@
$(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
+ basebmp \
canvas \
comphelper \
cppcanvas \
Added: incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk?rev=1409501&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk (added)
+++ incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk Wed Nov 14
22:51:58 2012
@@ -0,0 +1,65 @@
+#*************************************************************************
+#
+# 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
+# <http://www.openoffice.org/license.html>
+# 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_add_api,basebmp,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,basebmp,\
+ -I$(SRCDIR)/basebmp/inc/ \
+ -I$(SRCDIR)/basebmp/inc/pch \
+ $$(INCLUDE) \
+))
+
+$(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:
Propchange: incubator/ooo/branches/gbuild/main/basebmp/Library_basebmp.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/basebmp/Makefile
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/Makefile?rev=1409501&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/Makefile (added)
+++ incubator/ooo/branches/gbuild/main/basebmp/Makefile Wed Nov 14 22:51:58 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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:
Propchange: incubator/ooo/branches/gbuild/main/basebmp/Makefile
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk?rev=1409501&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk (added)
+++ incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk Wed Nov 14
22:51:58 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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:
Propchange: incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/ooo/branches/gbuild/main/basebmp/Package_inc.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/Package_inc.mk?rev=1409501&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/Package_inc.mk (added)
+++ incubator/ooo/branches/gbuild/main/basebmp/Package_inc.mk Wed Nov 14
22:51:58 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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:
Propchange: incubator/ooo/branches/gbuild/main/basebmp/Package_inc.mk
------------------------------------------------------------------------------
svn:executable = *
Modified:
incubator/ooo/branches/gbuild/main/basebmp/inc/basebmp/bitmapdevice.hxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/inc/basebmp/bitmapdevice.hxx?rev=1409501&r1=1409500&r2=1409501&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/inc/basebmp/bitmapdevice.hxx
(original)
+++ incubator/ooo/branches/gbuild/main/basebmp/inc/basebmp/bitmapdevice.hxx Wed
Nov 14 22:51:58 2012
@@ -34,6 +34,13 @@
#include <boost/noncopyable.hpp>
#include <vector>
+#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;
@@ -67,7 +74,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<BitmapDevice>,
+class BASEBMP_DLLPUBLIC BitmapDevice : public
boost::enable_shared_from_this<BitmapDevice>,
private boost::noncopyable
{
public:
Modified: incubator/ooo/branches/gbuild/main/basebmp/prj/build.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/prj/build.lst?rev=1409501&r1=1409500&r2=1409501&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/basebmp/prj/build.lst Wed Nov 14
22:51:58 2012
@@ -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
Modified: incubator/ooo/branches/gbuild/main/basebmp/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/prj/d.lst?rev=1409501&r1=1409500&r2=1409501&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/basebmp/prj/d.lst Wed Nov 14 22:51:58
2012
@@ -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
Added: incubator/ooo/branches/gbuild/main/basebmp/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/prj/makefile.mk?rev=1409501&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/prj/makefile.mk (added)
+++ incubator/ooo/branches/gbuild/main/basebmp/prj/makefile.mk Wed Nov 14
22:51:58 2012
@@ -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
+# <http://www.openoffice.org/license.html>
+# 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
Propchange: incubator/ooo/branches/gbuild/main/basebmp/prj/makefile.mk
------------------------------------------------------------------------------
svn:executable = *
