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

Change-Id: I89e87f2e107bdb31f19262c83f8e20be9642a4eb

Repository.mk

@@ -157,6 +157,19 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
 	dbu \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
+	analysis \
+	calc \
+	date \
+	pricing \
+	sc \
+	scd \
+	scfilt \
+	scui \
+	solver \
+	$(if $(DISABLE_SCRIPTING),,vbaobj) \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
 	svgfilter \
 	flash \
@@ -341,35 +354,26 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	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 \
@@ -584,7 +588,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	ucptdoc1 \
 	updatefeed \
 	vbaevents \
-	vbaobj \
 	vbaswobj \
 	$(if $(filter $(OS),MACOSX), \
 		fps_aqua \

scp2/AutoInstall.mk

@@ -10,6 +10,7 @@
 $(eval $(call gb_AutoInstall_AutoInstall))
 
 $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))

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 \

scp2/source/calc/file_calc.scp

@@ -18,12 +18,6 @@
 
 #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)
-
 File gid_File_Share_Registry_Calc_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -31,18 +25,6 @@ File gid_File_Share_Registry_Calc_Xcd
     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)
 
 STD_RES_FILE( gid_File_Res_Date, date)

scp2/source/calc/module_calc.scp

@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/calc"
+
 Module gid_Module_Prg_Calc
     MOD_NAME_DESC ( MODULE_PRG_CALC );
     ParentID = gid_Module_Prg;
@@ -33,10 +35,9 @@ Module gid_Module_Prg_Calc_Bin
     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,
-    gid_File_Tmp_Userinstall_Calc_Inf);
+    Files = (auto_calc_ALL
+    gid_File_Share_Registry_Calc_Xcd,
+    gid_File_Lib_Lpsolve);
 End
 
 Module gid_Module_Prg_Calc_Addins
@@ -45,7 +46,7 @@ Module gid_Module_Prg_Calc_Addins
     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

scp2/source/ooo/file_library_ooo.scp

@@ -235,8 +235,6 @@ STD_LIB_FILE( gid_File_Lib_Dlgprov, dlgprov )
 
 STD_LIB_FILE( gid_File_Lib_Stringresource, stringresource )
 
-STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj)
-
 STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj)
 
 STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms)