[PATCH] fdo#60924 autoinstall - gbuild/scp2: add canvas module

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4183

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/4183/1

fdo#60924 autoinstall - gbuild/scp2: add canvas module

Change-Id: I567f31092f4f9a20749e2bc6ba8a3de3d304d74f
---
M Repository.mk
A scp2/AutoInstallLibs_canvas.mk
M scp2/InstallModule_canvas.mk
M scp2/Module_scp2.mk
D scp2/source/canvas/cairocanvas.scp
D scp2/source/canvas/canvascommons.scp
D scp2/source/canvas/directxcanvas.scp
D scp2/source/canvas/mtfrenderer.scp
D scp2/source/canvas/vclcanvas.scp
M solenv/gbuild/Helper.mk
10 files changed, 27 insertions(+), 118 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index b919371..d02e6f4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -216,6 +216,18 @@
     dbu \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,CANVAS, \
+    $(if $(filter TRUE,$(ENABLE_CAIRO_CANVAS)),cairocanvas) \
+    canvasfactory \
+    mtfrenderer \
+    simplecanvas \
+    vclcanvas \
+    $(if $(filter TRUE,$(ENABLE_DIRECTX)),
+        directx9canvas \
+        gdipluscanvas \
+    )
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
     svgfilter \
     flash \
@@ -609,16 +621,12 @@
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     basprov \
-    cairocanvas \
-    canvasfactory \
     cmdmail \
-    directx9canvas \
     dlgprov \
     expwrap \
     fastsax \
     fpicker \
     fps_office \
-    gdipluscanvas \
     hatchwindowfactory \
     i18nsearch \
     ldapbe2 \
@@ -626,14 +634,12 @@
     migrationoo2 \
     migrationoo3 \
     msforms \
-    mtfrenderer \
     OGLTrans \
     passwordcontainer \
     pdfimport \
     postgresql-sdbc \
     postgresql-sdbc-impl \
     pythonloader \
-    simplecanvas \
     slideshow \
     stringresource \
     syssh \
@@ -644,7 +650,6 @@
     vbaevents \
     vbaobj \
     vbaswobj \
-    vclcanvas \
     $(if $(filter $(OS),MACOSX), \
         fps_aqua \
     ) \
diff --git a/scp2/AutoInstallLibs_canvas.mk b/scp2/AutoInstallLibs_canvas.mk
new file mode 100644
index 0000000..ed97fae
--- /dev/null
+++ b/scp2/AutoInstallLibs_canvas.mk
@@ -0,0 +1,12 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,canvas,CANVAS,LIBO_LIB_FILE,auto_Canvas_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_canvas.mk b/scp2/InstallModule_canvas.mk
index ad721b5..02c94b2 100644
--- a/scp2/InstallModule_canvas.mk
+++ b/scp2/InstallModule_canvas.mk
@@ -9,16 +9,6 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/canvas))
 
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/canvas,\
-    scp2/source/canvas/canvascommons \
-    scp2/source/canvas/mtfrenderer \
-    scp2/source/canvas/vclcanvas \
-       $(if $(filter TRUE,$(ENABLE_CAIRO_CANVAS)),\
-               scp2/source/canvas/cairocanvas \
-       ) \
-       $(if $(filter TRUE,$(ENABLE_DIRECTX)),\
-               scp2/source/canvas/directxcanvas \
-       ) \
-))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/canvas,canvas))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 7d935fe..2b71f00 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -11,6 +11,7 @@
 
 $(eval $(call gb_Module_add_targets,scp2,\
        AutoInstallLibs_base \
+       AutoInstallLibs_canvas \
        AutoInstallLibs_onlineupdate \
        AutoInstallLibs_graphicfilter \
        AutoInstallLibs_tde \
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
deleted file mode 100644
index eceff58..0000000
--- a/scp2/source/canvas/cairocanvas.scp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas)
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
deleted file mode 100644
index db6b0ae..0000000
--- a/scp2/source/canvas/canvascommons.scp
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_CanvasFactory, canvasfactory)
-STD_LIB_FILE(gid_File_SimpleCanvas, simplecanvas)
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
deleted file mode 100644
index e9ccf2f..0000000
--- a/scp2/source/canvas/directxcanvas.scp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#include "macros.inc"
-
-#ifdef WNT
-STD_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas)
-STD_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas)
-#endif
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
deleted file mode 100644
index 768dbe6..0000000
--- a/scp2/source/canvas/mtfrenderer.scp
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_Lib_MtfRenderer, mtfrenderer)
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
deleted file mode 100644
index a50dd43..0000000
--- a/scp2/source/canvas/vclcanvas.scp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#include "macros.inc"
-
-STD_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas)
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index c98ea22..9381af8 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -109,7 +109,7 @@
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
 gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE 
UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE IMPRESS KDE MATH OOO 
URE WRITER
+gb_Library_VALIDINSTALLMODULES := BASE CANVAS ONLINEUPDATE GRAPHICFILTER GNOME TDE IMPRESS KDE 
MATH OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 

-- 
To view, visit https://gerrit.libreoffice.org/4183
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I567f31092f4f9a20749e2bc6ba8a3de3d304d74f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org@gmail.com>