ooo-build r13692 - in trunk: . patches/dev300

[michael svn gnome org]

Author: michael
Date: Wed Aug 27 09:19:06 2008
New Revision: 13692
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13692&view=rev

Log:
2008-08-27  Michael Meeks  <michael meeks novell com>

        * patches/dev300/speed-local-link.diff: update to fix bit-rot.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/speed-local-link.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 27 09:19:06 2008
@@ -746,6 +746,7 @@
 
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
+# this is an increasingly marginal win ...
 speed-local-link-except.diff, i#63927, michael
 speed-local-link.diff, i#63927, michael
 

Modified: trunk/patches/dev300/speed-local-link.diff
==============================================================================
--- trunk/patches/dev300/speed-local-link.diff	(original)
+++ trunk/patches/dev300/speed-local-link.diff	Wed Aug 27 09:19:06 2008
@@ -1,11 +1,20 @@
 Index: cppuhelper/source/shlib.cxx
 ===================================================================
 RCS file: /cvs/udk/cppuhelper/source/shlib.cxx,v
-retrieving revision 1.22
-diff -u -p -u -r1.22 shlib.cxx
---- cppuhelper/source/shlib.cxx	8 Sep 2005 09:29:11 -0000	1.22
-+++ cppuhelper/source/shlib.cxx	3 Apr 2006 09:50:34 -0000
-@@ -272,6 +272,117 @@ static OUString makeComponentPath(
+retrieving revision 1.30
+diff -u -r1.30 shlib.cxx
+--- cppuhelper/source/shlib.cxx	11 Apr 2008 11:37:03 -0000	1.30
++++ cppuhelper/source/shlib.cxx	27 Aug 2008 09:01:16 -0000
+@@ -41,6 +41,8 @@
+ #include "uno/mapping.hxx"
+ #include "cppuhelper/factory.hxx"
+ #include "cppuhelper/shlib.hxx"
++#include "cppuhelper/bootstrap.hxx"
++#include <com/sun/star/lang/IllegalArgumentException.hpp>
+ 
+ #include "com/sun/star/beans/XPropertySet.hpp"
+ 
+@@ -275,6 +277,141 @@
      return out;
  }
  
@@ -21,13 +30,16 @@
 +	static const char *pLookup[] = {
 +		"behelper.uno.so",
 +		"configmgr2.uno.so",
++		"deploymentli.uno.so",
 +		"fsstorage.uno.so",
 +		"gconfbe1.uno.so",
 +		"i18npool.uno.so",
 +		"introspection.uno.so",
++		"ldapbe2.uno.so",
 +		"libanimcore.so",
 +		"libevtatt.so",
 +		"libfileacc.so",
++		"libfilterconfig1.so",
 +		"libgcc3_uno.so",
 +		"liblocaledata_en.so",
 +		"liblocaledata_es.so",
@@ -50,6 +62,7 @@
 +		"typemgr.uno.so",
 +		"reflection.uno.so",
 +		"sax.uno.so",
++		"stocservices.uno.so",
 +		"streams.uno.so",
 +		"sysmgr1.uno.so",
 +		"typeconverter.uno.so",
@@ -59,9 +72,13 @@
 +	};
 +
 +	// Perhaps do some cunning binary search ?
-+	for (int i = 0; pLookup[i] != NULL; i++)
-+		if (rLibName.match (pLookup[i]))
-+			return true;
++	for (int i = 0; pLookup[i] != NULL; i++) {
++	  bool match = rLibName.indexOf (pLookup[i]) > 0;
++//	  fprintf (stderr, "Match '%s' vs. '%s' : %d\n",
++//		   (const sal_Char *)rLibName, pLookup[i], match);
++	  if (match)
++	    return true;
++	  }
 +
 +	return false;
 +}
@@ -80,19 +97,24 @@
 +	if (getenv ("OOO_DISABLE_INTERNAL"))
 +		return false;
 +
++//	fprintf (stderr, "Lib path '%s' ",
++//			 (const sal_Char *)rtl::OUStringToOString(rPath, RTL_TEXTENCODING_ASCII_US));
++//	fprintf (stderr, "name '%s' - test:\n",
++//			 (const sal_Char *)rtl::OUStringToOString(rLibName, RTL_TEXTENCODING_ASCII_US));
++
 +	bool bIsInternal = false;
 +
 +	// Is this an internal library ?
 +	if (rPath.getLength() > 0 && rPath != get_this_libpath())
 +	{
-+	//	fprintf (stderr, "Lib path '%s' - not internal!\n",
-+	//			 (const sal_Char *)rtl::OUStringToOString(rPath, RTL_TEXTENCODING_ASCII_US));
++//	fprintf (stderr, "Lib path '%s' - not internal!\n",
++//			 (const sal_Char *)rtl::OUStringToOString(rPath, RTL_TEXTENCODING_ASCII_US));
 +		return false;
 +	}
 +
 +	sal_Int32 nUpd = SUPD;
-+	OUString aIntSuffix = OUString::valueOf(nUpd) + OUSTR("li.so");
-+	if (rLibName.match (aIntSuffix))
++	OUString aIntSuffix = OUSTR("li.so");
++	if (rLibName.indexOf (aIntSuffix) > 0)
 +		bIsInternal = true;
 +
 +	if (!bIsInternal)
@@ -103,13 +125,24 @@
 +	static bool bHaveLoadedExcepts = false;
 +	if (bIsInternal && !bHaveLoadedExcepts)
 +	{
-+		rtl::OUString aExceptName = rtl::OUString::createFromAscii("libexlink") + aIntSuffix;
++		rtl::OUString aExceptTmpl = rtl::OUString::createFromAscii("vnd.sun.star.expand:$OOO_BASE_DIR/program/libexlink") + aIntSuffix;
++		rtl::OUString aExceptName;
++		try
++		  {
++		    aExceptName = cppu::bootstrap_expandUri( aExceptTmpl );
++		  }
++		catch ( ::com::sun::star::lang::IllegalArgumentException & e ) {}
 +		oslModule nExceptLib = osl_loadModule(aExceptName.pData, 
-+											  SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
-+		if (nExceptLib != NULL)
++						      SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL);
++		if (nExceptLib != NULL) {
 +			bHaveLoadedExcepts = true;
-+		else
++//			fprintf (stderr, "Loaded'%s'\n",
++//				 (const sal_Char *)rtl::OUStringToOString(aExceptName, RTL_TEXTENCODING_ASCII_US));
++		} else {
 +			bIsInternal = false;
++//			fprintf (stderr, "Failed to load'%s'\n",
++//				 (const sal_Char *)rtl::OUStringToOString(aExceptName, RTL_TEXTENCODING_ASCII_US));
++		}
 +	}
 +
 +//	fprintf (stderr, "Lib name '%s' %d %d\n",
@@ -121,9 +154,9 @@
 +#endif
 +
  //==============================================================================
- Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
-     OUString const & rLibName, OUString const & rPath,
-@@ -288,9 +396,17 @@ Reference< XInterface > SAL_CALL loadSha
+ static OUString getLibEnv(OUString         const & aModulePath,
+                           oslModule                lib, 
+@@ -346,9 +483,17 @@
              aModulePath,
              Reference< XInterface >() );
      }