[Libreoffice-commits] core.git: 2 commits - RepositoryFixes.mk Repository.mk scp2/source solenv/gbuild
Matúš Kukan
matus.kukan at gmail.com
Tue Apr 23 05:20:32 PDT 2013
Repository.mk | 46 ++++-----
RepositoryFixes.mk | 4
scp2/source/ooo/file_library_ooo.scp | 32 ------
scp2/source/ooo/module_hidden_ooo.scp | 3
scp2/source/ooo/ure.scp | 157 --------------------------------
solenv/gbuild/Helper.mk | 2
solenv/gbuild/platform/IOS_ARM_GCC.mk | 2
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 3
solenv/gbuild/platform/android.mk | 2
solenv/gbuild/platform/com_MSC_class.mk | 2
solenv/gbuild/platform/macosx.mk | 2
solenv/gbuild/platform/solaris.mk | 2
solenv/gbuild/platform/unxgcc.mk | 2
13 files changed, 24 insertions(+), 235 deletions(-)
New commits:
commit 6b436a159be35ecaa81114968512e33952226b3e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Apr 17 11:55:28 2013 +0200
kill RTLIBS group; and autoinstall the libraries
This commit changes names for comphelper i18nlangtag and ucbhelper.
Change-Id: I93731ef31f894854f9c642d3adee41006552e303
diff --git a/Repository.mk b/Repository.mk
index df13675..a709a99 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -465,13 +465,16 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \
+ comphelper \
deployment \
fileacc \
+ i18nlangtag \
i18nutil \
mcnttype \
package2 \
sofficeapp \
ucb1 \
+ ucbhelper \
ucpfile1 \
xstor \
))
@@ -566,12 +569,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
endif
-$(eval $(call gb_Helper_register_libraries,RTLIBS, \
- comphelper \
- i18nlangtag \
- ucbhelper \
-))
-
$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
cppuhelper \
purpenvhelper \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 175f9cb..78ed710 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -33,12 +33,10 @@
# we use a filter expression instead.
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 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 salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
ifeq ($(OS),MACOSX)
# libpyuno_wrapper.dylib => pyuno.so
@@ -57,10 +55,8 @@ endif
ifeq ($(OS),WNT)
gb_Library_DLLFILENAMES := $(patsubst affine_uno:affine_uno%,affine_uno:affine_uno_uno%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst log_uno:log_uno%,log_uno:log_uno_uno%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_DLLFILENAMES))
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 17f4668..1677e01 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -141,18 +141,6 @@ End
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
#endif
-
-File gid_File_Lib_Comphelper2
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX));
- #else
- Name = STRING(CONCAT3(comphelp,COMID,.dll));
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
#ifndef SYSTEM_CURL
File gid_File_Lib_Curl
@@ -498,15 +486,6 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.
STD_LIB_FILE( gid_File_Lib_I18nsearch, i18nsearch )
-File gid_File_Lib_I18nisolang
- #ifdef UNX
- Name = STRING(CONCAT3(libi18nlangtag,COMID,UNXSUFFIX));
- #else
- Name = STRING(CONCAT3(i18nlangtag,COMID,.dll));
- #endif
- PACKED_LIB_FILE_BODY;
-End
-
#ifndef SYSTEM_ICU
File gid_File_Lib_Icudata
@@ -956,17 +935,6 @@ File gid_File_Lib_Tvhlp1
#endif
End
-File gid_File_Lib_Ucbhelper
- LIB_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
- #ifdef UNX
- Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX));
- #else
- Name = STRING(CONCAT3(ucbhelper4,COMID,.dll));
- #endif
-End
-
File gid_File_Lib_Ucpchelp1
LIB_FILE_BODY;
#ifdef UNX
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 98610d7..ec90a13 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -243,7 +243,6 @@ Module gid_Module_Root_Files_5
#if ! defined SYSTEM_CLUCENE
gid_File_Lib_CLucene,
#endif
- gid_File_Lib_Comphelper2,
gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
gid_File_Lib_Dbpool,
@@ -257,7 +256,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Macab_Drv_1,
gid_File_Lib_Evtatt,
gid_File_Lib_I18nsearch,
- gid_File_Lib_I18nisolang,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
gid_File_Lib_Icule,
@@ -309,7 +307,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Ssl3,
gid_File_Lib_Sndfile,
gid_File_Lib_Tvhlp1,
- gid_File_Lib_Ucbhelper,
gid_File_Lib_Ucpchelp1,
gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon,
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 520a4d9..0ca26a0 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -117,7 +117,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_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
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 78ba92d..998cc6f 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -176,7 +176,6 @@ gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -188,7 +187,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 7b26863..26be344 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -220,7 +220,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
@@ -232,7 +231,6 @@ gb_Library_FILENAMES :=\
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -245,7 +243,6 @@ gb_Library_DLLFILENAMES :=\
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 1f4bf81..215ebfd 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -76,7 +76,6 @@ gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT)) \
@@ -92,7 +91,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 2d8c95f..f3eb49c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -258,7 +258,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
@@ -281,7 +280,6 @@ gb_Library_DLLFILENAMES :=\
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVEREXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index eb77418..46ef8a8 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -221,7 +221,6 @@ gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -234,7 +233,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index c297334..cfbdef2 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -253,7 +253,6 @@ gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -265,7 +264,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index fc53365..081aa1f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -252,7 +252,6 @@ gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
@@ -264,7 +263,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
- $(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):OOO) \
commit 2bb103ce8f782b64164078ef4098382e429ef20c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Apr 17 11:40:37 2013 +0200
autoinstall more ure libraries
Change-Id: I7bbf716fb56726bceb3f84e757ff7ab6c3cc79e7
diff --git a/Repository.mk b/Repository.mk
index 0afc24b..df13675 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -436,6 +436,26 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
))
+$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,URE, \
+ acceptor \
+ binaryurp \
+ bootstrap \
+ connector \
+ introspection \
+ invocadapt \
+ invocation \
+ $(if $(SOLAR_JAVA),javaloader) \
+ $(if $(SOLAR_JAVA),javavm) \
+ namingservice \
+ proxyfac \
+ reflection \
+ stocservices \
+ streams \
+ textinstream \
+ textoutstream \
+ uuresolver \
+))
+
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(if $(filter MSC,$(COM)),cli_cppuhelper) \
$(if $(filter MSC,$(COM)),cli_uno) \
@@ -628,26 +648,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
- acceptor \
- binaryurp \
- bootstrap \
- connector \
- introspection \
- invocadapt \
- invocation \
- javaloader \
- javavm \
- namingservice \
- proxyfac \
- reflection \
- stocservices \
- streams \
testtools_cppobj \
testtools_bridgetest \
testtools_constructors \
- textinstream \
- textoutstream \
- uuresolver \
))
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 7a034ad..2b4ac3a 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -478,146 +478,6 @@ File gid_File_Dl_Jpipx
End
#endif
-File gid_File_Dl_Acceptor
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("acceptor.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0";
-End
-
-File gid_File_Dl_Binaryurp
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("binaryurp.uno");
- Styles = (PACKED);
-End
-
-File gid_File_Dl_Bootstrap
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("bootstrap.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
-End
-
-File gid_File_Dl_Connector
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("connector.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D";
-End
-
-File gid_File_Dl_Introspection
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("introspection.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1";
-End
-
-File gid_File_Dl_Invocadapt
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("invocadapt.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9";
-End
-
-File gid_File_Dl_Invocation
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("invocation.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C";
-End
-
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Javaloader
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("javaloader.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Javavm
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("javavm.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA";
-End
-#endif
-
-File gid_File_Dl_Namingservice
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("namingservice.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31";
-End
-
-File gid_File_Dl_Stocservices
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("stocservices.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07";
-End
-
-File gid_File_Dl_Proxyfac
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("proxyfac.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F";
-End
-
-File gid_File_Dl_Reflection
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("reflection.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3";
-End
-
-File gid_File_Dl_Streams
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("streams.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B";
-End
-
-File gid_File_Dl_Textinstream
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("textinstream.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA";
-End
-
-File gid_File_Dl_Textoutstream
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("textoutstream.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4";
-End
-
-File gid_File_Dl_Uuresolver
- LIB_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_BARE("uuresolver.uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206";
-End
-
#if !defined SYSTEM_LIBXML
File gid_File_Dl_Libxml2
LIB_FILE_BODY;
@@ -837,23 +697,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Dl_Profile_Jvmfwk3rc,
gid_File_Dl_Jpipe,
gid_File_Dl_Jpipx,
- gid_File_Dl_Acceptor,
- gid_File_Dl_Binaryurp,
- gid_File_Dl_Bootstrap,
- gid_File_Dl_Connector,
- gid_File_Dl_Introspection,
- gid_File_Dl_Invocadapt,
- gid_File_Dl_Invocation,
- gid_File_Dl_Javaloader,
- gid_File_Dl_Javavm,
- gid_File_Dl_Namingservice,
- gid_File_Dl_Proxyfac,
- gid_File_Dl_Reflection,
- gid_File_Dl_Stocservices,
- gid_File_Dl_Streams,
- gid_File_Dl_Textinstream,
- gid_File_Dl_Textoutstream,
- gid_File_Dl_Uuresolver,
gid_File_Dl_Libxml2,
gid_File_Lib_Mingw_GccS_Ure,
gid_File_Lib_Mingw_Stdcpp_Ure,
More information about the Libreoffice-commits
mailing list