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

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4267

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/4267/1

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

Change-Id: I7a3511172ac8ddd060c51c0339a4b9ff16216668
---
M Repository.mk
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/module_hidden_ooo.scp
3 files changed, 13 insertions(+), 64 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 543275e..151df15 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -296,6 +296,7 @@
        log \
        lng \
        lnth \
+       $(if $(filter $(OS),MACOSX),macbe1) \
        $(if $(MERGELIBS),merged) \
        migrationoo2 \
        migrationoo3 \
@@ -378,7 +379,6 @@
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
        adabas \
        adabasui \
-       ado \
        agg \
        $(if $(filter $(OS),ANDROID),, \
                basebmp \
@@ -387,10 +387,8 @@
        oox \
        ooxml \
        sdbc \
-       AppleRemote \
        avmediaQuickTime \
        filtertracer \
-       MacOSXSpell \
        mork \
        mozab2 \
        mozabdrv \
@@ -519,9 +517,20 @@
        xmlsecurity \
        xsec_fw \
        xstor \
+       $(if $(filter $(OS),WNT), \
+               ado \
+               $(if $(ENABLE_DIRECTX),avmediawin) \
+               $(if $(DISABLE_ATL),,oleautobridge) \
+               smplmail \
+               wininetbe1 \
+       ) \
+       $(if $(filter $(OS),MACOSX), \
+               AppleRemote \
+               fps_aqua \
+               MacOSXSpell \
+       ) \
 ))
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-       avmediawin \
        bluez_bluetooth \
        emboleobj \
        java_uno_accessbridge \
@@ -583,20 +592,11 @@
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
        cmdmail \
-       macbe1 \
        OGLTrans \
        pdfimport \
        postgresql-sdbc \
        postgresql-sdbc-impl \
        pythonloader \
-       $(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/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 8e57fb7..cad2d7c 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -35,10 +35,6 @@
 End
 #endif
 
-#if defined(WNT)
-STD_LIB_FILE( gid_File_Lib_Ado, ado)
-#endif
-
 #ifndef SYSTEM_CLUCENE
 File gid_File_Lib_CLucene
     LIB_FILE_BODY;
@@ -215,15 +211,6 @@
 #endif
 
 #ifdef MACOSX
-STD_LIB_FILE( gid_File_Lib_Fps_Aqua, fps_aqua )
-
-File gid_File_Lib_MacOSXSpell
-       LIB_FILE_BODY;
-       Styles = (PACKED);
-       Name = LIBNAME(MacOSXSpell);
-       Dir = SCP2_OOO_BIN_DIR;
-End
-
 #ifndef X86_64
 File gid_File_Lib_avmediaQuickTime
        LIB_FILE_BODY;
@@ -425,10 +412,6 @@
 #endif
 #endif
 
-#if defined(WNT) && !defined(DISABLE_ATL)
-STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
-#endif
-
 #if defined ENABLE_NPAPI_FROM_BROWSER
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
@@ -458,15 +441,6 @@
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
-#endif
-
-#if defined(MACOSX)
-File gid_File_Lib_AppleRemote
-    Name = LIBNAME(AppleRemote);
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
 #endif
 
 #if defined(MACOSX)
@@ -535,10 +509,6 @@
 
 #endif
 
-#ifdef WNT
-STD_LIB_FILE( gid_File_Lib_Smplmail, smplmail )
-#endif
-
 #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
 
 File gid_File_Lib_Spa
@@ -568,15 +538,6 @@
     Dir = SCP2_OOO_BIN_DIR;
     Name = "sysdtrans.dll";
 End
-#endif
-
-
-#ifdef WNT
-STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 )
-#endif
-
-#ifdef MACOSX
-STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
 #endif
 
 #ifndef DISABLE_NEON
@@ -655,12 +616,6 @@
    #endif
   #endif
 End
-#endif
-
-#if defined WNT
-#ifdef ENABLE_DIRECTX
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
-#endif
 #endif
 
 #ifdef WNT
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 59ab1d4..6f5325e 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -147,7 +147,6 @@
        gid_File_Lib_Oox,
        gid_File_Lib_Pl,
        gid_File_Lib_Spa,
-       gid_File_Lib_AVMediaWin,
        gid_File_Lib_Sysdtrans,
        gid_File_Lib_BaseBmp,
        gid_File_Lib_Zip,
@@ -219,7 +218,6 @@
        gid_File_Lib_Cmdmail,
        gid_File_Lib_I18n,
        gid_File_Lib_Accessbridge,
-       gid_File_Lib_Ado,
        gid_File_Lib_Dl,
        gid_File_Lib_Dnd,
        gid_File_Lib_Dtrans,
@@ -228,14 +226,10 @@
        gid_File_Lib_Ftransl,
     gid_File_Lib_sn_tools,
     GID_FILE_LIB_WPD,
-       gid_File_Lib_Ole,
        gid_File_Lib_Reg4allmsdoc,
        gid_File_Lib_Qslnkmsi,
        gid_File_Lib_Sdqsmsi,
        gid_File_Lib_Instooofiltmsi,
-       gid_File_Lib_Smplmail,
-       gid_File_Lib_Wininetbe,
-       gid_File_Lib_Macbe,
        gid_File_Lib_Cli_Oootypes_Assembly,
        gid_File_Lib_Policy_Cli_Oootypes_Assembly,
        gid_File_Lib_Policy_Cli_Oootypes_Config);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a3511172ac8ddd060c51c0339a4b9ff16216668
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org@gmail.com>