diff options
-rw-r--r-- | Repository.mk | 18 | ||||
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | 8 | ||||
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 12 | ||||
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 6 | ||||
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml | 2 | ||||
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 4 | ||||
-rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 6 | ||||
-rw-r--r-- | sal/textenc/textenc.cxx | 3 | ||||
-rw-r--r-- | solenv/gbuild/Helper.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/android.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/mingw.mk | 7 | ||||
-rw-r--r-- | solenv/gbuild/platform/solaris.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 4 | ||||
-rw-r--r-- | ure/source/README | 101 |
17 files changed, 96 insertions, 97 deletions
diff --git a/Repository.mk b/Repository.mk index f69f10ff0f0f..8c627637e913 100644 --- a/Repository.mk +++ b/Repository.mk @@ -449,21 +449,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ $(if $(ENABLE_JAVA),java_uno) \ $(if $(ENABLE_JAVA),juh) \ $(if $(ENABLE_JAVA),juhx) \ - $(if $(ENABLE_JAVA),jvmaccess) \ - $(if $(ENABLE_JAVA),jvmfwk) \ log_uno \ - reg \ - sal_textenc \ - store \ - $(if $(ENABLE_JAVA),sunjavaplugin) \ - unoidl \ unsafe_uno \ $(if $(URELIBS),urelibs) \ - xmlreader \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ )) -$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \ +$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \ acceptor \ binaryurp \ bootstrap \ @@ -473,14 +465,22 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \ invocation \ $(if $(ENABLE_JAVA),javaloader) \ $(if $(ENABLE_JAVA),javavm) \ + $(if $(ENABLE_JAVA),jvmaccess) \ + $(if $(ENABLE_JAVA),jvmfwk) \ namingservice \ proxyfac \ reflection \ + reg \ + sal_textenc \ stocservices \ + store \ streams \ + $(if $(ENABLE_JAVA),sunjavaplugin) \ textinstream \ textoutstream \ + unoidl \ uuresolver \ + xmlreader \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml index 2453492ff535..bfd80e0a926a 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -38,9 +38,9 @@ </vendorInfos> <plugins> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 2ff994675229..311bf8146c0f 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -44,11 +44,11 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 172b570a67cc..aa8b423a348e 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -34,8 +34,8 @@ </vendor> </vendorInfos> <plugins> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> - <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> - <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library> + <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library> + <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.dylib</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml index 8b847b95459e..9bc0c4119da4 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml @@ -46,7 +46,7 @@ look like. </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">libsunjavaplugin.dll</library> + <library vendor="Sun Microsystems Inc.">libsunjavapluginlo.dll</library> <library vendor="VendorX">./pluginDir/vendorx.dll</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index 8430a010b867..e9bbd68887fc 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -32,7 +32,7 @@ </vendorInfos> <plugins> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index e48037f697df..5b33aad6a777 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -35,8 +35,8 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> - <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library> + <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavapluginlo.dll</library> </plugins> </javaSelection> diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 06821a363e55..68d2f8bf8ecf 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -380,7 +380,8 @@ void SAL_CALL thisModule() {} class FullTextEncodingData: private boost::noncopyable { public: FullTextEncodingData() { - if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenc"))) { + if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenclo"))) + { SAL_WARN( "sal.textenc", "Loading sal_textenc library failed" ); std::abort(); } diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index b017a40a3b64..8505d760d181 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -108,7 +108,7 @@ endef define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE -gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS +gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO PRIVATELIBS_URE RTVERLIBS UNOVERLIBS EXTENSIONLIBS gb_Jar_VALIDGROUPS := URE OOO OXT NONE $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=)) diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 2724a3574c16..f4ef48aebf2a 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -168,8 +168,8 @@ 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_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(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_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ @@ -179,8 +179,8 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \ + $(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 47743375161a..6741c6eef389 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -76,8 +76,8 @@ 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_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(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_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ @@ -91,8 +91,8 @@ gb_Library_LAYER := \ $(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \ $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \ + $(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):OOO) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):OOO) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):OOO) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index f5d299faf362..62071733e898 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -238,8 +238,8 @@ 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_PRIVATELIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ @@ -259,8 +259,8 @@ 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_PRIVATELIBS_URE),$(lib):$(lib)$(gb_Library_OOOEXT)) \ $(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_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 1423d1136f56..c03efa479d88 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -213,8 +213,8 @@ 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_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(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_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ @@ -224,8 +224,8 @@ 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_PRIVATELIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index 7cc710a72c1c..d93fcce970a8 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -182,7 +182,6 @@ gb_Library_DLLEXT := .dll gb_Library_RTDLLEXT := gcc3$(gb_Library_DLLEXT) gb_Library_RTVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTDLLEXT) gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT) -gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT) gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT) gb_Library_LAYER := \ @@ -190,8 +189,8 @@ 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_PRIVATELIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ @@ -200,8 +199,8 @@ 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_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(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_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ @@ -211,8 +210,8 @@ 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_PRIVATELIBS_URE),$(lib):$(lib)$(gb_Library_OOODLLEXT)) \ $(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_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 4bf95b09ff22..d9c1bb5206f8 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -242,8 +242,8 @@ 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_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(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_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ @@ -253,8 +253,8 @@ 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_PRIVATELIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index ac549fcd8807..02ecb6cad204 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -239,8 +239,8 @@ 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_PRIVATELIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \ $(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_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ @@ -250,8 +250,8 @@ 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_PRIVATELIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \ - $(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ diff --git a/ure/source/README b/ure/source/README index 345a3e7742aa..88c44924b387 100644 --- a/ure/source/README +++ b/ure/source/README @@ -48,14 +48,13 @@ Linux x86, Solaris x86, and Solaris SPARC: /opt/openoffice.org/ure/bin/startup.sh [private] /opt/openoffice.org/ure/bin/uno.bin [private] /opt/openoffice.org/ure/lib/unorc [private] -/opt/openoffice.org/ure/lib/libreg.so.3 [private] -/opt/openoffice.org/ure/lib/libstore.so.3 [private] -/opt/openoffice.org/ure/lib/libunoidl.so [private] -/opt/openoffice.org/ure/lib/libxmlreader.so [private] -/opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3 [private; Linux x86 only] -/opt/openoffice.org/ure/lib/libjvmaccessC52.so.3 [private; Solaris only] -/opt/openoffice.org/ure/lib/libjvmfwk.so.3 [private] -/opt/openoffice.org/ure/lib/libsunjavaplugin.so [private] +/opt/openoffice.org/ure/lib/libreglo.so [private] +/opt/openoffice.org/ure/lib/libstorelo.so [private] +/opt/openoffice.org/ure/lib/libunoidllo.so [private] +/opt/openoffice.org/ure/lib/libxmlreaderlo.so [private] +/opt/openoffice.org/ure/lib/libjvmaccesslo.so [private] +/opt/openoffice.org/ure/lib/libjvmfwklo.so [private] +/opt/openoffice.org/ure/lib/libsunjavapluginlo.so [private] /opt/openoffice.org/ure/lib/JREProperties.class [private] /opt/openoffice.org/ure/lib/jvmfwk3rc [private] /opt/openoffice.org/ure/lib/libgcc3_uno.so [private; Linux x86 only] @@ -67,24 +66,24 @@ Linux x86, Solaris x86, and Solaris SPARC: /opt/openoffice.org/ure/lib/libjpipe.so [private] /opt/openoffice.org/ure/lib/libjuh.so [private] /opt/openoffice.org/ure/lib/libjuhx.so [private] -/opt/openoffice.org/ure/lib/libsal_textenc.so [private] -/opt/openoffice.org/ure/lib/acceptor.uno.so [private] -/opt/openoffice.org/ure/lib/binaryurp.uno.so [private] -/opt/openoffice.org/ure/lib/bootstrap.uno.so [private] -/opt/openoffice.org/ure/lib/connector.uno.so [private] -/opt/openoffice.org/ure/lib/introspection.uno.so [private] -/opt/openoffice.org/ure/lib/invocadapt.uno.so [private] -/opt/openoffice.org/ure/lib/invocation.uno.so [private] -/opt/openoffice.org/ure/lib/javaloader.uno.so [private] -/opt/openoffice.org/ure/lib/javavm.uno.so [private] -/opt/openoffice.org/ure/lib/namingservice.uno.so [private] -/opt/openoffice.org/ure/lib/proxyfac.uno.so [private] -/opt/openoffice.org/ure/lib/reflection.uno.so [private] -/opt/openoffice.org/ure/lib/streams.uno.so [private] -/opt/openoffice.org/ure/lib/textinstream.uno.so [private] -/opt/openoffice.org/ure/lib/textoutstream.uno.so [private] -/opt/openoffice.org/ure/lib/stocservices.uno.so [private] -/opt/openoffice.org/ure/lib/uuresolver.uno.so [private] +/opt/openoffice.org/ure/lib/libsal_textenclo.so [private] +/opt/openoffice.org/ure/lib/libacceptorlo.so [private] +/opt/openoffice.org/ure/lib/libbinaryurplo.so [private] +/opt/openoffice.org/ure/lib/libbootstraplo.so [private] +/opt/openoffice.org/ure/lib/libconnectorlo.so [private] +/opt/openoffice.org/ure/lib/libintrospectionlo.so [private] +/opt/openoffice.org/ure/lib/libinvocadaptlo.so [private] +/opt/openoffice.org/ure/lib/libinvocationlo.so [private] +/opt/openoffice.org/ure/lib/libjavaloaderlo.so [private] +/opt/openoffice.org/ure/lib/libjavavmlo.so [private] +/opt/openoffice.org/ure/lib/libnamingservicelo.so [private] +/opt/openoffice.org/ure/lib/libproxyfaclo.so [private] +/opt/openoffice.org/ure/lib/libreflectionlo.so [private] +/opt/openoffice.org/ure/lib/libstreamslo.so [private] +/opt/openoffice.org/ure/lib/libtextinstreamlo.so [private] +/opt/openoffice.org/ure/lib/libtextoutstreamlo.so [private] +/opt/openoffice.org/ure/lib/libstocserviceslo.so [private] +/opt/openoffice.org/ure/lib/libuuresolverlo.so [private] /opt/openoffice.org/ure/share/java/java_uno.jar [private] /opt/openoffice.org/ure/share/misc/javavendors.xml [private] @@ -109,13 +108,13 @@ Program Files\URE\misc\types.rdb Program Files\URE\misc\services.rdb Program Files\URE\bin\libxml2.dll [external] Program Files\URE\bin\uno.ini [private] -Program Files\URE\bin\reg3.dll [private] -Program Files\URE\bin\store3.dll [private] -Program Files\URE\bin\unoidl.dll [private] -Program Files\URE\bin\xmlreader.dll [private] -Program Files\URE\bin\jvmaccess3MSC.dll [private] -Program Files\URE\bin\jvmfwk3.dll [private] -Program Files\URE\bin\libsunjavaplugin.dll [private] +Program Files\URE\bin\reglo.dll [private] +Program Files\URE\bin\storelo.dll [private] +Program Files\URE\bin\unoidllo.dll [private] +Program Files\URE\bin\xmlreaderlo.dll [private] +Program Files\URE\bin\jvmaccesslo.dll [private] +Program Files\URE\bin\jvmfwklo.dll [private] +Program Files\URE\bin\sunjavapluginlo.dll [private] Program Files\URE\bin\JREProperties.class [private] Program Files\URE\bin\jvmfwk3.ini [private] Program Files\URE\bin\msci_uno.dll [private] @@ -128,24 +127,24 @@ Program Files\URE\bin\jpipe.dll [private] Program Files\URE\bin\jpipx.dll [private] Program Files\URE\bin\juh.dll [private] Program Files\URE\bin\juhx.dll [private] -Program Files\URE\bin\sal_textenc.dll [private] -Program Files\URE\bin\acceptor.uno.dll [private] -Program Files\URE\bin\binaryurp.uno.dll [private] -Program Files\URE\bin\bootstrap.uno.dll [private] -Program Files\URE\bin\connector.uno.dll [private] -Program Files\URE\bin\introspection.uno.dll [private] -Program Files\URE\bin\invocadapt.uno.dll [private] -Program Files\URE\bin\invocation.uno.dll [private] -Program Files\URE\bin\javaloader.uno.dll [private] -Program Files\URE\bin\javavm.uno.dll [private] -Program Files\URE\bin\namingservice.uno.dll [private] -Program Files\URE\bin\proxyfac.uno.dll [private] -Program Files\URE\bin\reflection.uno.dll [private] -Program Files\URE\bin\streams.uno.dll [private] -Program Files\URE\bin\textinstream.uno.dll [private] -Program Files\URE\bin\textoutstream.uno.dll [private] -Program Files\URE\bin\stocservices.uno.dll [private] -Program Files\URE\bin\uuresolver.uno.dll [private] +Program Files\URE\bin\sal_textenclo.dll [private] +Program Files\URE\bin\acceptorlo.dll [private] +Program Files\URE\bin\binaryurplo.dll [private] +Program Files\URE\bin\bootstraplo.dll [private] +Program Files\URE\bin\connectorlo.dll [private] +Program Files\URE\bin\introspectionlo.dll [private] +Program Files\URE\bin\invocadaptlo.dll [private] +Program Files\URE\bin\invocationlo.dll [private] +Program Files\URE\bin\javaloaderlo.dll [private] +Program Files\URE\bin\javavmlo.dll [private] +Program Files\URE\bin\namingservicelo.dll [private] +Program Files\URE\bin\proxyfaclo.dll [private] +Program Files\URE\bin\reflectionlo.dll [private] +Program Files\URE\bin\streamslo.dll [private] +Program Files\URE\bin\textinstreamlo.dll [private] +Program Files\URE\bin\textoutstreamlo.dll [private] +Program Files\URE\bin\stocserviceslo.dll [private] +Program Files\URE\bin\uuresolverlo.dll [private] Program Files\URE\bin\uwinapi.dll [private] Program Files\URE\java\java_uno.jar [private] Program Files\URE\misc\javavendors.xml [private] |