[Libreoffice-commits] core.git: Repository.mk scp2/AutoInstallLibs_impress.mk scp2/InstallModule_impress.mk scp2/Module_scp2.mk scp2/source solenv/gbuild

[Marcos Paulo de Souza]

 Repository.mk                          |    9 ++++++---
 scp2/AutoInstallLibs_impress.mk        |   12 ++++++++++++
 scp2/InstallModule_impress.mk          |    2 ++
 scp2/Module_scp2.mk                    |    1 +
 scp2/source/impress/file_impress.scp   |   12 ------------
 scp2/source/impress/module_impress.scp |    5 ++---
 solenv/gbuild/Helper.mk                |    2 +-
 7 files changed, 24 insertions(+), 19 deletions(-)

New commits:
commit a6f81b3a98e136afabda512b4082b2be05490b34
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date:   Thu Jun 6 15:27:41 2013 -0300

    fdo#60924 autoinstall - gbuild/scp2: add impress module
    
    Change-Id: Id1256a9b62d72bce6a225d2b022865a31c01e25d
    Reviewed-on: https://gerrit.libreoffice.org/4180
    Reviewed-by: Matúš Kukan <matus.kukan at gmail.com>
    Tested-by: Matúš Kukan <matus.kukan at gmail.com>

diff --git a/Repository.mk b/Repository.mk
index ddbb17c..b919371 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -227,6 +227,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
     $(if $(ENABLE_TDE),tdebe1) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,IMPRESS, \
+    animcore \
+    placeware \
+    PresenterScreen \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ONLINEUPDATE, \
     updatecheckui \
     updchk \
@@ -388,7 +394,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	ado \
     agg \
     analysis \
-    animcore \
     $(if $(filter $(OS),ANDROID),, \
 		basebmp \
     ) \
@@ -406,7 +411,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     mork \
     mozab2 \
     mozabdrv \
-    placeware \
     pricing \
     protocolhandler \
     rpt \
@@ -604,7 +608,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-    PresenterScreen \
     basprov \
     cairocanvas \
     canvasfactory \
diff --git a/scp2/AutoInstallLibs_impress.mk b/scp2/AutoInstallLibs_impress.mk
new file mode 100644
index 0000000..597e12b
--- /dev/null
+++ b/scp2/AutoInstallLibs_impress.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,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
index 0deac66..48b786d 100644
--- a/scp2/InstallModule_impress.mk
+++ b/scp2/InstallModule_impress.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/impress))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress))
+
 $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\
 	ENABLE_OPENGL \
 ))
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index ce1fb02..7d935fe 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
 	AutoInstallLibs_onlineupdate \
 	AutoInstallLibs_graphicfilter \
 	AutoInstallLibs_tde \
+	AutoInstallLibs_impress \
 	AutoInstallLibs_gnome \
 	AutoInstallLibs_kde \
 	AutoInstallLibs_math \
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index d01ee36..7cf3eb5 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -18,18 +18,6 @@
 
 #include "macros.inc"
 
-File gid_File_Lib_Placeware
-    Name = LIBNAME(placeware);
-    PACKED_LIB_FILE_BODY;
-End
-
-File gid_File_Lib_Animcore
-	Name = LIBNAME(animcore);
-	PACKED_LIB_FILE_BODY;
-End
-
-STD_LIB_FILE( gid_File_Lib_PresenterScreen, PresenterScreen )
-
 File gid_File_Share_Registry_Impress_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 9fc78a3..5393c71 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -33,10 +33,9 @@ Module gid_Module_Prg_Impress_Bin
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
-    gid_File_Lib_PresenterScreen,
+    Files = (auto_Impress_Lib_ALL
+    gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,
     gid_File_Share_Registry_Impress_Xcd,
-    gid_File_Lib_Animcore,
     gid_File_sd_xml,
     gid_File_Tmp_Userinstall_Impress_Inf);
 End
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 530524c..c98ea22 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -109,7 +109,7 @@ endef
 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 KDE MATH OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE IMPRESS KDE MATH OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE