Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4153

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/4153/1

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

Change-Id: Iee1000ff245c369446a9e671a3f7c637f76f989b
---
M Repository.mk
A scp2/AutoInstallLibs_base.mk
M scp2/InstallModule_base.mk
M scp2/Module_scp2.mk
M scp2/source/base/file_base.scp
M scp2/source/base/module_base.scp
M solenv/gbuild/Helper.mk
7 files changed, 28 insertions(+), 18 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index b8f953e..be41a69 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -210,6 +210,15 @@
 
 endif
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,BASE, \
+    abp \
+    dbp \
+    dbu \
+    rpt \
+    rptui \
+    rptxml \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
     svgfilter \
     flash \
@@ -376,7 +385,6 @@
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-    abp \
     acc \
        adabas \
        adabasui \
@@ -395,8 +403,6 @@
     AppleRemote \
     avmediaQuickTime \
     calc \
-    dbp \
-    dbu \
        filtertracer \
     log \
        MacOSXSpell \
@@ -406,9 +412,6 @@
     placeware \
     pricing \
     protocolhandler \
-    rpt \
-    rptui \
-    rptxml \
     sc \
     scd \
     scfilt \
diff --git a/scp2/AutoInstallLibs_base.mk b/scp2/AutoInstallLibs_base.mk
new file mode 100644
index 0000000..5cb70c2
--- /dev/null
+++ b/scp2/AutoInstallLibs_base.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,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index e3609f4..d956142 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base))
+
 # Not sure about that?
 #$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
 #      ENABLE_REPORTBUILDER \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 3178920..ce1fb02 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Module_Module,scp2))
 
 $(eval $(call gb_Module_add_targets,scp2,\
+       AutoInstallLibs_base \
        AutoInstallLibs_onlineupdate \
        AutoInstallLibs_graphicfilter \
        AutoInstallLibs_tde \
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index f4eaad9..4aec6bb 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -36,26 +36,19 @@
 End
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Abp, abp)
 STD_RES_FILE( gid_File_Res_Abp, abp)
 
-STD_LIB_FILE( gid_File_Lib_Dbp, dbp)
 STD_RES_FILE( gid_File_Res_Dbp, dbp)
 
-STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
 STD_RES_FILE( gid_File_Res_Dbu, dbu)
 
 STD_RES_FILE( gid_File_Res_Cnr, cnr)
 STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
 STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
 
-STD_LIB_FILE( gid_File_Lib_Rpt, rpt )
 STD_RES_FILE( gid_File_Res_Rpt, rpt)
 
-STD_LIB_FILE( gid_File_Lib_Rptui, rptui )
 STD_RES_FILE( gid_File_Res_Rptui, rptui)
-
-STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
 
 #if defined WITH_HELP
 File gid_File_Help_Sdatabase_Zip
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index ce28fae..615cbdd 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstallLibs/base"
+
 Module gid_Module_Prg_Base
     MOD_NAME_DESC(MODULE_PRG_BASE);
     ParentID = gid_Module_Prg;
@@ -33,11 +35,8 @@
     Minimal = NO;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (
+    Files = (auto_Base_Lib_ALL
         gid_File_Share_Registry_Base_Xcd
-        ,gid_File_Lib_Abp
-        ,gid_File_Lib_Dbp
-        ,gid_File_Lib_Dbu
     );
 End
 
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index db3a859..530524c 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 := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE MATH OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE MATH OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 

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

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


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.