Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2169

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/2169/1

proposal: move towards killing UNOLIBS_OOO and merge libs to OOOLIBS

- this is a partial example commit moving ogltrans and mtfrenderer to
  OOOLIBS
- this renames the libs universally as gbuild is making this trivial and
  little risk of having libs linking against the old name
- having libs named differently (lib*.uno.so and lib*lo.so) just adds
  needles complexity to the build system and creates insecurity for new
  contributors (and is not really documented either)
- we should probably look at the other lib groups for cheap kills too
  (renaming in stable/frozen URE isnt worth it though)

Change-Id: I2106dd2afb71861acf3de7d21a2283473ea2110c
---
M Repository.mk
M scp2/source/canvas/mtfrenderer.scp
M scp2/source/impress/module_ogltrans.scp
3 files changed, 8 insertions(+), 24 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 6f62ae2..49c91b6 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -536,6 +536,10 @@
     salhelper \
 ))
 
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+    mtfrenderer \
+    OGLTrans \
+))
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     PresenterScreen \
     basprov \
@@ -566,9 +570,7 @@
     migrationoo2 \
     migrationoo3 \
     msforms \
-    mtfrenderer \
     nullcanvas \
-    OGLTrans \
     passwordcontainer \
     pdfimport \
     pythonloader \
@@ -596,7 +598,7 @@
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     oleautobridge \
     oleautobridge2 \
     smplmail \
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
index da372b2..f8137c7 100644
--- a/scp2/source/canvas/mtfrenderer.scp
+++ b/scp2/source/canvas/mtfrenderer.scp
@@ -27,14 +27,4 @@
 
 #include "macros.inc"
 
-File gid_File_Lib_MtfRenderer
-    LIB_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
-    RegistryID = gid_Starregistry_Services_Rdb;
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(mtfrenderer.uno,UNXSUFFIX));
-  #else
-    Name = "mtfrenderer.uno.dll";
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_MtfRenderer, mtfrenderer)
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 409ff9b..ade2e74 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -36,16 +36,8 @@
     Default = NO;
 End
 
-File gid_File_Lib_OpenGLTransitions
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-    Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
-  #else
-    Name = "OGLTrans.uno.dll";
-  #endif
-End
+
+STD_LIB_FILE(gid_File_Lib_OpenGLTransitions, OGLTrans)
 
 File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
     TXT_FILE_BODY;

-- 
To view, visit https://gerrit.libreoffice.org/2169
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2106dd2afb71861acf3de7d21a2283473ea2110c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen <bjoern.michaelsen@canonical.com>

Context


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.