From 77d3777c8934171a9557a96872d020cf12443fb9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 13 Dec 2012 16:52:50 +0100 Subject: Remove --with-stlport from LO 4.0 The STLport was only built for the benefit of old extensions on platforms that once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We deliberately break such old extensions for LO 4.0 by no longer shipping that backwards-compatiblity cludge. Keeps STLport listed in readlicense_oo/ because of o3tl/inc/o3tl/compat_functionality.hxx. Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?). Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from l10ntools/inc/helpmerge.hxx that was once added with 854812584862d0609b695682d2bfea2667d75c00 "INTEGRATION: CWS extensionl10nfix01 (1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename -> MoveFileEx" but now starts to cause trouble on Windows. Also disables warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both tools/wintypes.hxx and the Windows API) in a number of places that include windows.h -- however the old STLport caused those warnings to not show. Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829 --- ure/source/README | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'ure/source/README') diff --git a/ure/source/README b/ure/source/README index 2512d5681297..7d7654d3cd22 100644 --- a/ure/source/README +++ b/ure/source/README @@ -37,8 +37,6 @@ Linux x86, Solaris x86, and Solaris SPARC: /opt/openoffice.org/ure/lib/libuno_sal.so.3 /opt/openoffice.org/ure/lib/libuno_salhelpergcc3.so.3 [Linux x86 only] /opt/openoffice.org/ure/lib/libuno_salhelperC52.so.3 [Solaris only] -/opt/openoffice.org/ure/lib/libstlport_gcc.so [Linux x86 only] -/opt/openoffice.org/ure/lib/libstlport_sunpro.so [Solaris only] /opt/openoffice.org/ure/share/java/unoloader.jar /opt/openoffice.org/ure/share/java/juh.jar /opt/openoffice.org/ure/share/java/jurt.jar @@ -105,7 +103,6 @@ Program Files\URE\bin\cppuhelper3MSC.dll Program Files\URE\bin\purpenvhelper3MSC.dll Program Files\URE\bin\sal3.dll Program Files\URE\bin\salhelper3MSC.dll -Program Files\URE\bin\stlport_vc7145.dll Program Files\URE\java\unoloader.jar Program Files\URE\java\juh.jar Program Files\URE\java\jurt.jar @@ -200,11 +197,6 @@ functionality that these libraries offer, see the "C++ Reference" section of the SDK HTML documentation. The corresponding C++ header files are not in the URE, but rather in the SDK. -- stlport is the dynamic library of STLport 4.5, which is used in the public -interface of cppuhelper and salhelper, and thus also has to be part of the -public interface of the URE. The corresponding C++ header files are not in the -URE, but rather in the SDK. - - unoloader.jar, juh.jar, jurt.jar, and ridl.jar are the public Java UNO runtime Java[tm] Archives (JARs) that client code can call. For details on the functionality that these files offer, see the "Java UNO Runtime Reference" @@ -334,10 +326,10 @@ C++ and Java UNO Components C++ UNO components run from within the uno executable can depend on an environment in which the public C++ UNO runtime dynamic libraries (cppu, -cppuhelper, purpenvhelper, sal, salhelper, stlport) and the external dynamic -libraries (libxml2 etc.) are already available (that is, on Linux x86, Solaris -x86, and Solaris SPARC, a component dynamic library need not make sure that the -UNO runtime dynamic libraries it needs can be found on its RPATH). +cppuhelper, purpenvhelper, sal, salhelper) and the external dynamic libraries +(libxml2 etc.) are already available (that is, on Linux x86, Solaris x86, and +Solaris SPARC, a component dynamic library need not make sure that the UNO +runtime dynamic libraries it needs can be found on its RPATH). Similarly, Java UNO components can depend on an environment in which the public Java UNO runtime JARs are already available (that is, a component JAR need not -- cgit