[Libreoffice-commits] core.git: Repository.mk scp2/source setup_native/Library_reg_dlls.mk setup_native/Module_setup_native.mk setup_native/source solenv/bin

2020-01-08 Thread Mike Kaganski (via logerrit) 
 Repository.mk |1 
 scp2/source/ooo/windowscustomaction_ooo.scp   |   41 +
 scp2/source/spsupp/module_spsupp.scp  |   18 
 setup_native/Library_reg_dlls.mk  |   40 +
 setup_native/Module_setup_native.mk   |1 
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx |  309 ++
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.def |5 
 solenv/bin/modules/installer/windows/feature.pm   |   23 
 8 files changed, 432 insertions(+), 6 deletions(-)

New commits:
commit f480617ca3a4869c9afd4d3d68f8057a6067d489
Author: Mike Kaganski 
AuthorDate: Wed May 22 19:17:44 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jan 9 07:23:48 2020 +0100

Register spsupp*.dll during installation

This registers SharePoint integration libraries using regsvr.exe.
Both 32-bit and 64-bit libraries are registered; registration of
LOSPSupport.OpenDocuments is unconditional.

This introduces a new hidden MSI feature, which is disabled for
installation: gm_SharePointSupport_SubstMSO. When installed, it
registers SharePoint.OpenDocuments class in registry, thus
overriding registration of this component by MS Office, allowing
LibreOffice to serve as MS Office replacement working in IE with
SharePoint. To install the feature, either a transform is needed
setting the feature's level <= 100, or a command line:

  msiexec path-to-msi ADDLOCAL=gm_SharePointSupport_SubstMSO

Change-Id: I5517bbb68dcc6db8bcb2bbc2368394ee4a62d741
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86452
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/Repository.mk b/Repository.mk
index 88b88d73808f..03628e958f72 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -676,6 +676,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinaryta
instooofiltmsi \
inst_msu_msi \
qslnkmsi \
+   reg_dlls \
reg4allmsdoc \
sdqsmsi \
sellangmsi \
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index bc7201b9b2b4..116b437b1ed3 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -221,3 +221,44 @@ WindowsCustomAction gid_Customaction_RegisterSomeExtensions
 End
 
 #endif /* HAVE_WINDOWS_SDK */
+
+/* Deferred not-impersonated actions that will call regsvr32 to (un)register 
DLLs.
+ * Custom action type 1 (msidbCustomActionTypeDll + 
msidbCustomActionTypeBinaryData)
+ * + 64 (msidbCustomActionTypeContinue) + 1024 (msidbCustomActionTypeInScript)
+ * + 2048 (msidbCustomActionTypeNoImpersonate).
+ * Since deferred actions don't have access to current DB, the actions depend 
on
+ * immediate-executed action prep_reg_unreg_dlls (see below) that precedes it, 
and
+ * sets this action's CustomActionData property.
+ */
+
+WindowsCustomAction gid_Customaction_reg_dlls
+Name = "reg_dlls";
+Typ = "3137";
+Source = "reg_dlls.dll";
+Target = "RegDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "reg_dlls", "InstallFinalize");
+End
+
+WindowsCustomAction gid_Customaction_unreg_dlls
+Name = "unreg_dlls";
+Typ = "3137";
+Source = "reg_dlls.dll";
+Target = "UnregDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "unreg_dlls", 
"UnpublishComponents");
+End
+
+/* Immediately-executed action that adds registration command lines for 
spsupp_x*.dll
+ * to "[un]reg_dlls" properties.
+ * Custom action type 1 (msidbCustomActionTypeDll + 
msidbCustomActionTypeBinaryData)
+ * + 64 (msidbCustomActionTypeContinue).
+ */
+WindowsCustomAction gid_Customaction_prep_reg_dlls
+Name = "prep_reg_unreg_dlls";
+Typ = "65";
+Source = "reg_dlls.dll";
+Target = "PrepRegUnregDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "", "behind_CostFinalize");
+End
diff --git a/scp2/source/spsupp/module_spsupp.scp 
b/scp2/source/spsupp/module_spsupp.scp
index 39c547a5fa5c..b97a84a699d5 100644
--- a/scp2/source/spsupp/module_spsupp.scp
+++ b/scp2/source/spsupp/module_spsupp.scp
@@ -22,5 +22,23 @@ Module gid_Module_Optional_SharePointSupport
 Files = (auto_spsuppfiles_ALL);
 End
 
+/*
+ * This is an *empty* feature disabled by default, that controls custom action 
registering
+ * SharePoint.OpenDocuments class, which replaces registration of that class 
from MSO.
+ * It is disabled to allow co-existing with MS Office. To install, a transform 
must be
+ * used that would set its level to non-0 value, or a command line like
+ *
+ * msiexec.exe /i path-to-msi ADDLOCAL=gm_SharePointSupport_SubstMSO
+ */
+Module gid_Module_SharePointSupport_SubstMSO
+ParentID = gid_Module_Optional_Sh

[Libreoffice-commits] core.git: Repository.mk scp2/source svtools/AllLangResTarget_svt.mk svtools/source svx/AllLangResTarget_ofa.mk svx/Module_svx.mk svx/source uui/source

2017-06-01 Thread Caolán McNamara 
 Repository.mk|1 
 scp2/source/ooo/file_resource_ooo.scp|2 -
 scp2/source/ooo/module_lang_template.scp |1 
 svtools/AllLangResTarget_svt.mk  |1 
 svtools/source/misc/ehdl.cxx |6 ++---
 svx/AllLangResTarget_ofa.mk  |   32 ---
 svx/Module_svx.mk|1 
 uui/source/iahndl-errorhandler.cxx   |2 -
 8 files changed, 5 insertions(+), 41 deletions(-)

New commits:
commit f681a8623059345ad0103294f22de89e287820de
Author: Caolán McNamara 
Date:   Thu Jun 1 13:25:33 2017 +0100

merge ofa res file into svt one

Change-Id: I3f22301e4301ab90e4a1090f2c47cf2403422282
Reviewed-on: https://gerrit.libreoffice.org/38309
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/Repository.mk b/Repository.mk
index 9b89385f8593..bf38a3b3504a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1082,7 +1082,6 @@ $(eval $(call gb_Helper_register_resources,\
frm \
fwe \
gal \
-   ofa \
$(call gb_Helper_optional,DBCONNECTIVITY,pcr) \
pdffilter \
pricing \
diff --git a/scp2/source/ooo/file_resource_ooo.scp 
b/scp2/source/ooo/file_resource_ooo.scp
index 77ab890567d9..ac90ee812f5a 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -49,8 +49,6 @@ STD_RES_FILE( gid_File_Res_Gal, gal )
 STD_RES_FILE( gid_File_Res_Deployment, deployment )
 STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui )
 
-STD_RES_FILE( gid_File_Res_Ofa, ofa )
-
 STD_RES_FILE( gid_File_Res_Pcr, pcr)
 
 STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
diff --git a/scp2/source/ooo/module_lang_template.scp 
b/scp2/source/ooo/module_lang_template.scp
index 78a2b51232f6..6711999a0d1f 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -81,7 +81,6 @@ Module gid_Module_Langpack_Resource_Template
  gid_File_Res_Gal,
  gid_File_Res_Deployment,
  gid_File_Res_DeploymentGui,
- gid_File_Res_Ofa,
  gid_File_Res_Pcr,
  gid_File_Res_Pdffilter,
  gid_File_Res_San,
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index eea65ca9354c..f373af6e4b83 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
 svtools/source/dialogs/wizardmachine.src \
 $(if $(ENABLE_JAVA), \
 svtools/source/java/javaerror.src) \
+svtools/source/misc/errtxt.src \
 svtools/source/misc/imagemgr.src \
 svtools/source/misc/langtab.src \
 svtools/source/misc/svtools.src \
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 856f4f59a86a..216cf7aba132 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -148,7 +148,7 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong 
lStartP, sal_uLong l
 ErrorRegistry::RegisterDisplay(&aWndFunc);
 if( ! pMgr )
 {
-pMgr = ResMgr::CreateResMgr("ofa", 
Application::GetSettings().GetUILanguageTag() );
+pMgr = ResMgr::CreateResMgr("svt", 
Application::GetSettings().GetUILanguageTag() );
 pFreeMgr.reset(pMgr);
 }
 }
@@ -202,7 +202,7 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, 
OUString &rStr)
 */
 
 {
-std::unique_ptr pResMgr(ResMgr::CreateResMgr("ofa", 
Application::GetSettings().GetUILanguageTag() ));
+std::unique_ptr pResMgr(ResMgr::CreateResMgr("svt", 
Application::GetSettings().GetUILanguageTag() ));
 if( pResMgr )
 {
 ResStringArray aEr(ResId(RID_ERRHDL, *pResMgr));
@@ -284,7 +284,7 @@ bool SfxErrorContext::GetString(sal_uInt32 nErrId, OUString 
&rStr)
 ResMgr* pFreeMgr = nullptr;
 if( ! pMgr )
 {
-pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", 
Application::GetSettings().GetUILanguageTag() );
+pFreeMgr = pMgr = ResMgr::CreateResMgr("svt", 
Application::GetSettings().GetUILanguageTag() );
 }
 if( pMgr )
 {
diff --git a/svx/source/src/errtxt.src b/svtools/source/misc/errtxt.src
similarity index 100%
rename from svx/source/src/errtxt.src
rename to svtools/source/misc/errtxt.src
diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk
deleted file mode 100644
index 48d45a05e628..
--- a/svx/AllLangResTarget_ofa.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation

[Libreoffice-commits] core.git: Repository.mk scp2/source shell/Module_shell.mk

2016-12-24 Thread Matúš Kukan 
 Repository.mk  |3 ++-
 scp2/source/ooo/file_ooo.scp   |9 -
 scp2/source/ooo/module_ooo.scp |3 +--
 shell/Module_shell.mk  |   11 ++-
 4 files changed, 5 insertions(+), 21 deletions(-)

New commits:
commit b09035675465b156d773e60d6c6650fa12d17766
Author: Matúš Kukan 
Date:   Sat Dec 24 06:07:05 2016 +0100

tdf#90753: AutoInstall shell_senddoc package

Change-Id: I6cc638c460a8baa2cd9d29c3b82418b6ecfb630d
Reviewed-on: https://gerrit.libreoffice.org/32397
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index 884a309..939b91d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -796,7 +796,6 @@ $(eval $(call gb_Helper_register_packages, \
readlicense_oo_readmes \
setup_native_misc \
share \
-   shell_senddoc \
vcl_fontunxpsprint \
 ))
 
@@ -886,6 +885,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
package_dtd \
sd_web \
sfx2_emojiconfig \
+   $(call gb_Helper_optional,DESKTOP,\
+   $(if $(filter-out WNT,$(OS)),$(if 
$(ENABLE_MACOSX_SANDBOX),,shell_senddoc))) \
$(call gb_Helper_optional,DESKTOP,$(if $(filter-out MACOSX 
WNT,$(OS)),svx_gengal)) \
$(if $(USING_X11),vcl_fontunxppds) \
$(if $(filter $(OS),MACOSX),vcl_osxres) \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a3e5a67..6d962d0 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -27,15 +27,6 @@
 
 #include "macros.inc"
 
-#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
-File gid_File_Bin_Senddoc
-BIN_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "shell_senddoc.filelist";
-Styles = (FILELIST, PACKED);
-End
-#endif
-
 STD_RES_FILE( gid_File_Res_Eps, eps )
 
 #if defined WITH_HELP
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 210f4e5..7f1fa99 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -23,8 +23,7 @@ Module gid_Module_Root
 PackageInfo = "packinfo_office.txt";
 InstallOrder = "20";
 MOD_NAME_DESC(MODULE_ROOT_OSL);
-Files = (gid_File_Bin_Senddoc,
- gid_File_Txt_Pagein_Common,
+Files = (gid_File_Txt_Pagein_Common,
  gid_File_Txt_Pagein_Calc,
  gid_File_Txt_Pagein_Draw,
  gid_File_Txt_Pagein_Impress,
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 17661e9..53fda24 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -94,14 +94,6 @@ $(eval $(call gb_Module_add_targets,shell,\
Library_syssh \
 ))
 
-ifneq ($(OS),WNT)
-
-$(eval $(call gb_Module_add_targets,shell,\
-   StaticLibrary_xmlparser \
-))
-
-endif
-
 ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
Library_recentfile \
@@ -111,9 +103,10 @@ endif
 ifneq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,shell,\
+   StaticLibrary_xmlparser \
Executable_uri_encode \
Library_cmdmail \
-   Package_senddoc \
+   $(if $(ENABLE_MACOSX_SANDBOX),,Package_senddoc) \
 ))
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

2016-12-24 Thread Matúš Kukan 
 Repository.mk|7 ++-
 scp2/source/ooo/module_pdfimport.scp |8 
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 120a87a36e04b01c99c3544aca57faf66934d9c7
Author: Matúš Kukan 
Date:   Sat Dec 24 00:03:01 2016 +0100

tdf#90753: AutoInstall xpdfimport_err.pdf as filelist

Change-Id: Icfebcbf3cb738cb376a5ee97cd21a27a25c0bf35
Reviewed-on: https://gerrit.libreoffice.org/32396
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index 6423202..884a309 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -794,7 +794,6 @@ $(eval $(call gb_Helper_register_packages, \
postprocess_registry \
python_zipcore \
readlicense_oo_readmes \
-   sdext_pdfimport_pdf \
setup_native_misc \
share \
shell_senddoc \
@@ -937,6 +936,12 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ogltrans,\
slideshow_opengl_shader \
 ))
 
+ifneq ($(ENABLE_PDFIMPORT),)
+$(eval $(call gb_Helper_register_packages_for_install,pdfimport, \
+   sdext_pdfimport_pdf \
+))
+endif
+
 $(eval $(call gb_Helper_register_packages_for_install,reportbuilder,\
reportbuilder-templates \
 ))
diff --git a/scp2/source/ooo/module_pdfimport.scp 
b/scp2/source/ooo/module_pdfimport.scp
index 5159b19..548ea58 100644
--- a/scp2/source/ooo/module_pdfimport.scp
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -34,7 +34,6 @@ Module gid_Module_Pdfimport
 Styles = (HIDDEN_ROOT);
 Dirs = (gid_Dir_Share_Xpdfimport);
 Files = (auto_pdfimport_ALL,
-gid_File_Dat_XpdfimportErrPdf,
 gid_File_Xcd_Pdfimport);
 End
 
@@ -43,13 +42,6 @@ Directory gid_Dir_Share_Xpdfimport
 DosName = "xpdfimport";
 End
 
-File gid_File_Dat_XpdfimportErrPdf
-TXT_FILE_BODY;
-Dir = gid_Dir_Share_Xpdfimport;
-Name = "xpdfimport_err.pdf";
-Styles = (PACKED);
-End
-
 File gid_File_Xcd_Pdfimport
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Share_Registry;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

2016-12-23 Thread Matúš Kukan 
 Repository.mk   |5 -
 scp2/source/base/postgresqlsdbc.scp |8 
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 5662817149e3eed0a592c389042d9c3755629614
Author: Matúš Kukan 
Date:   Fri Dec 23 21:31:18 2016 +0100

tdf#90753: AutoInstall postgresql-sdbc.ini as filelist

Change-Id: I908b549a14c702ce2c33de704b06d016036ccecb
Reviewed-on: https://gerrit.libreoffice.org/32394
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index dcfa393..6423202 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -773,7 +773,6 @@ endif
 $(eval $(call gb_Helper_register_packages, \
test_unittest \
cli_basetypes_copy \
-   $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
$(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \
desktop_install \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
@@ -821,6 +820,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+   $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,sdk,\
odk_share_readme \
odk_share_readme_generated \
diff --git a/scp2/source/base/postgresqlsdbc.scp 
b/scp2/source/base/postgresqlsdbc.scp
index 23bbd44..94e6936 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -18,20 +18,12 @@ Module gid_Module_Optional_PostgresqlSdbc
 MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC);
 ParentID = gid_Module_Prg_Base_Bin;
 Files = (auto_postgresqlsdbc_ALL,
- gid_File_PostgresqlSdbc_Ini,
  gid_File_PostgresqlSdbc_Rdb,
  gid_File_PostgresqlSdbc_Xcd);
 Default = YES;
 Styles = ();
 End
 
-File gid_File_PostgresqlSdbc_Ini
-TXT_FILE_BODY;
-Dir = GID_BRAND_DIR_ETC;
-Name = "postgresql-sdbc.ini";
-Styles = (PACKED);
-End
-
 File gid_File_PostgresqlSdbc_Rdb
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Program_Services;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

2016-11-30 Thread Matúš Kukan 
 Repository.mk   |   18 +
 scp2/source/impress/file_impress.scp|9 
 scp2/source/impress/module_impress.scp  |1 
 scp2/source/impress/module_ogltrans.scp |9 
 scp2/source/ooo/file_extra_ooo.scp  |   21 --
 scp2/source/ooo/file_ooo.scp|   64 
 scp2/source/ooo/module_ooo.scp  |6 ---
 7 files changed, 19 insertions(+), 109 deletions(-)

New commits:
commit 4430ace32a8dfd534d5e1c64ec7855edad11e5c4
Author: Matúš Kukan 
Date:   Mon Nov 28 16:42:09 2016 +0100

tdf#90753: AutoInstall more packages

Change-Id: If8a52f652f7ab890826372b6d081ee19c69fb5ec
Reviewed-on: https://gerrit.libreoffice.org/31371
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 898a112..6ed227c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -766,6 +766,10 @@ $(eval $(call gb_Helper_register_jars,NONE,\
 ))
 endif
 
+$(eval $(call gb_Helper_register_packages_for_install,impress,\
+   sd_xml \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,ure,\
instsetoo_native_setup_ure \
ure_install \
@@ -803,6 +807,10 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
officecfg_misc \
+   $(if $(filter $(OS),MACOSX), \
+   extensions_mdibundle \
+   extensions_OOoSpotlightImporter \
+   ) \
extras_autocorr \
extras_autotextuser \
extras_cfgsrvnolang \
@@ -833,7 +841,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_tplwizreport \
extras_tplwizstyles \
framework_dtd \
+   $(if $(filter $(OS),MACOSX),infoplist) \
package_dtd \
+   sd_web \
+   sfx2_emojiconfig \
+   $(if $(USING_X11),vcl_fontunxppds) \
+   $(if $(filter $(OS),MACOSX),vcl_osxres) \
xmloff_dtd \
xmlscript_dtd \
xmlhelp_helpxsl \
@@ -844,15 +857,19 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo,\
$(if 
$(ENABLE_SCRIPTING_JAVASCRIPT),scripting_ScriptsJavaScript) \
) \
$(if $(DISABLE_SCRIPTING),,scripting_scriptbindinglib) \
+   $(if $(filter $(OS),MACOSX),sysui_osxicons) \
+   wizards_basicshare \
wizards_basicsrvaccess2base \
wizards_basicsrvdepot \
wizards_basicsrveuro \
wizards_basicsrvgimmicks \
wizards_basicsrvimport \
wizards_basicsrvform \
+   wizards_basicsrvstandard \
wizards_basicsrvtemplate \
wizards_basicsrvtools \
wizards_basicsrvtutorials \
+   wizards_basicusr \
xmlsec \
chart2_opengl_shader \
vcl_opengl_shader \
@@ -873,6 +890,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 ))
 
 $(eval $(call gb_Helper_register_packages_for_install,ogltrans,\
+   sd_opengl \
slideshow_opengl_shader \
 ))
 
diff --git a/scp2/source/impress/file_impress.scp 
b/scp2/source/impress/file_impress.scp
index 81ad53c..f689c62 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -32,12 +32,3 @@ File gid_File_Help_Simpress_Zip
 EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
 End
 #endif
-
-// configuration files for custom animation effects
-
-File gid_File_sd_xml
-TXT_FILE_BODY;
-Styles = (FILELIST, PACKED);
-Dir = FILELIST_DIR;
-Name = "sd_xml.filelist";
-End
diff --git a/scp2/source/impress/module_impress.scp 
b/scp2/source/impress/module_impress.scp
index 9d32917..ca335d6 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -38,7 +38,6 @@ Module gid_Module_Prg_Impress_Bin
 Files = (auto_impress_ALL,
 
gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,
 gid_File_Share_Registry_Impress_Xcd,
-gid_File_sd_xml,
 gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
diff --git a/scp2/source/impress/module_ogltrans.scp 
b/scp2/source/impress/module_ogltrans.scp
index 14f586f..a549c34 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -23,18 +23,11 @@
 Module gid_Module_Optional_OGLTrans
 PackageInfo = "packinfo_office.txt";
 ParentID = gid_Module_Optional;
-Files = ( auto_ogltrans_ALL, 
gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, 
gid_File_Share_Registry_Ogltrans_Xcd );
+Files = ( auto_ogltrans_ALL, gid_File_Share_Registry_Ogltrans_Xcd );
 Default = YES;
 Styles = (HIDDEN_ROOT);
 End
 
-File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
-TXT_FILE_BODY;
-Styles = (FILELIST,PACKED);
-Dir = FILELIST_DIR;
-Name = "sd_opengl.filelist";
-End
-
 File gid_File_Share_Registry_Ogltrans_Xc

[Libreoffice-commits] core.git: Repository.mk scp2/source

2016-11-26 Thread Matúš Kukan 
 Repository.mk  |   27 +
 scp2/source/ooo/file_extra_ooo.scp |  182 -
 scp2/source/ooo/file_ooo.scp   |   11 --
 scp2/source/ooo/module_ooo.scp |   23 
 4 files changed, 27 insertions(+), 216 deletions(-)

New commits:
commit 42b959ff7241f955bfa68ee484d81c2d90be5434
Author: Matúš Kukan 
Date:   Fri Nov 25 22:42:42 2016 +0100

tdf#90753: Move extras packages to AutoInstall

Change-Id: I3e1504bb8a68a6142ab4035b2cb81c03d9af9227

diff --git a/Repository.mk b/Repository.mk
index 60c9fa0..2015556 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -780,8 +780,35 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
officecfg_misc \
+   extras_autocorr \
+   extras_autotextuser \
+   extras_cfgsrvnolang \
+   extras_cfgusr \
+   extras_database \
+   extras_databasebiblio \
+   extras_gallbullets \
+   extras_gallhtmlexpo \
+   extras_gallmytheme \
+   extras_gallroot \
+   extras_gallsystem \
+   extras_gallwwwback \
+   extras_gallwwwgraf \
extras_glade \
extras_labels \
+   $(if $(filter WNT,$(OS)),extras_newfiles) \
+   extras_palettes \
+   extras_tplofficorr \
+   extras_tploffimisc \
+   extras_tplpresnt \
+   extras_tpl_styles \
+   extras_tplpersonal \
+   extras_tplwizbitmap \
+   extras_tplwizdesktop \
+   extras_tplwizletter \
+   extras_tplwizfax \
+   extras_tplwizagenda \
+   extras_tplwizreport \
+   extras_tplwizstyles \
framework_dtd \
package_dtd \
xmloff_dtd \
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 59a408c..b1a66a9 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -18,13 +18,6 @@
 
 #include "macros.inc"
 
-File gid_File_Extra_Autocorr
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_autocorr.filelist";
-End
-
 File gid_File_Extra_Autotextshare_Lang
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
@@ -32,27 +25,6 @@ File gid_File_Extra_Autotextshare_Lang
 EXTRA_ALL_LANG(autotextshare,filelist);
 End
 
-File gid_File_Extra_Autotextuser
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION, DOCLANG);
-Name = "extras_autotextuser.filelist";
-End
-
-File gid_File_Extra_Cfgusr
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_cfgusr.filelist";
-End
-
-File gid_File_Extra_Cfgsrv
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_cfgsrvnolang.filelist";
-End
-
 File gid_File_sd_web
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
@@ -60,20 +32,6 @@ File gid_File_sd_web
 Name = "sd_web.filelist";
 End
 
-File gid_File_Extra_Database
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_database.filelist";
-End
-
-File gid_File_Extra_Databasebiblio
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_databasebiblio.filelist";
-End
-
 File gid_File_Extra_Emojiconfig
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
@@ -99,27 +57,6 @@ End
 
 #endif
 
-File gid_File_Extra_Gallbullets
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallbullets.filelist";
-End
-
-File gid_File_Extra_Gallhtmlexpo
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallhtmlexpo.filelist";
-End
-
-File gid_File_Extra_Gallroot
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallroot.filelist";
-End
-
 #if defined (WITH_GALLERY_BUILD)
 
 GALLERY_FILELIST(arrows)
@@ -136,125 +73,6 @@ GALLERY_FILELIST(txtshapes)
 
 #endif
 
-File gid_File_Extra_Gallmytheme
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_gallmytheme.filelist";
-End
-
-File gid_File_Extra_Gallsystem
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallsystem.filelist";
-End
-
-File gid_File_Extra_Gallwwwback
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallwwwback.filelist";
-End
-
-File gid_File_Extra_Gallwwwgraf
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallwwwgraf.filelist";
-End
-
-File gid_File_Extra_Palettes
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_palettes.filelist";
-End
-
-File gid_File_Extra_Tplofficorr
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_tplofficorr.filelist";
-End
-
-File gid_File_Extra_Tploffimi

[Libreoffice-commits] core.git: Repository.mk scp2/source shell/Module_shell.mk

2014-11-06 Thread Stephan Bergmann 
 Repository.mk|2 +-
 scp2/source/ooo/file_ooo.scp |2 +-
 shell/Module_shell.mk|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f3f63f555df87449b2d2a33718589b3afb3d9ddf
Author: Stephan Bergmann 
Date:   Thu Nov 6 14:11:35 2014 +0100

fdo#82038: senddoc, uri-encode got lost on Mac

Change-Id: I2f104c64601b22ce3ef078295c7da3cb21a133f9

diff --git a/Repository.mk b/Repository.mk
index 970435f..0e7b9b9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -144,7 +144,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,ooo, \
gengal \
$(if $(filter 
unx-TRUE,$(GUIBASE)-$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \
$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
-   $(if $(filter unx,$(GUIBASE)),uri-encode) \
+   $(if $(filter WNT,$(OS)),,uri-encode) \
ui-previewer \
$(if $(filter WNT,$(OS)), \
senddoc \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 86128d0..5f31ae4 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -158,7 +158,7 @@ End
 
 #endif
 
-#if defined UNX && ! defined MACOSX
+#if defined UNX
 File gid_File_Bin_Senddoc
 BIN_FILE_BODY;
 Dir = FILELIST_DIR;
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 4a291de..98f6c87 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -115,7 +115,6 @@ ifneq ($(filter-out MACOSX WNT,$(OS)),)
 
 $(eval $(call gb_Module_add_targets,shell,\
Executable_gnome_open_url \
-   Executable_uri_encode \
Library_recentfile \
Package_scripts \
Package_scripts_gnome \
@@ -127,6 +126,7 @@ endif
 ifneq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,shell,\
+   Executable_uri_encode \
Library_cmdmail \
Package_senddoc \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

2014-03-07 Thread Tor Lillqvist 
 Repository.mk|2 +-
 scp2/source/ooo/file_ooo.scp |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit af42ac01a4931714d5e362cee253e34b9b3689b1
Author: Tor Lillqvist 
Date:   Fri Mar 7 10:52:50 2014 +0200

Fix OS X build

Change-Id: I9437bee64b318754ee5dc595f35be865a21d6a11

diff --git a/Repository.mk b/Repository.mk
index 5072b70..204a16b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -223,7 +223,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
chartcore \
chartcontroller \
$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),chartopengl) \
-   $(if $(filter $(OS),WNT),,cmdmail) \
+   $(if $(filter $(OS),MACOSX WNT),,cmdmail) \
cppcanvas \
configmgr \
ctl \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 881a5ef..27719e4 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -200,7 +200,7 @@ End
 
 #endif
 
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Bin_Uri_Encode
 BIN_FILE_BODY;
@@ -211,14 +211,14 @@ End
 
 #endif
 
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
 File gid_File_Bin_Senddoc
 BIN_FILE_BODY;
 Dir = FILELIST_DIR;
 Name = "shell_senddoc.filelist";
 Styles = (FILELIST, PACKED);
 End
-#else
+#elif defined WNT
 File gid_File_Bin_Senddoc
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

2014-02-10 Thread Marcos Paulo de Souza 
 Repository.mk |   22 ---
 scp2/source/ooo/file_library_ooo.scp  |   38 --
 scp2/source/ooo/module_hidden_ooo.scp |2 -
 scp2/source/ooo/ure.scp   |   29 -
 4 files changed, 14 insertions(+), 77 deletions(-)

New commits:
commit 4af38b099c741c3676aefeb20c515913aaeed666
Author: Marcos Paulo de Souza 
Date:   Thu Feb 6 13:53:17 2014 -0200

fdo#60924: Move some packages to autoinstall

Change-Id: I5805c8d1c9978b8625ba0e0ea6c4337baf5a6cb5
Reviewed-on: https://gerrit.libreoffice.org/7903
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 1b0396a..b702ae3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -451,9 +451,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, 
\
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \
-   $(if $(ENABLE_JAVA),java_uno) \
-   $(if $(ENABLE_JAVA),juh) \
-   $(if $(ENABLE_JAVA),juhx) \
+   $(if $(filter MSC,$(COM)),cli_uno) \
+   $(if $(ENABLE_JAVA), \
+   java_uno \
+   jpipe \
+   $(if $(filter $(OS),WNT),jpipx) \
+   juh \
+   juhx \
+   ) \
log_uno_uno \
unsafe_uno_uno \
$(if $(URELIBS),urelibs) \
@@ -491,11 +496,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(if $(filter MSC,$(COM)),cli_cppuhelper) \
 ))
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
-   $(if $(filter MSC,$(COM)),cli_uno) \
-   jpipe \
-   $(if $(filter WNT,$(OS)),jpipx) \
-))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_VLC),avmediavlc) \
@@ -706,6 +706,12 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   $(if $(SYSTEM_CURL),,curl) \
+   $(if $(SYSTEM_LCMS2),,lcms2) \
+   $(if $(SYSTEM_LIBXSLT),,xslt) \
+))
+
 # External executables
 $(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index c90e28a..c1a9304 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -82,17 +82,6 @@ End
 
 #endif
 
-#ifndef SYSTEM_CURL
-
-File gid_File_Lib_Curl
-LIB_FILE_BODY;
-Styles = (FILELIST);
-Dir = FILELIST_DIR;
-Name = "curl.filelist";
-End
-
-#endif
-
 #if defined UNX && ! defined MACOSX
 #ifdef ENABLE_TDE
 File gid_File_Bin_TdeFilePicker
@@ -132,26 +121,8 @@ End
 #endif
 #endif
 
-#ifndef SYSTEM_LCMS2
-
-File gid_File_Lib_Lcms2
-LIB_FILE_BODY;
-Styles = (FILELIST);
-Dir = FILELIST_DIR;
-Name = "lcms2.filelist";
-End
-
-#endif
-
 #ifdef NEED_CAIRO
 
-File gid_File_Lib_Cairo
-LIB_FILE_BODY;
-Styles = (FILELIST);
-Dir = FILELIST_DIR;
-Name = "cairo.filelist";
-End
-
 #ifndef WNT
 
 File gid_File_Lib_Pixman
@@ -270,15 +241,6 @@ End
 
 #endif
 
-#ifndef SYSTEM_LIBXSLT
-File gid_File_Lib_Xslt
-LIB_FILE_BODY;
-Styles = (FILELIST);
-Dir = FILELIST_DIR;
-Name = "xslt.filelist";
-End
-#endif
-
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
 PACKED_LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 0881652..6f29752 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -160,7 +160,6 @@ Module gid_Module_Root_Files_5
 #if ! defined SYSTEM_CLUCENE
 gid_File_Lib_CLucene,
 #endif
-   gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
@@ -190,7 +189,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Sndfile,
gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon,
-   gid_File_Lib_Xslt,
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
gid_File_Lib_LibXMLSec_xmlsecnss,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 7069ee6..d690ed7 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -267,14 +267,6 @@ End
 
 
 #if defined _MSC_VER
-File gid_File_Dl_Cli_Uno
-LIB_FILE_BODY;
-Dir = SCP2_URE_DL_DIR;
-Name = SCP2_URE_DL_NORMAL("cli_uno");
-Styles = (PACKED);
-
-End
-
 File gid_File_Dl_Cli_Ure_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY);
@@ -413,24 +405,6 @@ End
 
 #endif
 
-#if defined ENABLE_JAVA
-File gid_File_Dl_Jpipe
-LIB_FILE_BODY;
-Dir = SCP2_URE_DL_DIR;
-Name = SCP2_URE_JDL_NORMAL("jpipe");
-Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA && defined WNT
-File gid_File_Dl_Jpipx
-LIB_FILE_BODY;
-Dir = SCP2_URE_DL_DIR;
-Name = SCP2_UR

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-11-24 Thread Marcos Paulo de Souza 
 Repository.mk |   20 +--
 scp2/source/ooo/file_library_ooo.scp  |   44 --
 scp2/source/ooo/module_hidden_ooo.scp |8 --
 3 files changed, 13 insertions(+), 59 deletions(-)

New commits:
commit 24426c98a8c5ac410872df5a2b8e509f080365f8
Author: Marcos Paulo de Souza 
Date:   Fri Nov 22 17:20:57 2013 -0200

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

Change-Id: I0de4b88eb076e53792aa6d16092dcbcbb548246c
Reviewed-on: https://gerrit.libreoffice.org/6763
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/Repository.mk b/Repository.mk
index a4aeca0..a35da37 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -307,6 +307,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
odbcbase \
odfflatxml \
offacc \
+   oox \
passwordcontainer \
pcr \
$(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \
@@ -325,6 +326,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
simplecanvas \
slideshow \
sot \
+   $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+   $(if $(ENABLE_HEADLESS),,spa) \
+   ) \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
$(if $(DISABLE_SCRIPTING),,stringresource) \
@@ -354,7 +358,13 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
vcl \
vclcanvas \
-   $(if $(and $(filter unx,$(GUIBASE)),$(filter-out 
MACOSX,$(OS))),vclplug_gen) \
+   $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+   vclplug_gen \
+   $(if $(ENABLE_TDE),vclplug_tde) \
+   $(if $(ENABLE_KDE),vclplug_kde) \
+   $(if $(ENABLE_KDE4),vclplug_kde4) \
+   $(if $(ENABLE_HEADLESS),,vclplug_svp) \
+   ) \
xmlscript \
xmlfa \
xmlfd \
@@ -406,7 +416,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basebmp \
) \
communi \
-   oox \
ooxml \
sdbc \
avmediaQuickTime \
@@ -415,12 +424,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
rptui \
rptxml \
simplecm \
-   spa \
sts \
-   vclplug_tde \
-   vclplug_kde \
-   vclplug_kde4 \
-   vclplug_svp \
 ))
 
 ifneq (,$(filter ANDROID IOS,$(OS)))
@@ -522,6 +526,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
) \
$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
package2 \
+   $(if $(and $(filter unx,$(GUIBASE)),$(filter-out 
MACOSX,$(OS))),recentfile) \
$(if $(DISABLE_SCRIPTING),,scriptframe) \
sdbc2 \
sofficeapp \
@@ -561,7 +566,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
pyuno \
pyuno_wrapper \
-   recentfile \
ucpdav1 \
xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 557e152..40b4e75 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -232,27 +232,6 @@ End
 
 #endif
 
-#if defined(UNX) && ! defined(MACOSX)
-#ifdef ENABLE_TDE
-File gid_File_Lib_Vclplug_Tde
-Name = LIBNAME(vclplug_tde);
-PACKED_LIB_FILE_BODY;
-End
-#endif
-#ifdef ENABLE_KDE
-File gid_File_Lib_Vclplug_Kde
-Name = LIBNAME(vclplug_kde);
-PACKED_LIB_FILE_BODY;
-End
-#endif
-#ifdef ENABLE_KDE4
-File gid_File_Lib_Vclplug_Kde4
-Name = LIBNAME(vclplug_kde4);
-PACKED_LIB_FILE_BODY;
-End
-#endif
-#endif
-
 #if defined(MACOSX)
 File gid_File_Lib_Basebmp
 Name = LIBNAME(basebmp);
@@ -261,32 +240,9 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-#if ! defined LIBO_HEADLESS
-STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
-#endif
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif
 
-#if defined UNX && ! defined MACOSX
-
-File gid_File_Lib_Recentfile
-PACKED_LIB_FILE_BODY;
-Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
-End
-
-#endif
-
-STD_LIB_FILE( gid_File_Lib_Oox , oox)
-
-#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
-
-File gid_File_Lib_Spa
-Name = LIBNAME(spa);
-PACKED_LIB_FILE_BODY;
-End
-
-#endif
-
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
 PACKED_LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index df6de8e..0881652 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -142,15 +142,9 @@ Module gid_Module_Root_Files_4
auto_ooobinarytable_ALL,
gid_File_Lib_Bib,
gid_File_Lib_J,
-   gid_File_Lib_Oox,
-   gid_File_Lib_Spa,
gid_File_Li

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-08-26 Thread Marcos Paulo de Souza 
 Repository.mk |   36 +---
 scp2/source/ooo/file_library_ooo.scp  |   75 --
 scp2/source/ooo/module_hidden_ooo.scp |   12 -
 3 files changed, 21 insertions(+), 102 deletions(-)

New commits:
commit 32848f0a8d9e30f77bc482f9295b2561b94cf7ca
Author: Marcos Paulo de Souza 
Date:   Sun Aug 25 20:20:29 2013 -0300

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

Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d
Reviewed-on: https://gerrit.libreoffice.org/5631
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 3ccadb1..25abdbd 100644
--- a/Repository.mk
+++ b/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 \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 5638439..a86e8d7 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/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

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-08-22 Thread Marcos Paulo de Souza 
 Repository.mk |   28 
 scp2/source/ooo/file_library_ooo.scp  |  110 --
 scp2/source/ooo/module_hidden_ooo.scp |   11 ---
 3 files changed, 15 insertions(+), 134 deletions(-)

New commits:
commit 3f8c36caef76ee1f688d35d39ac5bffe5d0f8319
Author: Marcos Paulo de Souza 
Date:   Wed Aug 21 11:55:18 2013 -0300

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

Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66
Reviewed-on: https://gerrit.libreoffice.org/5571
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/Repository.mk b/Repository.mk
index 1433f1b..43ee143 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -359,7 +359,21 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
xsltfilter \
$(if $(filter $(OS),WNT), \
ado \
-   $(if $(DISABLE_ATL),,oleautobridge) \
+   dnd \
+   dtrans \
+   fps \
+   ftransl \
+   $(if $(ENABLE_JAVA),java_uno_accessbridge) \
+   $(if $(DISABLE_ATL),,oleautobridge \
+   inprocserv \
+   ) \
+   $(if $(WINDOWS_SDK_HOME),instooofiltmsi \
+   qslnkmsi \
+   reg4allmsdoc \
+   sdqsmsi \
+   sellangmsi \
+   sn_tools \
+   ) \
smplmail \
wininetbe1 \
) \
@@ -530,7 +544,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
bluez_bluetooth \
emboleobj \
-   java_uno_accessbridge \
libreoffice \
macab1 \
macabdrv1 \
@@ -551,28 +564,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, 
\
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   dnd \
-   dtrans \
fop \
-   fps \
-   ftransl \
-   inprocserv \
-   instooofiltmsi \
jfregca \
ooofilt \
ooofilt_x64 \
propertyhdl \
propertyhdl_x64 \
-   qslnkmsi \
-   reg4allmsdoc \
regactivex \
regpatchactivex \
-   sdqsmsi \
-   sellangmsi \
shlxthdl \
shlxthdl_x64 \
shlxtmsi \
-   sn_tools \
so_activex \
so_activex_x64 \
sysdtrans \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 2e370c5..5638439 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,13 +26,6 @@
  /
 #include "macros.inc"
 
-#if defined ENABLE_JAVA && defined WNT
-File gid_File_Lib_Accessbridge
-PACKED_LIB_FILE_BODY;
-Name = "java_uno_accessbridge.dll";
-End
-#endif
-
 #ifndef SYSTEM_CLUCENE
 File gid_File_Lib_CLucene
 PACKED_LIB_FILE_BODY;
@@ -117,38 +110,11 @@ End
 
 #endif
 
-#ifdef WNT
-
-File gid_File_Lib_Dnd
-PACKED_LIB_FILE_BODY;
-Name = "dnd.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Dtrans
-PACKED_LIB_FILE_BODY;
-Name = "dtrans.dll";
-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
 
-#if defined(WNT) && !defined(DISABLE_ATL)
-
-File gid_File_Lib_Inprocserv
-PACKED_LIB_FILE_BODY;
-Name = "inprocserv.dll";
-End
-
-#endif
-
 #ifdef UNX
 
 #ifdef MACOSX
@@ -165,15 +131,6 @@ End
 
 #endif  // #ifdef UNX
 
-#ifdef WNT
-
-File gid_File_Lib_Fps
-PACKED_LIB_FILE_BODY;
-Name = "fps.dll";
-End
-
-#endif
-
 #if defined UNX && ! defined MACOSX
 #ifdef ENABLE_TDE
 File gid_File_Bin_TdeFilePicker
@@ -260,15 +217,6 @@ End
 
 #endif
 
-#ifdef WNT
-
-File gid_File_Lib_Ftransl
-PACKED_LIB_FILE_BODY;
-Name = "ftransl.dll";
-End
-
-#endif
-
 #ifndef SYSTEM_ICU
 
 File gid_File_Lib_Icudata
@@ -312,17 +260,6 @@ End
 
 #endif
 
-#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
-
-File gid_File_Lib_sn_tools
-LIB_FILE_BODY;
-Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
-Dir = SCP2_OOO_LIB_DIR;
-Name = "sn_tools.dll";
-End
-
-#endif
-
 #if defined(WNT)
 
 #if defined WITH_MOZAB4WIN
@@ -411,44 +348,8 @@ End
 
 #endif
 
-#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
-
-File gid_File_Lib_Reg4allmsdoc
-LIB_FILE_BODY;
-Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-Dir = SCP2_OOO_BIN_DIR;
-Name = "reg4allmsdoc.dll";
-End
-
-File gid_File_Lib_Qslnkmsi
-LIB_FILE_BODY;
-Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
-Dir = SCP2_OOO_BIN_DIR;
-Name = "qslnkmsi.dll";
-End
-
-File gid_File_Lib_Sdqsmsi
-LIB_FILE_BODY;
-Styles = (PACKED, BINARYT

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-07-23 Thread Marcos Paulo de Souza 
 Repository.mk |   30 ---
 scp2/source/ooo/file_library_ooo.scp  |  133 --
 scp2/source/ooo/module_hidden_ooo.scp |   12 ---
 3 files changed, 16 insertions(+), 159 deletions(-)

New commits:
commit b0c43257d9db19ac45a93d8fb1e7648e82517289
Author: Marcos Paulo de Souza 
Date:   Mon Jul 22 20:45:05 2013 -0300

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

Change-Id: I89a661908fe7d679aa68d5ba9ead41d6b0a0d6bf
Reviewed-on: https://gerrit.libreoffice.org/5039
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/Repository.mk b/Repository.mk
index 95ad515..cf98c411 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -358,9 +358,24 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
xsltfilter \
$(if $(filter $(OS),WNT), \
ado \
-   $(if $(DISABLE_ATL),,oleautobridge) \
+dnd \
+dtrans \
+fps \
+ftransl \
+$(if $(SOLAR_JAVA),java_uno_accessbridge) \
+$(if $(DISABLE_ATL),,oleautobridge \
+ inprocserv \
+) \
+$(if $(HAVE_WINDOWS_SDK),instooofiltmsi \
+ qslnkmsi \
+ reg4allmsdoc \
+ sdqsmsi \
+ sellangmsi \
+ sn_tools \
+) \
smplmail \
wininetbe1 \
+xmlsec1 \
) \
$(if $(filter $(OS),MACOSX), \
AppleRemote \
@@ -528,7 +543,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
bluez_bluetooth \
emboleobj \
-   java_uno_accessbridge \
libreoffice \
macab1 \
macabdrv1 \
@@ -549,28 +563,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, 
\
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   dnd \
-   dtrans \
fop \
-   fps \
-   ftransl \
-   inprocserv \
-   instooofiltmsi \
jfregca \
ooofilt \
ooofilt_x64 \
propertyhdl \
propertyhdl_x64 \
-   qslnkmsi \
-   reg4allmsdoc \
regactivex \
regpatchactivex \
-   sdqsmsi \
-   sellangmsi \
shlxthdl \
shlxthdl_x64 \
shlxtmsi \
-   sn_tools \
so_activex \
so_activex_x64 \
sysdtrans \
@@ -613,7 +616,6 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   xmlsec1 \
xmlsec1-nss \
 ))
 ifneq ($(CROSS_COMPILING),YES)
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index a710c7e..b92eaab 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,15 +26,6 @@
  /
 #include "macros.inc"
 
-#if defined SOLAR_JAVA && defined WNT
-File gid_File_Lib_Accessbridge
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = "java_uno_accessbridge.dll";
-End
-#endif
-
 #ifndef SYSTEM_CLUCENE
 File gid_File_Lib_CLucene
 LIB_FILE_BODY;
@@ -121,44 +112,11 @@ End
 
 #endif
 
-#ifdef WNT
-
-File gid_File_Lib_Dnd
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = "dnd.dll";
-End
-
-#endif
-
-#ifdef WNT
-
-File gid_File_Lib_Dtrans
-LIB_FILE_BODY;
-Name = "dtrans.dll";
-Dir = SCP2_OOO_BIN_DIR;
-Styles = (PACKED);
-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
 
-#if defined(WNT) && !defined(DISABLE_ATL)
-
-File gid_File_Lib_Inprocserv
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = "inprocserv.dll";
-End
-
-#endif
-
 #ifdef UNX
 
 #ifdef MACOSX
@@ -179,17 +137,6 @@ End
 
 #endif  // #ifdef UNX
 
-#ifdef WNT
-
-File gid_File_Lib_Fps
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = "fps.dll";
-End
-
-#endif
-
 #if defined UNX && ! defined MACOSX
 #ifdef ENABLE_TDE
 File gid_File_Bin_TdeFilePicker
@@ -284,17 +231,6 @@ End
 
 #endif
 
-#ifdef WNT
-
-File gid_File_Lib_Ftransl
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-Name = "ftransl.dll";
-End
-
-#endif
-
 #ifndef SYSTEM_ICU
 
 File gid_File_Lib_Icudata
@@ -344,17 +280,6 @@ End
 
 #endif
 
-#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
-
-File gid_File_Lib_sn_tools
-LIB_FILE_BODY;
-Styles = (PACKED, BINARYTABLE, BI

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-05-06 Thread Marcos Paulo de Souza 
 Repository.mk |   18 
 scp2/source/ooo/file_library_ooo.scp  |   37 --
 scp2/source/ooo/module_hidden_ooo.scp |   11 --
 3 files changed, 10 insertions(+), 56 deletions(-)

New commits:
commit d5d7d18d5cbfdc4b96cc705fa9a80525a9f60920
Author: Marcos Paulo de Souza 
Date:   Fri May 3 10:09:15 2013 -0300

fdo#60924: Move some more libs to autoinstallation

Change-Id: I7383da4390995ad9ea2d4fb494098dab6287609f
Reviewed-on: https://gerrit.libreoffice.org/3758
Reviewed-by: Matúš Kukan 
Tested-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index 13d7e70..e04e7ec 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -272,6 +272,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 fwk \
 fwl \
fwm \
+guesslang \
 $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
 i18npool \
 hyphen \
@@ -287,6 +288,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 ira \
 itg \
 iti \
+$(if $(SOLAR_JAVA),jdbc) \
+$(if $(ENABLE_KAB),kab1) \
+$(if $(ENABLE_KAB),kabdrv1) \
 localebe1 \
 lng \
 lnth \
@@ -299,6 +303,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 offacc \
 pcr \
 pdffilter \
+res \
 sax \
 sb \
 sdbt \
@@ -316,6 +321,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 svx \
 svxcore \
 sw \
+$(if $(ENABLE_TDEAB),tdeab1) \
+$(if $(ENABLE_TDEAB),tdeabdrv1) \
+textconversiondlgs \
 tk \
 tl \
$(if $(ENABLE_TELEPATHY),tubes) \
@@ -325,6 +333,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 utl \
 uui \
 vcl \
+$(if $(and $(filter unx,$(GUIBASE)),$(filter-out 
MACOSX,$(OS))),vclplug_gen) \
 xmlscript \
 xmlfa \
 xmlfd \
@@ -371,10 +380,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
filtertracer \
flash \
 graphicfilter \
-guesslang \
-   jdbc \
-   kab1 \
-   kabdrv1 \
 log \
MacOSXSpell \
 mork \
@@ -384,7 +389,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 pricing \
 protocolhandler \
 qstart_gtk \
-res \
 rpt \
 rptui \
 rptxml \
@@ -400,13 +404,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 spell \
 sts \
 svgfilter \
-   tdeab1 \
-   tdeabdrv1 \
-textconversiondlgs \
 textfd \
 updatecheckui \
 $(if $(DISABLE_SCRIPTING),,vbahelper) \
-vclplug_gen \
 vclplug_gtk \
 vclplug_gtk3 \
 vclplug_tde \
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index b9155e2..2c51db4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -310,16 +310,6 @@ End
 
 #ifdef UNX
 
-#ifdef ENABLE_KAB
-STD_LIB_FILE(gid_File_Lib_Kab_1, kab1)
-STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1)
-#endif
-
-#ifdef ENABLE_TDEAB
-STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1)
-STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1)
-#endif
-
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
 LIB_FILE_BODY;
@@ -540,13 +530,6 @@ End
 
 #endif
 
-
-#ifdef SOLAR_JAVA
-
-STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
-
-#endif
-
 #ifdef SOLAR_JAVA
 File gid_File_Lib_Hsqldb_2
 LIB_FILE_BODY;
@@ -674,15 +657,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
-#if defined(UNX) && ! defined(MACOSX) && ! defined(LIBO_HEADLESS)
-File gid_File_Lib_Vclplug_Gen
-Name = LIBNAME(vclplug_gen);
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-
 #if defined(UNX) && ! defined(MACOSX)
 #ifdef ENABLE_GTK
 File gid_File_Lib_Vclplug_Gtk
@@ -794,13 +768,6 @@ End
 
 #endif /* WNT && HAVE_WINDOWS_SDK */
 
-File gid_File_Lib_Res
-Name = LIBNAME(res);
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-End
-
 STD_LIB_FILE( gid_File_Lib_Expwrap_Uno, expwrap )
 
 STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax )
@@ -859,8 +826,6 @@ STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 
 SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
-STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
 LIB_FILE_BODY;
@@ -1071,8 +1036,6 @@ STD_LIB_FILE( gid_File_Lib_Migrationoo2, migrationoo2 )
 
 STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 )
 
-STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
-
 STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed )
 
 #ifndef SYSTEM_OPENSSL
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index dc538fa..cd0c44f 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -156,22 +156,18 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Oox,
gid_File

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-05-03 Thread Marcos Paulo de Souza 
 Repository.mk |   42 -
 scp2/source/ooo/file_library_ooo.scp  |   43 --
 scp2/source/ooo/module_hidden_ooo.scp |   21 
 3 files changed, 21 insertions(+), 85 deletions(-)

New commits:
commit 6e8b24cc45c1f59a8c0ce6529a211331ee4f2a3e
Author: Marcos Paulo de Souza 
Date:   Mon Apr 29 14:47:05 2013 -0300

fdo#60924: Move more libs to autoinstallation

Change-Id: I5c136760ca59278ba6bfcd1d11c56d810e9cfa76

diff --git a/Repository.mk b/Repository.mk
index b221f6d..d771646 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -220,6 +220,7 @@ endif
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
avmedia \
$(if $(DISABLE_SCRIPTING),,basctl) \
+basegfx \
 bib \
 canvastools \
 chartcore \
@@ -248,7 +249,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 ept \
 era \
 eti \
+evtatt \
 exp \
+flat \
file \
filterconfig \
 for \
@@ -262,6 +265,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwm \
 $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
 i18npool \
+hyphen \
 icd \
 icg \
 idx \
@@ -276,13 +280,24 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 iti \
 localebe1 \
 lng \
+lnth \
 $(if $(MERGELIBS),merged) \
 msfilter \
+mysql \
+odbc \
 odbcbase \
+odfflatxml \
+offacc \
+pcr \
+pdffilter \
 sax \
 sb \
 sdbt \
+scn \
+sd \
+sdd \
 sdfilt \
+sdui \
 sfx \
 sot \
 $(if $(ENABLE_HEADLESS),,spl) \
@@ -291,6 +306,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 svt \
 svx \
 svxcore \
+sw \
 tk \
 tl \
$(if $(ENABLE_TELEPATHY),tubes) \
@@ -301,7 +317,12 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 uui \
 vcl \
 xmlscript \
+xmlfa \
+xmlfd \
 xo \
+xof \
+xsltdlg \
+xsltfilter \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
@@ -329,38 +350,27 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 ) \
 communi \
 date \
-evtatt \
-odbc \
 oox \
ooxml \
 sdbc \
 AppleRemote \
 avmediaQuickTime \
-basegfx \
 calc \
 dbp \
 dbu \
 evoab \
filtertracer \
flash \
-   flat \
 graphicfilter \
 guesslang \
-hyphen \
jdbc \
kab1 \
kabdrv1 \
-lnth \
 log \
MacOSXSpell \
 mork \
 mozab2 \
 mozabdrv \
-   mysql \
-odfflatxml \
-offacc \
-pcr \
-pdffilter \
 placeware \
 pricing \
 protocolhandler \
@@ -372,11 +382,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 sc \
 scd \
 scfilt \
-scn \
 scui \
-sd \
-sdd \
-sdui \
 simplecm \
 sm \
 smd \
@@ -385,7 +391,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 spell \
 sts \
 svgfilter \
-sw \
tdeab1 \
tdeabdrv1 \
 textconversiondlgs \
@@ -400,11 +405,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 vclplug_kde4 \
 vclplug_svp \
 wpftdraw \
-xmlfa \
-xmlfd \
-xof \
-xsltdlg \
-xsltfilter \
 ))
 
 ifneq (,$(filter ANDROID IOS,$(OS)))
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index ab3105e..b9155e2 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -344,10 +344,6 @@ STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
 
 #endif  // #ifdef UNX
 
-STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt)
-
-STD_LIB_FILE( gid_File_Lib_Flat, flat)
-
 #ifdef WNT
 
 File gid_File_Lib_Fps
@@ -645,13 +641,8 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
-STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
-STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
-
 // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
 
-STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
-
 #ifdef SOLAR_JAVA
 #ifndef MACOSX
 
@@ -675,12 +666,8 @@ STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
 
 STD_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer )
 
-STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
-
 STD_LIB_FILE( gid_File_Lib_Log, log)
 
-STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
-
 SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
 
 #if defined ENABLE_NPAPI_FROM_BROWSER
@@ -820,11 +807,6 @@ STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax )
 
 STD_LIB_FILE( gid_File_Lib_Oox , oox)
 
-STD_LIB_FILE( gid_File_Lib_Scn, scn)
-
-STD_LIB_FILE( gid_File_Lib_Sd , sd)
-STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
-
 STD_LIB_FILE( gid_File_Lib_Slideshow, slideshow )
 
 File gid_File_Lib_Sdbc_2
@@ -838,8 +820,6 @@ File gid_File_Lib_Sdbc_2
   #endif
 End
 
-STD_LIB_FILE( gid_F

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-04-27 Thread Marcos Paulo de Souza 
 Repository.mk |   48 +-
 scp2/source/ooo/file_ooo.scp  |   48 --
 scp2/source/ooo/module_hidden_ooo.scp |   23 
 3 files changed, 24 insertions(+), 95 deletions(-)

New commits:
commit 3202b637c7f9fcbf05b30cb2a231be573e346be6
Author: Marcos Paulo de Souza 
Date:   Sat Apr 27 09:26:14 2013 -0300

fdo#60924: Move some libs to autoinstallation

Change-Id: I58421587784260bd88994926bca031ab26a6214f
Reviewed-on: https://gerrit.libreoffice.org/3630
Reviewed-by: Matúš Kukan 
Tested-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index 6a0e297..60c0170 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -236,7 +236,17 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
 drawinglayer \
 editeng \
+egi \
+eme \
 $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
+epb \
+epg \
+epp \
+eps \
+ept \
+era \
+eti \
+exp \
file \
filterconfig \
 for \
@@ -248,6 +258,18 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 fwl \
fwm \
 $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
+icd \
+icg \
+idx \
+ime \
+ipb \
+ipd \
+ips \
+ipt \
+ipx \
+ira \
+itg \
+iti \
 lng \
 $(if $(MERGELIBS),merged) \
 msfilter \
@@ -255,9 +277,11 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
 sax \
 sb \
 sdbt \
+sdfilt \
 sfx \
 sot \
 $(if $(ENABLE_HEADLESS),,spl) \
+svgio \
 svl \
 svt \
 svx \
@@ -310,35 +334,13 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 calc \
 dbp \
 dbu \
-egi \
-eme \
-epb \
-epg \
-epp \
-eps \
-ept \
-era \
-eti \
 evoab \
-exp \
filtertracer \
flash \
flat \
 graphicfilter \
 guesslang \
 hyphen \
-   icd \
-   icg \
-   idx \
-   ime \
-   ipb \
-   ipd \
-   ips \
-   ipt \
-   ipx \
-   ira \
-   itg \
-   iti \
jdbc \
kab1 \
kabdrv1 \
@@ -368,7 +370,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 scui \
 sd \
 sdd \
-sdfilt \
 sdui \
 simplecm \
 sm \
@@ -378,7 +379,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 spell \
 sts \
 svgfilter \
-   svgio \
 sw \
tdeab1 \
tdeabdrv1 \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 1b3dd8a..90b04d4 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -347,54 +347,6 @@ File gid_File_Dtd_Toolbar
 Name = "toolbar.dtd";
 End
 
-STD_LIB_FILE( gid_File_Filter_Sdfilt, sdfilt)
-
-STD_LIB_FILE( git_File_Filter_Svgio, svgio)
-
-STD_LIB_FILE( gid_File_Filter_Eme, eme)
-
-STD_LIB_FILE( gid_File_Filter_Icg, icg)
-
-STD_LIB_FILE( gid_File_Filter_Egi, egi)
-
-STD_LIB_FILE( gid_File_Filter_Epb, epb)
-
-STD_LIB_FILE( gid_File_Filter_Epg, epg)
-
-STD_LIB_FILE( gid_File_Filter_Epp, epp)
-
-STD_LIB_FILE( gid_File_Filter_Eps, eps)
-
-STD_LIB_FILE( gid_File_Filter_Ept, ept)
-
-STD_LIB_FILE( gid_File_Filter_Era, era)
-
-STD_LIB_FILE( gid_File_Filter_Eti, eti)
-
-STD_LIB_FILE( gid_File_Filter_Exp, exp)
-
-STD_LIB_FILE( gid_File_Filter_Icd, icd)
-
-STD_LIB_FILE( gid_File_Filter_Idx, idx)
-
-STD_LIB_FILE( gid_File_Filter_Ime, ime)
-
-STD_LIB_FILE( gid_File_Filter_Ipb, ipb)
-
-STD_LIB_FILE( gid_File_Filter_Ipd, ipd)
-
-STD_LIB_FILE( gid_File_Filter_Ips, ips)
-
-STD_LIB_FILE( gid_File_Filter_Ipt, ipt)
-
-STD_LIB_FILE( gid_File_Filter_Ipx, ipx)
-
-STD_LIB_FILE( gid_File_Filter_Ira, ira)
-
-STD_LIB_FILE( gid_File_Filter_Itg, itg)
-
-STD_LIB_FILE( gid_File_Filter_Iti, iti)
-
 STD_RES_FILE( gid_File_Res_Eps, eps )
 
 File gid_File_Help_Help_Zip
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index ec90a13..43ddeef 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -157,29 +157,6 @@ Module gid_Module_Root_Files_4
Styles = (HIDDEN_ROOT);
Files = (gid_File_Dat_Root4,
auto_File_Lib_ALL
-   gid_File_Filter_Eme,
-   gid_File_Filter_Sdfilt,
-   gid_File_Filter_Icg,
-   gid_File_Filter_Egi,
-   gid_File_Filter_Epb,
-   gid_File_Filter_Epg,
-   gid_File_Filter_Epp,
-   gid_File_Filter_Eps,
-   gid_File_Filter_Ept,
-   gid_File_Filter_Era,
-   gid_File_Filter_Eti,
-   gid_File_Filter_Exp,
-   gid_File_Filter_Icd,
-   gid_File_Filter_Idx,
-   gid_File_Filter_Ime,
-   gid_File_Filter_Ipb,
-   gid_File_Filter_Ipd,
-   gid_File_Filter_Ips,
-   gid_File_Filter_Ipt,
-   gid_File_Filter_Ipx,
-   gid_File_Filter_Ira,
-

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-04-24 Thread Marcos Paulo de Souza 
 Repository.mk|   56 +--
 scp2/source/base/postgresqlsdbc.scp  |4 +-
 scp2/source/canvas/canvascommons.scp |4 +-
 scp2/source/canvas/directxcanvas.scp |4 +-
 scp2/source/canvas/vclcanvas.scp |2 -
 scp2/source/gnome/file_gnome.scp |2 -
 scp2/source/ooo/file_library_ooo.scp |   50 +--
 scp2/source/ooo/module_pdfimport.scp |7 
 8 files changed, 52 insertions(+), 77 deletions(-)

New commits:
commit 95f2f5f4d1a6d94788ea4e3905c25ddd69eb3d9b
Author: Marcos Paulo de Souza 
Date:   Mon Apr 22 15:51:17 2013 -0300

fdo#60949: Move the last libs to OOOLIBS

Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3
Reviewed-on: https://gerrit.libreoffice.org/3561
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/Repository.mk b/Repository.mk
index 0ccc03d..054d9a3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -579,28 +579,56 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 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, \
@@ -612,36 +640,8 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
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..fddf458 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -45,9 +45,9 @@ Module gid_Module_Optional_PostgresqlSdbc
 Styles = ();
 End
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc.uno)
+STD_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc)
 
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, 
postgresql-sdbc-impl.uno)
+STD_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..c2e6ec5 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)
+STD_LIB_FILE(gid_File_CanvasFactory, canvasfactory)
+STD_LIB_FILE(gid_File_SimpleCanvas, simplecanvas)
diff --git a/scp2/source/canvas/directxcanvas.scp 
b/scp2/source/canvas/directxcanvas.scp
index cfa762d..7c36bec 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)
+STD_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas)
+STD_LIB_FILE(gid_File_Lib_GdiPlusCanvas,  gdipluscanvas)
 #endif
diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp
index c17301f..48bf5f9 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)
+STD_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanv

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-04-20 Thread Marcos Paulo de Souza 
 Repository.mk|   16 
 scp2/source/gnome/file_gnome.scp |   21 +++--
 scp2/source/impress/file_impress.scp |   11 +--
 scp2/source/kde/file_kde.scp |   14 ++
 scp2/source/python/file_python.scp   |   11 +--
 scp2/source/tde/file_tde.scp |7 +--
 6 files changed, 16 insertions(+), 64 deletions(-)

New commits:
commit 03a36ed0fb81088358d7cfc3068a7be9878f2f8b
Author: Marcos Paulo de Souza 
Date:   Sat Apr 20 17:46:19 2013 -0300

fdo#60949: Move more libs to OOOLIBS

Change-Id: Ibd45f7004f8eaa151b9a60d7369d396411f60a2b
Reviewed-on: https://gerrit.libreoffice.org/3511
Tested-by: LibreOffice gerrit bot 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

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,RTVERLIBS, \
 ))
 
 $(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 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
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 @@ End
 #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 @@ File gid_File_Lib_Animcore
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 @@ File gid_File_Lib_Pyuno
 Styles = (PACKED);
 End
 
-File gid_File_Lib_Pythonlo

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-04-20 Thread Marcos Paulo de Souza 
 Repository.mk|   20 +++---
 scp2/source/ooo/file_library_ooo.scp |  110 +++
 2 files changed, 20 insertions(+), 110 deletions(-)

New commits:
commit 5414a3eecdb09be928313477792acfe1d3534645
Author: Marcos Paulo de Souza 
Date:   Fri Apr 19 13:36:00 2013 -0300

fdo#60949: Move more libs to OOOLIBS

Change-Id: I566602028556aa954bcbd116c375b9b61cc3df6f
Reviewed-on: https://gerrit.libreoffice.org/3484
Reviewed-by: David Tardon 
Tested-by: David Tardon 

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,RTVERLIBS, \
 ))
 
 $(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_for_install,UNOLIBS_OOO,OOO, \
 ))
 $(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 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 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_Ado, ado)
 
 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 @@ File gid_File_Lib_CLucene
 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 @@ End
 
 #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 @@ End
 
 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 @@ File gid_File_Lib_Res
 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_Scn, scn)
 STD_LIB_FILE( gid_File_Lib_Sd , sd)
 STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
-File gid_File_Lib_Slideshow
-LIB_FILE_BODY;
-

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-04-19 Thread Marcos Paulo de Souza 
 Repository.mk|   10 +++
 scp2/source/canvas/cairocanvas.scp   |   12 -
 scp2/source/ooo/file_library_ooo.scp |   44 +++
 3 files changed, 10 insertions(+), 56 deletions(-)

New commits:
commit ef08518fcfdab0e5fd5c61aa4fb4f7907fcb8355
Author: Marcos Paulo de Souza 
Date:   Thu Apr 18 16:47:02 2013 -0300

fdo#60949: Move some libs to OOOLIBS

Compile test only :)

Change-Id: I1e546b824ec027bb1321e36fb060af5b4cfd1bf1
Reviewed-on: https://gerrit.libreoffice.org/3476
Tested-by: LibreOffice gerrit bot 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/Repository.mk b/Repository.mk
index 15c3481..22e03be 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -559,8 +559,13 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+cairocanvas \
+msforms \
 mtfrenderer \
 OGLTrans \
+vbaevents \
+vbaobj \
+vbaswobj \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
@@ -574,7 +579,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 PresenterScreen \
 basprov \
-cairocanvas \
 canvasfactory \
 cmdmail \
 directx5canvas \
@@ -595,7 +599,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 macbe1 \
 migrationoo2 \
 migrationoo3 \
-msforms \
 nullcanvas \
 passwordcontainer \
 pdfimport \
@@ -613,9 +616,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 ucpgvfs1 \
 ucptdoc1 \
 updatefeed \
-vbaevents \
-vbaobj \
-vbaswobj \
 vclcanvas \
 $(if $(filter $(OS),MACOSX), \
 fps_aqua \
diff --git a/scp2/source/canvas/cairocanvas.scp 
b/scp2/source/canvas/cairocanvas.scp
index 4b313bc..de5742a 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -27,14 +27,4 @@
 
 #include "macros.inc"
 
-File gid_File_Lib_CairoCanvas
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX));
-  #else
-Name = "cairocanvas.uno.dll";
-  #endif
-End
-
+STD_LIB_FILE(gid_File_Lib_CairoCanvas, cairocanvas)
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 5aafd04..a993630 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -55,16 +55,7 @@ File gid_File_Lib_Basprov
   #endif
 End
 
-File gid_File_Lib_Vbaevent
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX));
-  #else
-Name = STRING(CONCAT3(vbaevents,.uno,.dll));
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Vbaevent, vbaevents)
 
 File gid_File_Lib_Scriptframe
 LIB_FILE_BODY;
@@ -306,38 +297,11 @@ File gid_File_Lib_Stringresource
   #endif
 End
 
-File gid_File_Lib_Vbaobj
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX));
-  #else
-Name = STRING(CONCAT3(vbaobj,.uno,.dll));
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Vbaobj, vbaobj)
 
-File gid_File_Lib_Vbaswobj
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
-  #else
-Name = STRING(CONCAT3(vbaswobj,.uno,.dll));
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Vbaswobj, vbaswobj)
 
-File gid_File_Lib_Vbamsforms
-LIB_FILE_BODY;
-Styles = (PACKED);
-Dir = SCP2_OOO_BIN_DIR;
-  #ifdef UNX
-Name = STRING(CONCAT3(msforms,.uno,UNXSUFFIX));
-  #else
-Name = STRING(CONCAT3(msforms,.uno,.dll));
-  #endif
-End
+STD_LIB_FILE(gid_File_Lib_Vbamsforms, msforms)
 
 File gid_File_Lib_Vbahelper
 LIB_FILE_BODY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

2013-02-16 Thread Bjoern Michaelsen 
 Repository.mk   |6 --
 scp2/source/canvas/mtfrenderer.scp  |   12 +---
 scp2/source/impress/module_ogltrans.scp |   12 ++--
 3 files changed, 7 insertions(+), 23 deletions(-)

New commits:
commit 1cfaf70d401d49ab5a2c353f256203e086a678dc
Author: Bjoern Michaelsen 
Date:   Fri Feb 15 14:11:28 2013 +0100

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
Reviewed-on: https://gerrit.libreoffice.org/2169
Reviewed-by: David Ostrovsky 
Tested-by: David Ostrovsky 

diff --git a/Repository.mk b/Repository.mk
index cb034f0..cf5193c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -559,6 +559,10 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
 salhelper \
 ))
 
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+mtfrenderer \
+OGLTrans \
+))
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 PresenterScreen \
 basprov \
@@ -589,9 +593,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 migrationoo2 \
 migrationoo3 \
 msforms \
-mtfrenderer \
 nullcanvas \
-OGLTrans \
 passwordcontainer \
 pdfimport \
 pythonloader \
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 @@ Module gid_Module_Optional_OGLTrans
 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;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits