Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3561
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/1
fdo#60949: Move the last libs to OOOLIBS
Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
---
M Repository.mk
M scp2/source/base/postgresqlsdbc.scp
M scp2/source/canvas/canvascommons.scp
M scp2/source/canvas/directxcanvas.scp
M scp2/source/canvas/vclcanvas.scp
M scp2/source/gnome/file_gnome.scp
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/module_pdfimport.scp
8 files changed, 52 insertions(+), 76 deletions(-)
diff --git a/Repository.mk b/Repository.mk
index 0afc24b..4bc6702 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -562,28 +562,56 @@
PresenterScreen \
basprov \
cairocanvas \
+ canvasfactory \
+ cmdmail \
+ directx9canvas \
dlgprov \
expwrap \
fastsax \
+ fpicker \
+ fps_office \
gconfbe1 \
+ gdipluscanvas \
+ hatchwindowfactory \
i18nsearch \
kdebe1 \
kde4be1 \
ldapbe2 \
+ losessioninstall \
+ macbe1 \
migrationoo2 \
migrationoo3 \
msforms \
mtfrenderer \
OGLTrans \
+ passwordcontainer \
+ pdfimport \
+ postgresql-sdbc \
+ postgresql-sdbc-impl \
pythonloader \
+ simplecanvas \
slideshow \
stringresource \
+ syssh \
tdebe1 \
+ ucpcmis1 \
+ ucpext \
ucpgio1 \
ucpgvfs1 \
+ ucptdoc1 \
+ updatefeed \
vbaevents \
vbaobj \
vbaswobj \
+ vclcanvas \
+ $(if $(filter $(OS),MACOSX), \
+ fps_aqua \
+ ) \
+ $(if $(filter $(OS),WNT), \
+ oleautobridge \
+ smplmail \
+ wininetbe1 \
+ ) \
))
$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
@@ -595,36 +623,8 @@
ucpexpand1 \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
- canvasfactory \
- cmdmail \
directx5canvas \
- directx9canvas \
- fpicker \
- fps_office \
- gdipluscanvas \
- hatchwindowfactory \
- losessioninstall \
- macbe1 \
nullcanvas \
- passwordcontainer \
- pdfimport \
- postgresql-sdbc \
- postgresql-sdbc-impl \
- simplecanvas \
- syssh \
- ucpcmis1 \
- ucpext \
- ucptdoc1 \
- updatefeed \
- vclcanvas \
- $(if $(filter $(OS),MACOSX), \
- fps_aqua \
- ) \
- $(if $(filter $(OS),WNT), \
- oleautobridge \
- smplmail \
- wininetbe1 \
- ) \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
index 90e8631..e584d53 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -45,9 +45,9 @@
Styles = ();
End
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl)
File gid_File_PostgresqlSdbc_Ini
TXT_FILE_BODY;
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index f390a9e..d91ba70 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -27,5 +27,5 @@
#include "macros.inc"
-SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas)
diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp
index cfa762d..970770d 100644
--- a/scp2/source/canvas/directxcanvas.scp
+++ b/scp2/source/canvas/directxcanvas.scp
@@ -28,6 +28,6 @@
#include "macros.inc"
#ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas)
#endif
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index c17301f..cb36501 100644
--- a/scp2/source/canvas/vclcanvas.scp
+++ b/scp2/source/canvas/vclcanvas.scp
@@ -27,4 +27,4 @@
#include "macros.inc"
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas)
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index cf9a498..875f174 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -29,7 +29,7 @@
#ifdef ENABLE_GIO
STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 )
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall)
#endif
#ifdef ENABLE_GNOMEVFS
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 17f4668..bea5d03 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -138,7 +138,7 @@
#if ! defined WNT // no longer supported on Windows
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail )
#endif
@@ -392,12 +392,7 @@
#endif
#ifdef MACOSX
-File gid_File_Lib_Fps_Aqua
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
-End
+STD_LIB_FILE( gid_File_Lib_Fps_Aqua, fps_aqua )
File gid_File_Lib_MacOSXSpell
LIB_FILE_BODY;
@@ -416,8 +411,8 @@
#endif
#endif
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker )
#ifndef SYSTEM_LCMS2
@@ -494,7 +489,7 @@
#endif
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory )
STD_LIB_FILE( gid_File_Lib_I18nsearch, i18nsearch )
@@ -697,17 +692,10 @@
#endif
#if defined(WNT) && !defined(DISABLE_ATL)
-
-File gid_File_Lib_Ole
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "oleautobridge.uno.dll";
-End
-
+STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
#endif
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer )
STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
@@ -886,14 +874,7 @@
#endif
#ifdef WNT
-
-File gid_File_Lib_Smplmail
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "smplmail.uno.dll";
-End
-
+STD_LIB_FILE( gid_File_Lib_Smplmail, smplmail )
#endif
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
@@ -933,14 +914,14 @@
End
#endif
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Syssh, syssh )
#ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
#endif
#ifdef MACOSX
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
#endif
STD_LIB_FILE( gid_File_Lib_Acc, acc )
@@ -1023,11 +1004,11 @@
SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1)
File gid_File_Lib_Lnth
LIB_FILE_BODY;
@@ -1168,7 +1149,7 @@
STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed )
#ifndef SYSTEM_OPENSSL
File gid_File_Lib_Openssl
diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp
index 06f4583..0d42536 100644
--- a/scp2/source/ooo/module_pdfimport.scp
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -56,12 +56,7 @@
Styles = (PACKED);
End
-File gid_File_Lib_PdfimportUno
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = SCP2_URE_DL_BARE("pdfimport.uno");
- Styles = (PACKED);
-End
+STD_LIB_FILE( gid_File_Lib_PdfimportUno, pdfimport )
File gid_File_Xcd_Pdfimport
TXT_FILE_BODY;
--
To view, visit https://gerrit.libreoffice.org/3561
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org@gmail.com>
Context
- [PATCH] fdo#60949: Move the last libs to OOOLIBS · Marcos Souza (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.