[PATCH] fdo#60949: Move more libs to OOOLIBS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3511 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/3511/1 fdo#60949: Move more libs to OOOLIBS Change-Id: Ibd45f7004f8eaa151b9a60d7369d396411f60a2b --- M Repository.mk M scp2/source/gnome/file_gnome.scp M scp2/source/impress/file_impress.scp M scp2/source/kde/file_kde.scp M scp2/source/python/file_python.scp M scp2/source/tde/file_tde.scp 6 files changed, 16 insertions(+), 64 deletions(-) diff --git a/Repository.mk b/Repository.mk index 314ca61d..0afc24b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,20 +559,28 @@ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ +PresenterScreen \ basprov \ cairocanvas \ dlgprov \ expwrap \ fastsax \ +gconfbe1 \ i18nsearch \ +kdebe1 \ +kde4be1 \ ldapbe2 \ migrationoo2 \ migrationoo3 \ msforms \ mtfrenderer \ OGLTrans \ +pythonloader \ slideshow \ stringresource \ +tdebe1 \ +ucpgio1 \ +ucpgvfs1 \ vbaevents \ vbaobj \ vbaswobj \ @@ -587,33 +595,25 @@ ucpexpand1 \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ -PresenterScreen \ canvasfactory \ cmdmail \ directx5canvas \ directx9canvas \ fpicker \ fps_office \ -gconfbe1 \ gdipluscanvas \ hatchwindowfactory \ -kdebe1 \ -kde4be1 \ losessioninstall \ macbe1 \ nullcanvas \ passwordcontainer \ pdfimport \ -pythonloader \ postgresql-sdbc \ postgresql-sdbc-impl \ simplecanvas \ syssh \ -tdebe1 \ ucpcmis1 \ ucpext \ -ucpgio1 \ -ucpgvfs1 \ ucptdoc1 \ updatefeed \ vclcanvas \ diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index 9672965..cf9a498 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -27,23 +27,13 @@ #include macros.inc #ifdef ENABLE_GIO -File gid_File_Lib_GIO -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 ) SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno) #endif #ifdef ENABLE_GNOMEVFS -File gid_File_Lib_Gnomevfs -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_Gnomevfs, ucpgvfs1 ) #endif #if (defined ENABLE_GCONF defined ENABLE_LOCKDOWN) || defined ENABLE_GIO @@ -56,12 +46,7 @@ #endif #ifdef ENABLE_GCONF -File gid_File_Lib_Gconfbe -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_Gconfbe, gconfbe1 ) #endif #ifdef ENABLE_SYSTRAY_GTK diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index f2eebf0..7753335 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -37,16 +37,7 @@ PACKED_LIB_FILE_BODY; End -File gid_File_Lib_PresenterScreen -LIB_FILE_BODY; -Dir = SCP2_OOO_BIN_DIR; -#if defined UNX -Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX)); -#else -Name = PresenterScreen.uno.dll; -#endif -Styles = (PACKED); -End +STD_LIB_FILE( gid_File_Lib_PresenterScreen, PresenterScreen ) File gid_File_Share_Registry_Impress_Xcd TXT_FILE_BODY; diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp index 1614f69..2f0320a 100644 --- a/scp2/source/kde/file_kde.scp +++ b/scp2/source/kde/file_kde.scp @@ -27,19 +27,9 @@ #include macros.inc #ifdef ENABLE_KDE -File gid_File_Lib_Kdebe -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_Kdebe, kdebe1 ) #endif #ifdef ENABLE_KDE4 -File gid_File_Lib_Kde4be -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX)); -End +STD_LIB_FILE( gid_File_Lib_Kde4be, kde4be1 ) #endif diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 614c732..c502986 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -54,16 +54,7 @@ Styles = (PACKED); End -File gid_File_Lib_Pythonloader -LIB_FILE_BODY; -Dir = gid_Brand_Dir_Program; - #ifdef UNX -Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX)); - #else -Name = pythonloader.uno.dll; - #endif -Styles = (PACKED); -End +STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader ) File gid_File_Py_Unohelper TXT_FILE_BODY; diff --git a/scp2/source/tde/file_tde.scp b/scp2/source/tde/file_tde.scp index 0a767d7..945b0de 100644 --- a/scp2/source/tde/file_tde.scp +++
[PATCH] fdo#60949: Move more libs to OOOLIBS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3484 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3484/1 fdo#60949: Move more libs to OOOLIBS Change-Id: I566602028556aa954bcbd116c375b9b61cc3df6f --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp 2 files changed, 20 insertions(+), 110 deletions(-) diff --git a/Repository.mk b/Repository.mk index 22e03be..314ca61d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -559,10 +559,20 @@ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ +basprov \ cairocanvas \ +dlgprov \ +expwrap \ +fastsax \ +i18nsearch \ +ldapbe2 \ +migrationoo2 \ +migrationoo3 \ msforms \ mtfrenderer \ OGLTrans \ +slideshow \ +stringresource \ vbaevents \ vbaobj \ vbaswobj \ @@ -578,27 +588,19 @@ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ PresenterScreen \ -basprov \ canvasfactory \ cmdmail \ directx5canvas \ directx9canvas \ -dlgprov \ -expwrap \ -fastsax \ fpicker \ fps_office \ gconfbe1 \ gdipluscanvas \ hatchwindowfactory \ -i18nsearch \ kdebe1 \ kde4be1 \ -ldapbe2 \ losessioninstall \ macbe1 \ -migrationoo2 \ -migrationoo3 \ nullcanvas \ passwordcontainer \ pdfimport \ @@ -606,8 +608,6 @@ postgresql-sdbc \ postgresql-sdbc-impl \ simplecanvas \ -slideshow \ -stringresource \ syssh \ tdebe1 \ ucpcmis1 \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a993630..17f4668 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -44,16 +44,7 @@ STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler ) -File gid_File_Lib_Basprov -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(basprov,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(basprov,.uno,.dll)); - #endif -End +STD_LIB_FILE( gid_File_Lib_Basprov, basprov ) STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevents) @@ -98,16 +89,7 @@ End #endif -File gid_File_Lib_Ldapbe2 -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX)); - #else -Name = ldapbe2.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_Ldapbe2, ldapbe2 ) #if defined _MSC_VER @@ -275,27 +257,9 @@ #ifndef DISABLE_SCRIPTING -File gid_File_Lib_Dlgprov -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(dlgprov,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(dlgprov,.uno,.dll)); - #endif -End +STD_LIB_FILE( gid_File_Lib_Dlgprov, dlgprov ) -File gid_File_Lib_Stringresource -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT3(stringresource,.uno,UNXSUFFIX)); - #else -Name = STRING(CONCAT3(stringresource,.uno,.dll)); - #endif -End +STD_LIB_FILE( gid_File_Lib_Stringresource, stringresource ) STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj) @@ -532,16 +496,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno ) -File gid_File_Lib_I18nsearch -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX)); - #else -Name = i18nsearch.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_I18nsearch, i18nsearch ) File gid_File_Lib_I18nisolang #ifdef UNX @@ -893,27 +848,9 @@ Dir = SCP2_OOO_BIN_DIR; End -File gid_File_Lib_Expwrap_Uno -LIB_FILE_BODY; -Styles = (PACKED,DONT_OVERWRITE); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX)); - #else -Name = expwrap.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_Expwrap_Uno, expwrap ) -File gid_File_Lib_Fastsax_Uno -LIB_FILE_BODY; -Styles = (PACKED,DONT_OVERWRITE); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX)); - #else -Name = fastsax.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax ) STD_LIB_FILE( gid_File_Lib_Oox , oox) @@ -922,16 +859,7 @@ STD_LIB_FILE( gid_File_Lib_Sd , sd) STD_LIB_FILE( gid_File_Lib_Sdui, sdui) -File gid_File_Lib_Slideshow -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX)); - #else -Name = slideshow.uno.dll; - #endif -End +STD_LIB_FILE( gid_File_Lib_Slideshow, slideshow ) File gid_File_Lib_Sdbc_2 LIB_FILE_BODY; @@ -1234,27 +1162,9 @@ #endif #endif -File gid_File_Lib_Migrationoo2 -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX -Name =
