Repository.mk | 85 ++++--------
RepositoryFixes.mk | 3
scp2/AutoInstallLibs_ooo.mk | 2
scp2/AutoInstallLibs_ure.mk | 12 +
scp2/InstallModule_ooo.mk | 1
scp2/InstallModule_ure.mk | 3
scp2/Module_scp2.mk | 1
scp2/inc/macros.inc | 14 ++
scp2/source/canvas/canvascommons.scp | 3
scp2/source/ooo/file_library_ooo.scp | 20 --
scp2/source/ooo/module_hidden_ooo.scp | 56 ++++----
scp2/source/ooo/ure.scp | 214 +-------------------------------
scp2/source/writer/module_writer.scp | 8 -
solenv/gbuild/AutoInstallLibs.mk | 7 -
solenv/gbuild/Helper.mk | 4
solenv/gbuild/platform/IOS_ARM_GCC.mk | 1
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1
solenv/gbuild/platform/com_MSC_class.mk | 1
solenv/gbuild/platform/macosx.mk | 1
solenv/gbuild/platform/solaris.mk | 1
solenv/gbuild/platform/unxgcc.mk | 1
21 files changed, 112 insertions(+), 327 deletions(-)
New commits:
commit 636da2b1e55c098b9c650f31c217c8f220abbebc
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Apr 11 12:25:59 2013 +0200
autoinstall: allow to use only one variable listing all ids
Change-Id: I270ea16aedb22c1af765565657ee4069c03ac6f2
diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk
index 46ae5a5..dd628d5 100644
--- a/scp2/AutoInstallLibs_ooo.mk
+++ b/scp2/AutoInstallLibs_ooo.mk
@@ -7,6 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE(auto_File_Lib_$$(1),$$(call
gb_Library_get_runtime_filename,$$(1)))))
+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE,auto_File_Lib))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/AutoInstallLibs_ure.mk b/scp2/AutoInstallLibs_ure.mk
index 567db0e..9c280bc 100644
--- a/scp2/AutoInstallLibs_ure.mk
+++ b/scp2/AutoInstallLibs_ure.mk
@@ -7,6 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB(auto_Ure_Private_Lib_$$(1),$$(call
gb_Library_get_runtime_filename,$$(1)))))
+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB,auto_Ure_Private_Lib))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 948c626..bb80839 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -832,24 +832,7 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Store,
gid_Unixlink_File_Dl_Jvmaccess,
gid_Unixlink_File_Dl_Jvmfwk,
- auto_Ure_Private_Lib_affine_uno,
- auto_Ure_Private_Lib_gcc3_uno,
- auto_Ure_Private_Lib_java_uno,
- auto_Ure_Private_Lib_juh,
- auto_Ure_Private_Lib_juhx,
- auto_Ure_Private_Lib_jvmaccess,
- auto_Ure_Private_Lib_jvmfwk,
- auto_Ure_Private_Lib_log_uno,
- auto_Ure_Private_Lib_msci_uno,
- auto_Ure_Private_Lib_mscx_uno,
- auto_Ure_Private_Lib_reg,
- auto_Ure_Private_Lib_sal_textenc,
- auto_Ure_Private_Lib_store,
- auto_Ure_Private_Lib_sunjavaplugin,
- auto_Ure_Private_Lib_unoidl,
- auto_Ure_Private_Lib_unsafe_uno,
- auto_Ure_Private_Lib_urelibs,
- auto_Ure_Private_Lib_xmlreader,
+ auto_Ure_Private_Lib_ALL,
gid_File_Dl_JrepropertiesClass,
gid_File_Dl_Profile_Jvmfwk3rc,
gid_File_Dl_Jpipe,
diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
index f7fa75c..c26e708 100644
--- a/solenv/gbuild/AutoInstallLibs.mk
+++ b/solenv/gbuild/AutoInstallLibs.mk
@@ -17,8 +17,12 @@ $(call gb_AutoInstallLibs_get_target,%) :
$(call gb_Output_announce,$*,$(true),AIL,3)
echo "/* autogenerated library installs for group $(INSTALLMODULE) */"
> $@
$(call gb_Output_info,install module: $(INSTALLMODULE) contents:
$(gb_Library_MODULE_$(INSTALLMODULE)))
+ echo "#define $(SCP2ID)_ALL \ " >> $@
$(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
- echo "$(call SCP2TEMPLATE,$(lib))" >> $@;)
+ echo " $(SCP2ID)_$(lib) \ " >> $@;)
+ echo "" >> $@
+ $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
+ echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call
gb_Library_get_runtime_filename,$(lib)))" >> $@;)
$(call gb_AutoInstallLibs_get_clean_target,%) :
@@ -29,6 +33,7 @@ define gb_AutoInstallLibs_AutoInstallLibs
$(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Helper_PHONY) | $(dir $(call
gb_AutoInstallLibs_get_target,$(1))).dir
$(call gb_AutoInstallLibs_get_target,$(1)) : INSTALLMODULE = $(2)
$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3)
+$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4)
$$(eval $$(call gb_Module_register_target,$(call
gb_AutoInstallLibs_get_target,$(1)),$(call
gb_AutoInstallLibs_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs)
commit 23e5debcc528132eedd7f1530216fe2b2158386a
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Apr 11 12:38:28 2013 +0200
scp2: let's autoinstall libraries with names as gbuild knows them
Change-Id: I01ab0db1a46ed58403ba16247c131550f9b3fcb1
diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk
index d65a6fc..46ae5a5 100644
--- a/scp2/AutoInstallLibs_ooo.mk
+++ b/scp2/AutoInstallLibs_ooo.mk
@@ -7,6 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,STD_LIB_FILE(auto_File_Lib_$$(1),$$(1))))
+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE(auto_File_Lib_$$(1),$$(call
gb_Library_get_runtime_filename,$$(1)))))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 9435fab..dd8b518 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -98,6 +98,12 @@
Styles = (PACKED); \
Dir = SCP2_OOO_BIN_DIR
+#define LIBO_LIB_FILE(id,name) \
+ File id \
+ Name = name; \
+ PACKED_LIB_FILE_BODY; \
+ End
+
#define STD_LIB_FILE(id,name) \
File id \
Name = LIBNAME(name); \
commit 52af0b0fee71a3002d28cd962deb30dd8cf194f6
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Apr 11 12:32:32 2013 +0200
fdo#60924 scp2: use auto_foo instead of gid_foo_auto_installed
Change-Id: I646c5219d3eb1d09206de93a2b21a6a5b3ac2846
diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk
index c3544c2..d65a6fc 100644
--- a/scp2/AutoInstallLibs_ooo.mk
+++ b/scp2/AutoInstallLibs_ooo.mk
@@ -7,6 +7,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,STD_LIB_FILE(gid_File_Lib_$$(1)_auto_installed,$$(1))))
+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,STD_LIB_FILE(auto_File_Lib_$$(1),$$(1))))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 3004622..188a2f0a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -180,32 +180,32 @@ Module gid_Module_Root_Files_4
gid_File_Filter_Ira,
gid_File_Filter_Itg,
gid_File_Filter_Iti,
- gid_File_Lib_basctl_auto_installed,
+ auto_File_Lib_basctl,
gid_File_Lib_Bib,
- gid_File_Lib_chartcore_auto_installed,
- gid_File_Lib_chartcontroller_auto_installed,
- gid_File_Lib_ctl_auto_installed,
- gid_File_Lib_cui_auto_installed,
- gid_File_Lib_sdbt_auto_installed,
- gid_File_Lib_dbmm_auto_installed,
- gid_File_Lib_dba_auto_installed,
- gid_File_Lib_dbase_auto_installed,
- gid_File_Lib_dbaxml_auto_installed,
- gid_File_Lib_dbt_auto_installed,
- gid_File_Lib_file_auto_installed,
- gid_File_Lib_drawinglayer_auto_installed,
+ auto_File_Lib_chartcore,
+ auto_File_Lib_chartcontroller,
+ auto_File_Lib_ctl,
+ auto_File_Lib_cui,
+ auto_File_Lib_sdbt,
+ auto_File_Lib_dbmm,
+ auto_File_Lib_dba,
+ auto_File_Lib_dbase,
+ auto_File_Lib_dbaxml,
+ auto_File_Lib_dbt,
+ auto_File_Lib_file,
+ auto_File_Lib_drawinglayer,
gid_File_Lib_Editeng,
gid_File_Lib_Flat,
- gid_File_Lib_for_auto_installed,
- gid_File_Lib_forui_auto_installed,
- gid_File_Lib_frm_auto_installed,
- gid_File_Lib_fwe_auto_installed,
- gid_File_Lib_fwi_auto_installed,
+ auto_File_Lib_for,
+ auto_File_Lib_forui,
+ auto_File_Lib_frm,
+ auto_File_Lib_fwe,
+ auto_File_Lib_fwi,
gid_File_Lib_Fwk,
- gid_File_Lib_fwl_auto_installed,
+ auto_File_Lib_fwl,
gid_File_Lib_Helplinker,
gid_File_Lib_J,
- gid_File_Lib_lng_auto_installed,
+ auto_File_Lib_lng,
gid_File_Lib_Offacc,
gid_File_Lib_Oox,
gid_File_Lib_Pcr,
@@ -226,12 +226,12 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Svl,
gid_File_Lib_Svtools,
gid_File_Lib_Svx,
- gid_File_Lib_avmedia_auto_installed,
+ auto_File_Lib_avmedia,
gid_File_Lib_AVMediaWin,
gid_File_Lib_AVMediaGStreamer,
gid_File_Lib_AVMediaGStreamer_0_10,
gid_File_Lib_BaseGfx,
- gid_File_Lib_merged_auto_installed,
+ auto_File_Lib_merged,
gid_File_Lib_Sysdtrans,
gid_File_Lib_Sw,
gid_File_Lib_TextConversionDlgs,
@@ -256,9 +256,9 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Vclplug_Kde,
gid_File_Lib_Vclplug_Kde4,
gid_File_Lib_Vclplug_Svp,
- gid_File_Lib_canvastools_auto_installed,
- gid_File_Lib_cppcanvas_auto_installed,
- gid_File_Lib_fwm_auto_installed,
+ auto_File_Lib_canvastools,
+ auto_File_Lib_cppcanvas,
+ auto_File_Lib_fwm,
gid_File_Lib_Guesslang);
End
@@ -336,7 +336,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Srtrs1,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
- gid_File_Lib_unoxml_auto_installed,
+ auto_File_Lib_unoxml,
gid_File_Lib_Localebe,
gid_File_Lib_Migrationoo2,
gid_File_Lib_Migrationoo3,
@@ -361,7 +361,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Smime3,
gid_File_Lib_Sqlite3,
gid_File_Lib_Ssl3,
- gid_File_Lib_unordf_auto_installed,
+ auto_File_Lib_unordf,
gid_File_Lib_Sndfile,
gid_File_Lib_Tvhlp1,
gid_File_Lib_Ucb1,
@@ -395,7 +395,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Dl,
gid_File_Lib_Dnd,
gid_File_Lib_Dtrans,
- gid_File_Lib_emser_auto_installed,
+ auto_File_Lib_emser,
gid_File_Lib_Inprocserv,
gid_File_Lib_Fps,
gid_File_Lib_Ftransl,
diff --git a/scp2/source/writer/module_writer.scp
b/scp2/source/writer/module_writer.scp
index 525f650..8aafb19 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -48,11 +48,11 @@ Module gid_Module_Prg_Wrt_Bin
gid_File_Lib_Swd,
gid_File_Lib_Swui,
gid_File_Lib_Msword,
- gid_File_Lib_wpftwriter_auto_installed,
- gid_File_Lib_t602filter_auto_installed,
+ auto_File_Lib_wpftwriter,
+ auto_File_Lib_t602filter,
gid_File_Lib_Vbaswobj,
- gid_File_Lib_writerfilter_auto_installed,
- gid_File_Lib_lwpft_auto_installed,
+ auto_File_Lib_writerfilter,
+ auto_File_Lib_lwpft,
gid_File_Jar_Email,
gid_File_Jar_Mail,
gid_File_Jar_Activation,
commit c9c963d3e6991d0dd73a95fc9734e38683d5be9c
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Apr 11 11:02:39 2013 +0200
autoinstall ure private libraries
Change-Id: Ia390c4d4a9be4b5520fd82a573029ea242f9ffb9
diff --git a/Repository.mk b/Repository.mk
index de3bbd5..457efec 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -414,36 +414,33 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
- affine_uno \
- cli_cppuhelper \
- cli_uno \
- gcc3_uno \
- getuid \
- java_uno \
- jpipe \
- juh \
- juhx \
- log_uno \
- sal_textenc \
- sunjavaplugin \
- sunpro5_uno \
- unoidl \
- unsafe_uno \
- urelibs \
- xmlreader \
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
+ affine_uno \
+ $(if $(SOLAR_JAVA),java_uno) \
+ $(if $(SOLAR_JAVA),juh) \
+ $(if $(SOLAR_JAVA),juhx) \
+ $(if $(SOLAR_JAVA),jvmaccess) \
+ $(if $(SOLAR_JAVA),jvmfwk) \
+ log_uno \
+ reg \
+ sal_textenc \
+ store \
+ $(if $(SOLAR_JAVA),sunjavaplugin) \
+ unoidl \
+ unsafe_uno \
+ $(if $(URELIBS),urelibs) \
+ xmlreader \
+ $(if $(filter MSC,$(COM)),$(if $(filter
INTEL,$(COMNAME)),msci,mscx),gcc3)_uno \
))
-ifeq ($(OS),WNT)
-
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
- jpipx \
- msci_uno \
- mscx_uno \
+ $(if $(filter MSC,$(COM)),cli_cppuhelper) \
+ $(if $(filter MSC,$(COM)),cli_uno) \
+ getuid \
+ jpipe \
+ $(if $(filter WNT,$(OS)),jpipx) \
))
-endif
-
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
avmediagst \
avmediagst_0_10 \
@@ -552,7 +549,6 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \
$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
cppuhelper \
- jvmaccess \
purpenvhelper \
salhelper \
))
@@ -651,10 +647,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
cppu \
- jvmfwk \
- reg \
sal \
- store \
))
$(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 0479b92..2a4969e 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -35,12 +35,9 @@ ifneq (,$(filter SOLARIS GCC,$(OS) $(COM)))
gb_Library_FILENAMES := $(patsubst
affine_uno:libaffine_uno%,affine_uno:libaffine_uno_uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
ifeq ($(OS),MACOSX)
diff --git a/scp2/AutoInstallLibs_ure.mk b/scp2/AutoInstallLibs_ure.mk
new file mode 100644
index 0000000..567db0e
--- /dev/null
+++ b/scp2/AutoInstallLibs_ure.mk
@@ -0,0 +1,12 @@
+# -*- 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/.
+#
+
+$(eval $(call
gb_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB(auto_Ure_Private_Lib_$$(1),$$(call
gb_Library_get_runtime_filename,$$(1)))))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk
index f985816..3d04217 100644
--- a/scp2/InstallModule_ure.mk
+++ b/scp2/InstallModule_ure.mk
@@ -27,9 +27,10 @@
$(eval $(call gb_InstallModule_InstallModule,scp2/ure))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ure,ure))
+
$(eval $(call gb_InstallModule_define_if_set,scp2/ure,\
SYSTEM_LIBXML \
- URELIBS \
))
$(eval $(call gb_InstallModule_define_value_if_set,scp2/ure,\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 4d12b8f..ae0f312 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,scp2))
$(eval $(call gb_Module_add_targets,scp2,\
AutoInstallLibs_ooo \
+ AutoInstallLibs_ure \
CustomTarget_langmacros \
InstallModule_accessories \
InstallModule_base \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3d341de..9435fab 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -455,5 +455,13 @@ End
EXTRA_ALL_LANG_BUT_EN_US(file, ext); \
End
+#define URE_PRIVATE_LIB(id,name) \
+ File id \
+ LIB_FILE_BODY; \
+ Dir = SCP2_URE_DL_DIR; \
+ Name = name; \
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
+ End
+
#endif // MACROS_INC
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 5e6d681..948c626 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -27,6 +27,8 @@
#include "macros.inc"
+#include "AutoInstallLibs/ure"
+
Directory gid_Dir_Ure_Bin
#if defined MACOSX
ParentID = gid_Dir_UreLink;
@@ -213,13 +215,6 @@ Unixlink gid_Unixlink_File_Dl_Sal
End
#endif
-File gid_File_Dl_Sal_TextEnc
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("sal_textenc");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-
File gid_File_Dl_Salhelper
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -248,14 +243,6 @@ File gid_File_Dl_Profile_Uno
// CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F";
End
-File gid_File_Dl_Reg
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_VER("reg", "3");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
-End
-
#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Reg
BIN_FILE_BODY;
@@ -264,43 +251,7 @@ Unixlink gid_Unixlink_File_Dl_Reg
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_VER("reg", "3");
End
-#endif
-
-
-
-File gid_File_Dl_Store
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_VER("store", "3");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
-End
-
-File gid_File_Dl_Unoidl
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("unoidl");
- Styles = (PACKED);
-End
-
-File gid_File_Dl_Xmlreader
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("xmlreader");
- Styles = (PACKED);
-End
-
-#ifdef URELIBS
-File gid_File_Dl_Urelibs
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("urelibs");
- Styles = (PACKED);
-End
-#endif
-
-#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Store
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -308,19 +259,9 @@ Unixlink gid_Unixlink_File_Dl_Store
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_VER("store", "3");
End
-#endif
#if defined SOLAR_JAVA
-File gid_File_Dl_Jvmaccess
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577";
-End
-
-#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Jvmaccess
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -328,17 +269,7 @@ Unixlink gid_Unixlink_File_Dl_Jvmaccess
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
End
-#endif
-File gid_File_Dl_Jvmfwk
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_VER("jvmfwk", "3");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "4E128F82-FA30-4077-88DC-F745C3330093";
-End
-
-#ifdef AIX
Unixlink gid_Unixlink_File_Dl_Jvmfwk
BIN_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -346,25 +277,11 @@ Unixlink gid_Unixlink_File_Dl_Jvmfwk
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
Target = SCP2_URE_DL_VER("jvmfwk", "3");
End
-#endif
-File gid_File_Dl_Sunjavaplugin
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("sunjavaplugin");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
-End
+#endif # JAVA
-File gid_File_Dl_JrepropertiesClass
- TXT_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = "JREProperties.class";
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016";
-End
+#endif # AIX
-#endif
File gid_File_Dl_Profile_Jvmfwk3rc
TXT_FILE_BODY;
@@ -374,21 +291,14 @@ File gid_File_Dl_Profile_Jvmfwk3rc
// CompID = "1124A984-F905-47DC-ACEF-EDEC037F9B38";
End
-File gid_File_Dl_ComnameUno
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL(STRING(COMNAME) "_uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "3FAFBDCB-96FE-4D9E-B655-CA86FE674711";
-End
#if defined SOLAR_JAVA
-File gid_File_Dl_JavaUno
- LIB_FILE_BODY;
+File gid_File_Dl_JrepropertiesClass
+ TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("java_uno");
+ Name = "JREProperties.class";
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "5425A018-DAFD-4BC6-A550-377C899DC98A";
+ // CompID = "0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016";
End
#endif
@@ -401,28 +311,6 @@ Shortcut gid_Shortcut_Dl_JavaUno
End
#endif
-File gid_File_Dl_UnsafeUnoUno
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("unsafe_uno_uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "74C2909A-FDCF-430A-B0F4-CA6D15690D76";
-End
-
-File gid_File_Dl_AffineUnoUno
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("affine_uno_uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05";
-End
-
-File gid_File_Dl_LogUnoUno
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("log_uno_uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
#if defined _MSC_VER
File gid_File_Dl_Cli_Uno
@@ -432,9 +320,6 @@ File gid_File_Dl_Cli_Uno
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
-#endif
-
-#if defined _MSC_VER
File gid_File_Dl_Cli_Ure_Assembly
TXT_FILE_BODY;
@@ -449,10 +334,6 @@ File gid_File_Dl_Cli_Ure_Assembly
ProcessorArchitecture = "MSIL";
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Dl_Policy_Cli_Ure_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -466,10 +347,6 @@ File gid_File_Dl_Policy_Cli_Ure_Assembly
ProcessorArchitecture = "MSIL";
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Dl_Policy_Cli_Ure_Config
TXT_FILE_BODY;
Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
@@ -478,10 +355,6 @@ File gid_File_Dl_Policy_Cli_Ure_Config
AssignComponent = gid_File_Dl_Policy_Cli_Ure_Assembly;
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Dl_Cli_Basetypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -495,10 +368,6 @@ File gid_File_Dl_Cli_Basetypes_Assembly
ProcessorArchitecture = "MSIL";
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Dl_Policy_Cli_Basetypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -512,9 +381,6 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
ProcessorArchitecture = "MSIL";
End
-#endif
-#if defined _MSC_VER
-
File gid_File_Dl_Policy_Cli_Basetypes_Config
TXT_FILE_BODY;
Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
@@ -523,11 +389,6 @@ File gid_File_Dl_Policy_Cli_Basetypes_Config
AssignComponent = gid_File_Dl_Policy_Cli_Basetypes_Assembly;
End
-#endif
-
-
-#if defined _MSC_VER
-
File gid_File_Dl_Cli_Uretypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -541,10 +402,6 @@ File gid_File_Dl_Cli_Uretypes_Assembly
ProcessorArchitecture = "MSIL";
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Dl_Policy_Cli_Uretypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -558,10 +415,6 @@ File gid_File_Dl_Policy_Cli_Uretypes_Assembly
ProcessorArchitecture = "MSIL";
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Dl_Policy_Cli_Uretypes_Config
TXT_FILE_BODY;
Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
@@ -570,10 +423,6 @@ File gid_File_Dl_Policy_Cli_Uretypes_Config
AssignComponent = gid_File_Dl_Policy_Cli_Uretypes_Assembly;
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Lib_Cli_Cppuhelper_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -587,10 +436,6 @@ File gid_File_Lib_Cli_Cppuhelper_Assembly
ProcessorArchitecture = "x86";
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -604,10 +449,6 @@ File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
ProcessorArchitecture = "x86";
End
-#endif
-
-#if defined _MSC_VER
-
File gid_File_Lib_Policy_Cli_Cppuhelper_Config
TXT_FILE_BODY;
Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
@@ -637,26 +478,6 @@ File gid_File_Dl_Jpipx
End
#endif
-#if defined SOLAR_JAVA
-File gid_File_Dl_Juh
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("juh");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "1A001FB0-C469-4517-A3D1-3FA56AD607AF";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Juhx
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("juhx");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "B152234F-A46A-40BE-B632-48F35A33A29A";
-End
-#endif
-
File gid_File_Dl_Acceptor
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -1003,36 +824,36 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_PurpEnvHelper,
gid_File_Dl_Sal,
gid_Unixlink_File_Dl_Sal,
- gid_File_Dl_Sal_TextEnc,
gid_File_Dl_Salhelper,
gid_Unixlink_File_Dl_Salhelper,
gid_File_Dl_Profile_Uno,
- gid_File_Dl_Reg,
gid_Unixlink_File_Dl_Reg,
gid_Unixlink_File_Dl_Rmcxt,
- gid_File_Dl_Store,
gid_Unixlink_File_Dl_Store,
- gid_File_Dl_Unoidl,
- gid_File_Dl_Xmlreader,
-#ifdef URELIBS
- gid_File_Dl_Urelibs,
-#endif
- gid_File_Dl_Jvmaccess,
gid_Unixlink_File_Dl_Jvmaccess,
- gid_File_Dl_Jvmfwk,
gid_Unixlink_File_Dl_Jvmfwk,
- gid_File_Dl_Sunjavaplugin,
+ auto_Ure_Private_Lib_affine_uno,
+ auto_Ure_Private_Lib_gcc3_uno,
+ auto_Ure_Private_Lib_java_uno,
+ auto_Ure_Private_Lib_juh,
+ auto_Ure_Private_Lib_juhx,
+ auto_Ure_Private_Lib_jvmaccess,
+ auto_Ure_Private_Lib_jvmfwk,
+ auto_Ure_Private_Lib_log_uno,
+ auto_Ure_Private_Lib_msci_uno,
+ auto_Ure_Private_Lib_mscx_uno,
+ auto_Ure_Private_Lib_reg,
+ auto_Ure_Private_Lib_sal_textenc,
+ auto_Ure_Private_Lib_store,
+ auto_Ure_Private_Lib_sunjavaplugin,
+ auto_Ure_Private_Lib_unoidl,
+ auto_Ure_Private_Lib_unsafe_uno,
+ auto_Ure_Private_Lib_urelibs,
+ auto_Ure_Private_Lib_xmlreader,
gid_File_Dl_JrepropertiesClass,
gid_File_Dl_Profile_Jvmfwk3rc,
- gid_File_Dl_ComnameUno,
- gid_File_Dl_JavaUno,
- gid_File_Dl_UnsafeUnoUno,
- gid_File_Dl_AffineUnoUno,
- gid_File_Dl_LogUnoUno,
gid_File_Dl_Jpipe,
gid_File_Dl_Jpipx,
- gid_File_Dl_Juh,
- gid_File_Dl_Juhx,
gid_File_Dl_Acceptor,
gid_File_Dl_Binaryurp,
gid_File_Dl_Bootstrap,
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index f5f205b..05e5489 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -118,7 +118,7 @@ endef
define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO
RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := OOO
+gb_Library_VALIDINSTALLMODULES := OOO URE
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 466a821..fa070ca 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -251,7 +251,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=gcc3 \
- -DCOMNAME=gcc3 \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 42e1dda..469bb5f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -385,7 +385,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=gcc3 \
- -DCOMNAME=gcc3 \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 12227ab..e3fc4d7 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -544,7 +544,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=MSC \
- -DCOMNAME=$(if $(filter INTEL,$(CPUNAME)),msci,mscx) \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index eababb8..88e0953 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -321,7 +321,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=gcc3 \
- -DCOMNAME=gcc3 \
-D_gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index 968b1a3..d8bb1c8 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -378,7 +378,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=gcc3 \
- -DCOMNAME=gcc3 \
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index e295edb..ae9081f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -373,7 +373,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(gb_CPUDEFS) \
$(gb_OSDEFS) \
-DCOMID=gcc3 \
- -DCOMNAME=gcc3 \
-DSHORTSTDC3=$(gb_SHORTSTDC3) \
-DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \
-D_gcc3 \
commit 2b4d8ab67bb5747d05c556663ff3d8aa470c3274
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Apr 10 23:35:35 2013 +0200
do not install merged libraries
Since scp2 / make_installer ignores undefined ids, we can just
filter-out merged autoinstalled libraries and we are done :-)
Change-Id: I5ab63604d54a5a36caccf003a20112e2b47b79da
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 64876e4..f5f205b 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -183,7 +183,7 @@ $$(eval $$(call gb_Output_error,$(2) is not a valid install
module for libraries
endif
$(call gb_Helper_register_libraries,$(1),$(3))
-gb_Library_MODULE_$(2) += $(3)
+gb_Library_MODULE_$(2) += $(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(3))
endef
commit d11cad2a76f9ac5e914dcc53808cee4990c2dbf4
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Apr 10 23:24:08 2013 +0200
fdo#60924: autoinstall more libraries
This autoinstall thing is quite cool because we don't need #ifdefs in
scp2. Conditions in Repository.mk are enough.
Change-Id: I31525a7e1d3bf0e4484f838483a829490621a241
diff --git a/Repository.mk b/Repository.mk
index bb73ddc..de3bbd5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -217,24 +217,14 @@ $(eval $(call
gb_Helper_register_libraries,PLAINLIBS_NONE, \
endif
-ifeq ($(DISABLE_SCRIPTING),)
-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- basctl \
-))
-endif
-ifeq ($(OS),WNT)
-ifeq ($(DISABLE_ATL),)
-$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- emser \
-))
-endif
-endif
-
-
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+ avmedia \
+ $(if $(DISABLE_SCRIPTING),,basctl) \
bib \
+ canvastools \
chartcore \
chartcontroller \
+ cppcanvas \
ctl \
cui \
dba \
@@ -243,7 +233,10 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
dbtools \
dbaxml \
drawinglayer \
+ $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
file \
+ for \
+ forui \
frm \
fwe \
fwi \
@@ -251,9 +244,13 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwm \
lng \
lwpft \
+ $(if $(MERGELIBS),merged) \
sdbt \
odbcbase \
t602filter \
+ $(if $(ENABLE_TELEPATHY),tubes) \
+ unordf \
+ unoxml \
wpftwriter \
writerfilter \
))
@@ -270,21 +267,17 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
$(if $(filter $(OS),ANDROID),, \
basebmp \
) \
- canvastools \
communi \
date \
evtatt \
- forui \
odbc \
oox \
ooxml \
sdbc \
AppleRemote \
- avmedia \
avmediaQuickTime \
basegfx \
calc \
- cppcanvas \
dbp \
dbu \
deploymentmisc \
@@ -305,7 +298,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
filtertracer \
flash \
flat \
- for \
fwk \
graphicfilter \
guesslang \
@@ -330,7 +322,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
lnth \
log \
MacOSXSpell \
- merged \
mork \
mozab2 \
mozabdrv \
@@ -385,9 +376,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
textfd \
tk \
tl \
- tubes \
- unordf \
- unoxml \
updatecheckui \
utl \
uui \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 839e885..3390f45 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_OPENGL \
ENABLE_TDE \
ENABLE_TDEAB \
- ENABLE_TELEPATHY \
MERGELIBS \
SYSTEM_APACHE_COMMONS \
SYSTEM_BOOST \
diff --git a/scp2/source/canvas/canvascommons.scp
b/scp2/source/canvas/canvascommons.scp
index cd2dc9c..f390a9e 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -27,8 +27,5 @@
#include "macros.inc"
-STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
-STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
-
SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index ea3a7d9..edb4467 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1118,10 +1118,6 @@ STD_LIB_FILE( gid_File_Lib_Swui, swui)
STD_LIB_FILE( gid_File_Lib_Msword, msword )
-#ifdef MERGELIBS
-STD_LIB_FILE( gid_File_Lib_Merged, merged )
-#endif
-
#if ! defined UNX
File gid_File_Lib_Sysdtrans
LIB_FILE_BODY;
@@ -1331,12 +1327,6 @@ File gid_File_Lib_eXslt
End
#endif
-
-STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
-
-// AVMedia
-STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
-
#if defined ENABLE_GSTREAMER
SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer, avmediagst )
#endif
@@ -1553,11 +1543,6 @@ File gid_File_Lib_Rdf
End
#endif // SYSTEM_REDLAND
-STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
-
-STD_LIB_FILE( gid_File_Lib_For, for)
-STD_LIB_FILE( gid_File_Lib_Forui, forui)
-
#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_sellangmsi
@@ -1568,8 +1553,3 @@ File gid_File_Lib_sellangmsi
End
#endif
-
-#ifdef ENABLE_TELEPATHY
-STD_LIB_FILE( gid_File_Lib_Tubes , tubes)
-#endif
-
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 7b66176..3004622 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -196,8 +196,8 @@ Module gid_Module_Root_Files_4
gid_File_Lib_drawinglayer_auto_installed,
gid_File_Lib_Editeng,
gid_File_Lib_Flat,
- gid_File_Lib_For,
- gid_File_Lib_Forui,
+ gid_File_Lib_for_auto_installed,
+ gid_File_Lib_forui_auto_installed,
gid_File_Lib_frm_auto_installed,
gid_File_Lib_fwe_auto_installed,
gid_File_Lib_fwi_auto_installed,
@@ -226,12 +226,12 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Svl,
gid_File_Lib_Svtools,
gid_File_Lib_Svx,
- gid_File_Lib_AVMedia,
+ gid_File_Lib_avmedia_auto_installed,
gid_File_Lib_AVMediaWin,
gid_File_Lib_AVMediaGStreamer,
gid_File_Lib_AVMediaGStreamer_0_10,
gid_File_Lib_BaseGfx,
- gid_File_Lib_Merged,
+ gid_File_Lib_merged_auto_installed,
gid_File_Lib_Sysdtrans,
gid_File_Lib_Sw,
gid_File_Lib_TextConversionDlgs,
@@ -256,8 +256,8 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Vclplug_Kde,
gid_File_Lib_Vclplug_Kde4,
gid_File_Lib_Vclplug_Svp,
- gid_File_Lib_CanvasTools,
- gid_File_Lib_CppCanvas,
+ gid_File_Lib_canvastools_auto_installed,
+ gid_File_Lib_cppcanvas_auto_installed,
gid_File_Lib_fwm_auto_installed,
gid_File_Lib_Guesslang);
End
@@ -336,7 +336,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Srtrs1,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
- gid_File_Lib_Unoxml,
+ gid_File_Lib_unoxml_auto_installed,
gid_File_Lib_Localebe,
gid_File_Lib_Migrationoo2,
gid_File_Lib_Migrationoo3,
@@ -361,7 +361,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Smime3,
gid_File_Lib_Sqlite3,
gid_File_Lib_Ssl3,
- gid_File_Lib_Unordf,
+ gid_File_Lib_unordf_auto_installed,
gid_File_Lib_Sndfile,
gid_File_Lib_Tvhlp1,
gid_File_Lib_Ucb1,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
