fdo#60924 autoinstall - gbuild/scp2: Move some libs to OOO and clean a little

Also put the vbaswobj lib in the right place, inside Writer

Change-Id: I52ecc75e26f5f1997d3a575682b78fbd673e4591

4 files changed, 30 insertions, 224 deletions

diff --git a/Repository.mk b/Repository.mk
index c37f6d695a24..e347faf0f54c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -214,8 +214,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+	acc \
 	avmedia \
 	$(if $(DISABLE_SCRIPTING),,basctl) \
+	$(if $(DISABLE_SCRIPTING),,basprov) \
 	basegfx \
 	bib \
 	$(if $(ENABLE_CAIRO_CANVAS),cairocanvas) \
@@ -235,6 +237,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	deploymentmisc \
 	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
 	$(if $(filter unx,$(GUIBASE)),desktop_detector) \
+	$(if $(DISABLE_SCRIPTING),,dlgprov) \
 	$(if $(ENABLE_DIRECTX),directx9canvas) \
 	drawinglayer \
 	editeng \
@@ -250,9 +253,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	eti \
 	evtatt \
 	exp \
+	expwrap \
+	fastsax \
 	flat \
 	file \
 	filterconfig \
+	fpicker \
+	fps_office \
 	for \
 	forui \
 	frm \
@@ -266,6 +273,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	guesslang \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
 	i18npool \
+	i18nsearch \
+	hatchwindowfactory \
 	hyphen \
 	icd \
 	icg \
@@ -282,19 +291,24 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(if $(SOLAR_JAVA),jdbc) \
 	$(if $(ENABLE_KAB),kab1) \
 	$(if $(ENABLE_KAB),kabdrv1) \
+	ldapbe2 \
 	localebe1 \
+	log \
 	lng \
 	lnth \
 	$(if $(MERGELIBS),merged) \
 	msfilter \
+	$(if $(DISABLE_SCRIPTING),,msforms) \
 	mtfrenderer \
 	mysql \
 	odbc \
 	odbcbase \
 	odfflatxml \
 	offacc \
+	passwordcontainer \
 	pcr \
 	pdffilter \
+	$(if $(DISABLE_SCRIPTING),,protocolhandler) \
 	res \
 	sax \
 	sb \
@@ -306,14 +320,18 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	sdui \
 	sfx \
 	simplecanvas \
+	slideshow \
 	sot \
+	spell \
 	$(if $(ENABLE_HEADLESS),,spl) \
+	$(if $(DISABLE_SCRIPTING),,stringresource) \
 	svgio \
 	svl \
 	svt \
 	svx \
 	svxcore \
 	sw \
+	syssh \
 	$(if $(ENABLE_TDEAB),tdeab1) \
 	$(if $(ENABLE_TDEAB),tdeabdrv1) \
 	textconversiondlgs \
@@ -325,6 +343,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	unoxml \
 	utl \
 	uui \
+	$(if $(DISABLE_SCRIPTING),,vbaevents) \
+	$(if $(DISABLE_SCRIPTING),,vbahelper) \
 	vcl \
 	vclcanvas \
 	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))),vclplug_gen) \
@@ -344,12 +364,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
 	swd \
 	swui \
 	t602filter \
+	$(if $(DISABLE_SCRIPTING),,vbaswobj) \
 	wpftwriter \
 	writerfilter \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-	acc \
 	adabas \
 	adabasui \
 	ado \
@@ -364,21 +384,17 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	AppleRemote \
 	avmediaQuickTime \
 	filtertracer \
-	log \
 	MacOSXSpell \
 	mork \
 	mozab2 \
 	mozabdrv \
-	protocolhandler \
 	rpt \
 	rptui \
 	rptxml \
 	simplecm \
 	spa \
-	spell \
 	sts \
 	textfd \
-	$(if $(DISABLE_SCRIPTING),,vbahelper) \
 	vclplug_tde \
 	vclplug_kde \
 	vclplug_kde4 \
@@ -458,14 +474,23 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+	cached1 \
 	comphelper \
 	deployment \
 	fileacc \
+	$(if $(SOLAR_JAVA),hsqldb) \
 	i18nlangtag \
 	i18nutil \
+	localedata_en \
+	localedata_es \
+	localedata_euro \
+	localedata_others \
 	mcnttype \
 	package2 \
+	$(if $(DISABLE_SCRIPTING),,scriptframe) \
+	sdbc2 \
 	sofficeapp \
+	tvhlp1 \
 	ucb1 \
 	ucbhelper \
 	ucpfile1 \
@@ -476,7 +501,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	avmediagst_0_10 \
 	avmediawin \
 	bluez_bluetooth \
-	cached1 \
 	collator_data \
 	dbpool2 \
 	deploymentgui \
@@ -484,14 +508,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	dict_zh \
 	embobj \
 	emboleobj \
-	hsqldb \
 	index_data \
 	java_uno_accessbridge \
 	libreoffice \
-	localedata_en \
-	localedata_es \
-	localedata_euro \
-	localedata_others \
 	macab1 \
 	macabdrv1 \
 	mozbootstrap \
@@ -499,11 +518,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	pyuno \
 	pyuno_wrapper \
 	recentfile \
-	scriptframe \
-	sdbc2 \
 	srtrs1 \
 	textconv_dict \
-	tvhlp1 \
 	ucpdav1 \
 	ucpftp1 \
 	ucpchelp1 \
@@ -560,35 +576,19 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-	basprov \
 	cmdmail \
-	dlgprov \
-	expwrap \
-	fastsax \
-	fpicker \
-	fps_office \
-	hatchwindowfactory \
-	i18nsearch \
-	ldapbe2 \
 	macbe1 \
 	migrationoo2 \
 	migrationoo3 \
-	msforms \
 	OGLTrans \
-	passwordcontainer \
 	pdfimport \
 	postgresql-sdbc \
 	postgresql-sdbc-impl \
 	pythonloader \
-	slideshow \
-	stringresource \
-	syssh \
 	ucpcmis1 \
 	ucpext \
 	ucptdoc1 \
 	updatefeed \
-	vbaevents \
-	vbaswobj \
 	$(if $(filter $(OS),MACOSX), \
 		fps_aqua \
 	) \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 42518c67da2f..1e1a2615433f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -39,42 +39,6 @@ End
 STD_LIB_FILE( gid_File_Lib_Ado, ado)
 #endif
 
-#ifndef DISABLE_SCRIPTING
-
-STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
-
-STD_LIB_FILE( gid_File_Lib_Basprov, basprov )
-
-STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevents)
-
-File gid_File_Lib_Scriptframe
-    LIB_FILE_BODY;
-  #ifdef UNX
-    #ifdef MACOSX
-       Name = "libscriptframe.dylib";
-    #else
-       Name = "libscriptframe.so";
-    #endif
-  #else
-    Name = "scriptframe.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-#endif
-
-File gid_File_Lib_Cached1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
-  #else
-    Name = "cached1.dll";
-  #endif
-End
-
 #ifndef SYSTEM_CLUCENE
 File gid_File_Lib_CLucene
     LIB_FILE_BODY;
@@ -88,8 +52,6 @@ File gid_File_Lib_CLucene
 End
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Ldapbe2, ldapbe2 )
-
 #if defined _MSC_VER
 
 File gid_File_Lib_Cli_Oootypes_Assembly
@@ -229,29 +191,6 @@ File gid_File_Lib_Textconv_Dict
     Styles = (PACKED);
 End
 
-#ifndef DISABLE_SCRIPTING
-
-STD_LIB_FILE( gid_File_Lib_Dlgprov, dlgprov )
-
-STD_LIB_FILE( gid_File_Lib_Stringresource, stringresource )
-
-STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj)
-
-STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms)
-
-File gid_File_Lib_Vbahelper
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
-  #endif
-End
-
-#endif
-
 #ifdef WNT
 
 File gid_File_Lib_Dnd
@@ -363,9 +302,6 @@ End
 #endif
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Fps_Office, fps_office )
-STD_LIB_FILE( gid_File_Lib_Fpicker, fpicker )
-
 #ifndef SYSTEM_LCMS2
 
 File gid_File_Lib_Lcms2
@@ -440,10 +376,6 @@ End
 
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory )
-
-STD_LIB_FILE( gid_File_Lib_I18nsearch, i18nsearch )
-
 #ifndef SYSTEM_ICU
 
 File gid_File_Lib_Icudata
@@ -508,20 +440,6 @@ End
 
 #endif
 
-#ifdef SOLAR_JAVA
-File gid_File_Lib_Hsqldb_2
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX));
-  #else
-    Name = "hsqldb.dll";
-  #endif
-End
-
-#endif
-
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_sn_tools
@@ -533,50 +451,6 @@ End
 
 #endif
 
-File gid_File_Lib_Localedata_En
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(liblocaledata_en,UNXSUFFIX));
-  #else
-    Name = "localedata_en.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Localedata_Es
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(liblocaledata_es,UNXSUFFIX));
-  #else
-    Name = "localedata_es.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Localedata_Euro
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(liblocaledata_euro,UNXSUFFIX));
-  #else
-    Name = "localedata_euro.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
-File gid_File_Lib_Localedata_Others
-    LIB_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT2(liblocaledata_others,UNXSUFFIX));
-  #else
-    Name = "localedata_others.dll";
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 #if defined(WNT)
 
 #if defined WITH_MOZAB4WIN
@@ -602,8 +476,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
-// STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
-
 #ifdef SOLAR_JAVA
 #ifndef MACOSX
 
@@ -625,10 +497,6 @@ End
 STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer )
-
-STD_LIB_FILE( gid_File_Lib_Log, log)
-
 SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 
 #if defined ENABLE_NPAPI_FROM_BROWSER
@@ -724,25 +592,8 @@ End
 
 #endif /* WNT && HAVE_WINDOWS_SDK */
 
-STD_LIB_FILE( gid_File_Lib_Expwrap_Uno, expwrap )
-
-STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax )
-
 STD_LIB_FILE( gid_File_Lib_Oox , oox)
 
-STD_LIB_FILE( gid_File_Lib_Slideshow, slideshow )
-
-File gid_File_Lib_Sdbc_2
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
-  #else
-    Name = "sdbc2.dll";
-  #endif
-End
-
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_Instooofiltmsi
@@ -769,13 +620,6 @@ End
 
 #endif
 
-File gid_File_Lib_Spell
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Name = LIBNAME(spell);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-
 #if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
 STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 #endif
@@ -791,7 +635,6 @@ File gid_File_Lib_Sysdtrans
 End
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Syssh, syssh )
 
 #ifdef WNT
 STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
@@ -801,19 +644,6 @@ STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
 STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Acc, acc )
-
-File gid_File_Lib_Tvhlp1
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
-  #else
-    Name = "tvhlp1.dll";
-  #endif
-End
-
 File gid_File_Lib_Ucpchelp1
     LIB_FILE_BODY;
   #ifdef UNX
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index d8a0a5f49eca..3fe65c8307f6 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -110,7 +110,6 @@ Module gid_Module_Root_Files_3
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root3,
 	gid_File_Jar_Unoil,
-	gid_File_Jar_Hsqldb,
 	gid_File_Jar_Hsqldb_Sdbc,
 	gid_File_Jar_Accessbridge,
 	gid_File_Jar_Officebean,
@@ -154,7 +153,6 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_AVMediaGStreamer,
 	gid_File_Lib_AVMediaGStreamer_0_10,
 	gid_File_Lib_Sysdtrans,
-	gid_File_Lib_Acc,
 	gid_File_Lib_BaseBmp,
 	gid_File_Lib_Zip,
 	gid_File_Lib_Vclplug_Tde,
@@ -178,12 +176,7 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Collator_Data,
     gid_File_Lib_Index_Data,
     gid_File_Lib_Textconv_Dict,
-	gid_File_Lib_Basprov,
 	gid_File_Lib_Crypto,
-	gid_File_Lib_Dlgprov,
-	gid_File_Lib_Stringresource,
-	gid_File_Lib_Ldapbe2,
-	gid_File_Lib_Cached1,
 #if ! defined SYSTEM_CLUCENE
         gid_File_Lib_CLucene,
 #endif
@@ -194,15 +187,10 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Emboleobj,
 	gid_File_Lib_Macab_1,
     gid_File_Lib_Macab_Drv_1,
-	gid_File_Lib_I18nsearch,
 	gid_File_Lib_Icudata,
 	gid_File_Lib_Icui18n,
 	gid_File_Lib_Icule,
 	gid_File_Lib_Icuuc,
-	gid_File_Lib_Localedata_En,
-	gid_File_Lib_Localedata_Es,
-	gid_File_Lib_Localedata_Euro,
-	gid_File_Lib_Localedata_Others,
 	gid_File_Lib_Hsqldb_2,
 	gid_File_Lib_Mork,
 	gid_File_Lib_Mozabdrv,
@@ -210,18 +198,12 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Officebean,
 	gid_File_Lib_Openssl,
 	gid_File_Lib_DeploymentGui,
-	gid_File_Lib_Expwrap_Uno,
-	gid_File_Lib_Fastsax_Uno,
-	gid_File_Lib_Slideshow,
 	gid_File_Lib_Recentfile,
-	gid_File_Lib_Scriptframe,
-	gid_File_Lib_Sdbc_2,
 	gid_File_Lib_Srtrs1,
 	gid_File_Lib_Tab,
 	gid_File_Lib_Tab2,
 	gid_File_Lib_Migrationoo2,
 	gid_File_Lib_Migrationoo3,
-	gid_File_Lib_Syssh,
 	gid_File_Ucptdoc1,
 	gid_File_Lib_Raptor,
 	gid_Unixlink_File_Lib_Raptor,
@@ -242,7 +224,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Sqlite3,
 	gid_File_Lib_Ssl3,
 	gid_File_Lib_Sndfile,
-	gid_File_Lib_Tvhlp1,
 	gid_File_Lib_Ucpchelp1,
 	gid_File_Lib_Ucpdav1,
 	gid_File_Lib_Neon,
@@ -278,10 +259,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Smplmail,
 	gid_File_Lib_Wininetbe,
 	gid_File_Lib_Macbe,
-	gid_File_Lib_Fps_Office,
-	gid_File_Lib_Fpicker,
-	gid_File_Lib_Hatchwindowfactory,
-	gid_File_Lib_Passwordcontainer,
     gid_File_Lib_Updatefeed,
 	gid_File_Lib_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index c141fa199cff..6ffc1676bd06 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -38,7 +38,6 @@ Module gid_Module_Prg_Wrt_Bin
     Files = (gid_File_Bin_Cde_Sagenda,gid_File_Bin_Cde_Sfax,gid_File_Bin_Cde_Slabel,
     gid_File_Bin_Cde_Sletter,gid_File_Bin_Cde_Smemo,gid_File_Bin_Cde_Svcard,
     auto_writer_ALL
-    gid_File_Lib_Vbaswobj,
     gid_File_Jar_Email, 
     gid_File_Jar_Mail, 
     gid_File_Jar_Activation,