Merge branches/gbuild-reintegration to trunk.

10 files changed, 268 insertions, 29 deletions

diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
new file mode 100644
index 000000000000..a6b46801f054
--- /dev/null
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -0,0 +1,86 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Library_Library,cppcanvas))
+
+$(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,cppcanvas,$(SRCDIR)/cppcanvas/inc/pch/precompiled_cppcanvas))
+
+$(eval $(call gb_Library_add_api,cppcanvas,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,cppcanvas,\
+	-I$(SRCDIR)/cppcanvas/inc \
+	-I$(SRCDIR)/cppcanvas/inc/pch \
+	-I$(SRCDIR)/cppcanvas/source/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,cppcanvas,\
+	-DCPPCANVAS_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,cppcanvas,\
+	tl \
+	cppu \
+	sal \
+	vcl \
+	stl \
+	comphelper \
+	canvastools \
+	cppuhelper \
+	basegfx \
+	i18nisolang1 \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cppcanvas,\
+	cppcanvas/source/mtfrenderer/bitmapaction \
+	cppcanvas/source/mtfrenderer/cachedprimitivebase \
+	cppcanvas/source/mtfrenderer/implrenderer \
+	cppcanvas/source/mtfrenderer/lineaction \
+	cppcanvas/source/mtfrenderer/mtftools \
+	cppcanvas/source/mtfrenderer/pointaction \
+	cppcanvas/source/mtfrenderer/polypolyaction \
+	cppcanvas/source/mtfrenderer/textaction \
+	cppcanvas/source/mtfrenderer/transparencygroupaction \
+	cppcanvas/source/tools/canvasgraphichelper \
+	cppcanvas/source/tools/tools \
+	cppcanvas/source/wrapper/basegfxfactory \
+	cppcanvas/source/wrapper/implbitmap \
+	cppcanvas/source/wrapper/implbitmapcanvas \
+	cppcanvas/source/wrapper/implcanvas \
+	cppcanvas/source/wrapper/implcolor \
+	cppcanvas/source/wrapper/implcustomsprite \
+	cppcanvas/source/wrapper/implfont \
+	cppcanvas/source/wrapper/implpolypolygon \
+	cppcanvas/source/wrapper/implsprite \
+	cppcanvas/source/wrapper/implspritecanvas \
+	cppcanvas/source/wrapper/impltext \
+	cppcanvas/source/wrapper/vclfactory \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Makefile b/cppcanvas/Makefile
new file mode 100644
index 000000000000..dbdce7b281f7
--- /dev/null
+++ b/cppcanvas/Makefile
@@ -0,0 +1,34 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the 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/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
new file mode 100644
index 000000000000..6ee1a0146812
--- /dev/null
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -0,0 +1,31 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Module_Module,cppcanvas))
+
+$(eval $(call gb_Module_add_targets,cppcanvas,\
+	Library_cppcanvas \
+	Package_inc \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/Package_inc.mk b/cppcanvas/Package_inc.mk
new file mode 100644
index 000000000000..8e500ec97fce
--- /dev/null
+++ b/cppcanvas/Package_inc.mk
@@ -0,0 +1,41 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,cppcanvas_inc,$(SRCDIR)/cppcanvas/inc))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvas.hxx,cppcanvas/canvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/sprite.hxx,cppcanvas/sprite.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/vclfactory.hxx,cppcanvas/vclfactory.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/font.hxx,cppcanvas/font.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/customsprite.hxx,cppcanvas/customsprite.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/canvasgraphic.hxx,cppcanvas/canvasgraphic.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/polypolygon.hxx,cppcanvas/polypolygon.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/color.hxx,cppcanvas/color.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/spritecanvas.hxx,cppcanvas/spritecanvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/text.hxx,cppcanvas/text.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/renderer.hxx,cppcanvas/renderer.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/basegfxfactory.hxx,cppcanvas/basegfxfactory.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmap.hxx,cppcanvas/bitmap.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/bitmapcanvas.hxx,cppcanvas/bitmapcanvas.hxx))
+$(eval $(call gb_Package_add_file,cppcanvas_inc,inc/cppcanvas/cppcanvasdllapi.h,cppcanvas/cppcanvasdllapi.h))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index bb24a55ba222..db5e0fecd9ef 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
@@ -34,6 +34,7 @@
 #include <cppcanvas/sprite.hxx>
 #include <basegfx/vector/b2isize.hxx>
 
+#include <cppcanvas/cppcanvasdllapi.h>
 
 namespace basegfx
 {
@@ -58,7 +59,7 @@ namespace cppcanvas
         only be drawn on exactly that canvas. You have to regenerate
         them for different canvases.
      */
-    class BaseGfxFactory
+    class CPPCANVAS_DLLPUBLIC BaseGfxFactory
     {
     public:
         static BaseGfxFactory& getInstance();
diff --git a/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h b/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
new file mode 100644
index 000000000000..1d6557809000
--- /dev/null
+++ b/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
@@ -0,0 +1,34 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef INCLUDED_CPPCANVASDLLAPI_H
+#define  INCLUDED_CPPCANVASDLLAPI_H
+
+#if defined CPPCANVAS_DLLIMPLEMENTATION
+
+#define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define CPPCANVAS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define CPPCANVAS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
diff --git a/cppcanvas/inc/cppcanvas/vclfactory.hxx b/cppcanvas/inc/cppcanvas/vclfactory.hxx
index 300fe0ddff0f..16a55fbe08df 100644
--- a/cppcanvas/inc/cppcanvas/vclfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/vclfactory.hxx
@@ -33,6 +33,7 @@
 #include <cppcanvas/text.hxx>
 #include <cppcanvas/sprite.hxx>
 
+#include <cppcanvas/cppcanvasdllapi.h>
 
 class Window;
 class Bitmap;
@@ -66,7 +67,7 @@ namespace cppcanvas
         only be drawn on exactly that canvas. You have to regenerate
         them for different canvases.
      */
-    class VCLFactory
+    class CPPCANVAS_DLLPUBLIC VCLFactory
     {
     public:
         static VCLFactory& getInstance();
diff --git a/cppcanvas/prj/build.lst b/cppcanvas/prj/build.lst
index 3fc4eb7abdac..bab151c5c142 100644
--- a/cppcanvas/prj/build.lst
+++ b/cppcanvas/prj/build.lst
@@ -1,7 +1,2 @@
-cx	cppcanvas	:	comphelper cppuhelper offuh tools vcl basegfx canvas NULL
-cx	cppcanvas							usr1	-	all	cx_mkout NULL
-cx	cppcanvas\inc						nmake	-	all	cx_inc NULL
-cx	cppcanvas\source\tools				nmake	-	all	cx_tools cx_inc NULL
-cx	cppcanvas\source\wrapper			nmake	-	all cx_wrapper cx_inc NULL
-cx	cppcanvas\source\mtfrenderer		nmake	-	all	cx_mtfrenderer cx_inc NULL
-cx	cppcanvas\util						nmake	-	all	cx_util cx_tools cx_wrapper cx_mtfrenderer NULL
+cx	cppcanvas	:	comphelper cppuhelper offapi tools vcl basegfx canvas NULL
+cx	cppcanvas\prj						nmake	-	all	cx_prj NULL
diff --git a/cppcanvas/prj/d.lst b/cppcanvas/prj/d.lst
index e46f5c3de78a..e69de29bb2d1 100644
--- a/cppcanvas/prj/d.lst
+++ b/cppcanvas/prj/d.lst
@@ -1,20 +0,0 @@
-..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin%_EXT%\cppcanv*.dll
-..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib%_EXT%\icppcanvas.lib
-..\%__SRC%\lib\cppcanvas.lib %_DEST%\lib%_EXT%\cppcanvas.lib
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-
-mkdir: %_DEST%\inc%_EXT%\cppcanvas
-..\inc\cppcanvas\bitmap.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmap.hxx
-..\inc\cppcanvas\bitmapcanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmapcanvas.hxx
-..\inc\cppcanvas\canvas.hxx %_DEST%\inc%_EXT%\cppcanvas\canvas.hxx
-..\inc\cppcanvas\canvasgraphic.hxx %_DEST%\inc%_EXT%\cppcanvas\canvasgraphic.hxx
-..\inc\cppcanvas\color.hxx %_DEST%\inc%_EXT%\cppcanvas\color.hxx
-..\inc\cppcanvas\customsprite.hxx %_DEST%\inc%_EXT%\cppcanvas\customsprite.hxx
-..\inc\cppcanvas\font.hxx %_DEST%\inc%_EXT%\cppcanvas\font.hxx
-..\inc\cppcanvas\polypolygon.hxx %_DEST%\inc%_EXT%\cppcanvas\polypolygon.hxx
-..\inc\cppcanvas\renderer.hxx %_DEST%\inc%_EXT%\cppcanvas\renderer.hxx
-..\inc\cppcanvas\sprite.hxx %_DEST%\inc%_EXT%\cppcanvas\sprite.hxx
-..\inc\cppcanvas\spritecanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\spritecanvas.hxx
-..\inc\cppcanvas\text.hxx %_DEST%\inc%_EXT%\cppcanvas\text.hxx
-..\inc\cppcanvas\vclfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\vclfactory.hxx
-..\inc\cppcanvas\basegfxfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\basegfxfactory.hxx
diff --git a/cppcanvas/prj/makefile.mk b/cppcanvas/prj/makefile.mk
new file mode 100644
index 000000000000..19eb7c11eb7f
--- /dev/null
+++ b/cppcanvas/prj/makefile.mk
@@ -0,0 +1,36 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the 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