fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO

Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d
Reviewed-on: https://gerrit.libreoffice.org/5631Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

Repository.mk

@@ -125,12 +125,6 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
 ))
 
-ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
-$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-	pl \
-))
-endif
-
 ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	npsoplugin \
@@ -219,6 +213,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	canvastools \
 	chartcore \
 	chartcontroller \
+	$(if $(filter $(OS),WNT),,cmdmail) \
 	cppcanvas \
 	configmgr \
 	ctl \
@@ -305,6 +300,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	offacc \
 	passwordcontainer \
 	pcr \
+	$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \
 	pdffilter \
 	$(if $(DISABLE_SCRIPTING),,protocolhandler) \
 	res \
@@ -320,6 +316,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	simplecanvas \
 	slideshow \
 	sot \
+	spell \
 	$(if $(ENABLE_HEADLESS),,spl) \
 	$(if $(DISABLE_SCRIPTING),,stringresource) \
 	svgio \
@@ -376,6 +373,15 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 		) \
 		smplmail \
 		wininetbe1 \
+		$(if $(filter YES,$(WITH_MOZAB4WIN)), \
+			mozab2 \
+			mozabdrv \
+		) \
+		$(if $(filter NO,$(WITH_MOZAB4WIN)),mozbootstrap) \
+	) \
+	$(if $(filter $(OS),WNT),, \
+		mork \
+		mozbootstrap \
 	) \
 	$(if $(filter $(OS),MACOSX), \
 		$(if $(ENABLE_MACOSX_SANDBOX),, \
@@ -411,15 +417,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	sdbc \
 	avmediaQuickTime \
 	filtertracer \
-	mork \
-	mozab2 \
-	mozabdrv \
 	rpt \
 	rptui \
 	rptxml \
 	simplecm \
 	spa \
-	spell \
 	sts \
 	vclplug_tde \
 	vclplug_kde \
@@ -524,6 +526,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	localedata_euro \
 	localedata_others \
 	mcnttype \
+	$(if $(ENABLE_JAVA), \
+		$(if $(filter $(OS),MACOSX),,officebean) \
+	) \
+        $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
 	package2 \
 	$(if $(DISABLE_SCRIPTING),,scriptframe) \
 	sdbc2 \
@@ -542,15 +548,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 	xmlsecurity \
 	xsec_fw \
 	xstor \
+	$(if $(filter $(OS),MACOSX), \
+		macab1 \
+		macabdrv1 \
+	) \
 ))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	bluez_bluetooth \
-	emboleobj \
 	libreoffice \
-	macab1 \
-	macabdrv1 \
-	mozbootstrap \
-	officebean \
 	pyuno \
 	pyuno_wrapper \
 	recentfile \
@@ -592,7 +597,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-	cmdmail \
 	OGLTrans \
 	pdfimport \
 	postgresql-sdbc \

scp2/source/ooo/file_library_ooo.scp

@@ -82,11 +82,6 @@ End
 
 #endif
 
-
-#if ! defined WNT // no longer supported on Windows
-STD_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail )
-#endif
-
 #ifndef SYSTEM_CURL
 
 File gid_File_Lib_Curl
@@ -110,27 +105,6 @@ End
 
 #endif
 
-/* fdo#60491 always need emboleobj library on non-WNT platforms */
-#if !defined(WNT) || !defined(DISABLE_ATL)
-SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
-#endif
-
-#ifdef UNX
-
-#ifdef MACOSX
-File gid_File_Lib_Macab_1
-    PACKED_LIB_FILE_BODY;
-    Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
-End
-
-File gid_File_Lib_Macab_Drv_1
-    PACKED_LIB_FILE_BODY;
-    Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX));
-End
-#endif  // #ifdef MACOSX
-
-#endif  // #ifdef UNX
-
 #if defined UNX && ! defined MACOSX
 #ifdef ENABLE_TDE
 File gid_File_Bin_TdeFilePicker
@@ -260,50 +234,6 @@ End
 
 #endif
 
-#if defined(WNT)
-
-#if defined WITH_MOZAB4WIN
-
-STD_LIB_FILE(gid_File_Lib_Mozab,mozab2)
-STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
-
-#else
-
-File gid_File_Lib_Mozbootstrap
-    PACKED_LIB_FILE_BODY;
-    Name = "mozbootstrap.dll";
-End
-
-#endif
-
-#else
-
-STD_LIB_FILE(gid_File_Lib_Mork,mork)
-SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
-
-#endif
-
-#ifdef ENABLE_JAVA
-#ifndef MACOSX
-
-File gid_File_Lib_Officebean
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_LIB_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(libofficebean,UNXSUFFIX));
-  #else
-    Name = "officebean.dll";
-  #endif
-End
-
-#endif
-#endif
-
-#if defined ENABLE_NPAPI_FROM_BROWSER
-STD_LIB_FILE( gid_File_Lib_Pl , pl)
-#endif
-
 #if defined(UNX) && ! defined(MACOSX)
 #ifdef ENABLE_TDE
 File gid_File_Lib_Vclplug_Tde
@@ -359,11 +289,6 @@ End
 
 #endif
 
-File gid_File_Lib_Spell
-    PACKED_LIB_FILE_BODY;
-    Name = LIBNAME(spell);
-End
-
 #if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
 STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 #endif

scp2/source/ooo/module_hidden_ooo.scp

@@ -143,7 +143,6 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Bib,
 	gid_File_Lib_J,
 	gid_File_Lib_Oox,
-	gid_File_Lib_Pl,
 	gid_File_Lib_Spa,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_BaseBmp,
@@ -170,16 +169,9 @@ Module gid_Module_Root_Files_5
 #endif
 	gid_File_Lib_Curl,
 	gid_Unixlink_File_Lib_Curl,
-	gid_File_Lib_Emboleobj,
-	gid_File_Lib_Macab_1,
-    gid_File_Lib_Macab_Drv_1,
 	gid_File_Lib_Icudata,
 	gid_File_Lib_Icui18n,
 	gid_File_Lib_Icuuc,
-	gid_File_Lib_Mork,
-	gid_File_Lib_Mozabdrv,
-	gid_File_Lib_Mozbootstrap,
-	gid_File_Lib_Officebean,
 	gid_File_Lib_Openssl,
 	gid_File_Lib_Recentfile,
 	gid_File_Lib_Tab,
@@ -212,7 +204,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_LibXMLSec_xmlseccore,
 	gid_File_Lib_LibXMLSec_xmlsecmscrypto,
 	gid_File_Lib_XSec_XmlSec,
-	gid_File_Lib_Cmdmail,
 	gid_File_Lib_I18n,
 	gid_File_Lib_Accessbridge,
 	gid_File_Lib_Dl,
@@ -425,6 +416,5 @@ Module gid_Module_Oo_Linguistic
     ParentID = gid_Module_Root;
     Default = YES;
     Styles = (HIDDEN_ROOT);
-    Files = (gid_File_Lib_Spell,
-        gid_File_Share_Registry_Lingucomponent_Xcd);
+    Files = (gid_File_Share_Registry_Lingucomponent_Xcd);
 End