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

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4225

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/4225/1

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

Change-Id: I89e87f2e107bdb31f19262c83f8e20be9642a4eb
---
M Repository.mk
M scp2/AutoInstallLibs.mk
M scp2/InstallModule_calc.mk
M scp2/source/calc/file_calc.scp
M scp2/source/calc/module_calc.scp
M solenv/gbuild/Helper.mk
6 files changed, 22 insertions(+), 32 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 748fb61..068cbb8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -209,6 +209,19 @@
     dbu \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,CALC, \
+    analysis \
+    calc \
+    date \
+    pricing \
+    sc \
+    scd \
+    scfilt \
+    scui \
+    solver \
+    vbaobj \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
     svgfilter \
     flash \
@@ -393,35 +406,26 @@
        adabasui \
        ado \
     agg \
-    analysis \
     $(if $(filter $(OS),ANDROID),, \
                basebmp \
     ) \
     communi \
-    date \
     oox \
        ooxml \
     sdbc \
     AppleRemote \
     avmediaQuickTime \
-    calc \
        filtertracer \
     log \
        MacOSXSpell \
     mork \
     mozab2 \
     mozabdrv \
-    pricing \
     protocolhandler \
     rpt \
     rptui \
     rptxml \
-    sc \
-    scd \
-    scfilt \
-    scui \
     simplecm \
-    solver \
     spa \
     spell \
     sts \
@@ -636,7 +640,6 @@
     ucptdoc1 \
     updatefeed \
     vbaevents \
-    vbaobj \
     vbaswobj \
     $(if $(filter $(OS),MACOSX), \
         fps_aqua \
diff --git a/scp2/AutoInstallLibs.mk b/scp2/AutoInstallLibs.mk
index 7fc4878..5db0d39 100644
--- a/scp2/AutoInstallLibs.mk
+++ b/scp2/AutoInstallLibs.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_AutoInstallLibs_AutoInstallLibs))
 
 $(eval $(call gb_AutoInstallLibs_add_category,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
+$(eval $(call gb_AutoInstallLibs_add_category,calc,CALC,LIBO_LIB_FILE,auto_Calc_Lib))
 $(eval $(call gb_AutoInstallLibs_add_category,gnome,GNOME,LIBO_LIB_FILE,auto_Gnome_Lib))
 $(eval $(call 
gb_AutoInstallLibs_add_category,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib))
 $(eval $(call gb_AutoInstallLibs_add_category,impress,IMPRESS,LIBO_LIB_FILE,auto_Impress_Lib))
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
index dba5960..acb1009 100644
--- a/scp2/InstallModule_calc.mk
+++ b/scp2/InstallModule_calc.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/calc))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc))
+
 $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
        ENABLE_LPSOLVE \
        SYSTEM_LPSOLVE \
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 115681b..3f17394 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -18,11 +18,7 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE( gid_File_Lib_Solver, solver)
-
-STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
-
-STD_LIB_FILE( gid_File_Lib_Pricing, pricing)
+#include "AutoInstallLibs/calc"
 
 File gid_File_Share_Registry_Calc_Xcd
     TXT_FILE_BODY;
@@ -30,18 +26,6 @@
     Dir = gid_Brand_Dir_Share_Registry;
     Name = "calc.xcd";
 End
-
-STD_LIB_FILE( gid_File_Lib_Calc, calc)
-
-STD_LIB_FILE( gid_File_Lib_Date, date)
-
-STD_LIB_FILE( gid_File_Lib_Sc, sc)
-
-STD_LIB_FILE( gid_File_Lib_Scui, scui)
-
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
-
-STD_LIB_FILE( gid_File_Lib_Scd, scd)
 
 STD_RES_FILE( gid_File_Res_Analysis, analysis)
 
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 46b4271..a23a0bbb 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -33,9 +33,9 @@
     Minimal = YES;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = 
(gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
-    gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
-    gid_File_Lib_Vbaobj,
+    Files = (auto_Calc_Lib_ALL
+    
gid_File_Share_Registry_Calc_Xcd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
+    gid_File_Lib_Lpsolve,
     gid_File_Tmp_Userinstall_Calc_Inf);
 End
 
@@ -45,7 +45,7 @@
     ParentID = gid_Module_Prg_Calc_Bin;
     Sortkey = "700";
     Default = YES;
-    Files = 
(gid_File_Lib_Date,gid_File_Zip_Addin,gid_File_Lib_Rot,gid_File_Lib_Dfa,gid_File_Lib_Analysis,gid_File_Lib_Pricing);
+    Files = (gid_File_Zip_Addin,gid_File_Lib_Rot);
 End
 
 Module gid_Module_Brand_Prg_Calc
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index d6af980..046bae7 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 CALC ONLINEUPDATE GRAPHICFILTER GNOME TDE IMPRESS KDE MATH 
OOO URE WRITER
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 
 $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))

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

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