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

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15185 - in trunk: . patches/dev300
Date: Wed, 28 Jan 2009 00:26:15 +0000 (UTC)
Author: kyoshida
Date: Wed Jan 28 00:26:15 2009
New Revision: 15185
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15185&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/speed-local-link-except-m39.diff:
	* patches/dev300/speed-local-link-except.diff:	
	* patches/dev300/apply: adjusted for dev300-m40.
	
	* patches/dev300/speed-local-link-except-offuh.diff: I needed to 
	separate this one out of the above patch, because someone in the 
	upstream converted the file this one patches to end with CR charcters.
	Unfortunately gnome.org's svn repo doesn't like a file with inconsistent
	line endings.


Added:
   trunk/patches/dev300/speed-local-link-except-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/speed-local-link-except.diff
   trunk/patches/dev300/speed-local-link-except-offuh.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/speed-local-link-except.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 00:26:15 2009
@@ -1127,10 +1127,20 @@
 # temp fix, removed call that causes crash ( need understand and fix this
 # properly )
 vba-xl-import-crash.diff, noelpwer
-[ LinuxOnly ]
+
+[ LinuxOnly <= dev300-m39 ]
+# accelerate linking, by extreme cunning i#63927
+# this is an increasingly marginal win ...
+speed-local-link-except-m39.diff, i#63927, michael
+
+[ LinuxOnly > dev300-m39 ]
 # accelerate linking, by extreme cunning i#63927
 # this is an increasingly marginal win ...
 speed-local-link-except.diff, i#63927, michael
+# the file this one patches ends with CR chars... :-(
+speed-local-link-except-offuh.diff
+
+[ LinuxOnly ]
 speed-local-link.diff, i#63927, michael
 
 # make some symbols from svtools visible for the kde fpicker when compiling with gcc4

Added: trunk/patches/dev300/speed-local-link-except-offuh.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/speed-local-link-except-offuh.diff	Wed Jan 28 00:26:15 2009
@@ -0,0 +1,14 @@
+diff --git offuh/prj/d.lst offuh/prj/d.lst
+index 8ec679a..fab4ddf 100644
+--- offuh/prj/d.lst
++++ offuh/prj/d.lst
+@@ -347,6 +347,9 @@ mkdir: %_DEST%\inc%_EXT%\offuh\com\sun\star\rdf
+ 
+ ..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse\*.hpp
+ ..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse\*.hdl
++
++..\%__SRC%\inc\offuh\linking_catch.hxx %_DEST%\inc%_EXT%\offuh\linking_catch.hxx
++
+ ..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider\*.hpp
+ ..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider\*.hdl
+ 

Modified: trunk/patches/dev300/speed-local-link-except.diff
==============================================================================
--- trunk/patches/dev300/speed-local-link-except.diff	(original)
+++ trunk/patches/dev300/speed-local-link-except.diff	Wed Jan 28 00:26:15 2009
@@ -1,137 +1,8 @@
---- /dev/null
-+++ cppu/source/except/except.cxx
-@@ -0,0 +1,15 @@
-+#include <sal/config.h>
-+#include <cppu/macros.hxx>
-+#include <com/sun/star/uno/Any.hxx>
-+#include <com/sun/star/uno/Reference.hxx>
-+
-+// We don't want to hide all this shared goodness:
-+#undef CPPU_GCC_DLLPUBLIC_EXPORT
-+#define CPPU_GCC_DLLPUBLIC_EXPORT 
-+#undef CPPU_GCC_DLLPRIVATE
-+#define CPPU_GCC_DLLPRIVATE 
-+
-+#define CPPU_INTERNAL_IMPL 1 
-+
-+#include <linking_catch.hxx>
-+
-
-
---- /dev/null	2006-03-11 13:25:00.000000000 +0000
-+++ cppu/source/except/makefile.mk	2006-03-17 11:44:41.000000000 +0000
-@@ -0,0 +1,21 @@
-+# --- Settings -----------------------------------------------------
-+
-+PRJ=..$/..
-+
-+PRJNAME=cppu
-+TARGET=unotypes
-+ENABLE_EXCEPTIONS=TRUE
-+
-+.INCLUDE :  settings.mk
-+
-+LIB1TARGET= $(SLB)$/$(TARGET).lib
-+LIB1OBJFILES= $(SLO)$/except.obj
-+
-+SHL1TARGET=exlink$(DLLPOSTFIX)
-+SHL1LIBS=$(LIB1TARGET)
-+SHL1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CPPULIB)
-+
-+# --- Targets -------------------------------------------------------
-+
-+.INCLUDE :  target.mk
-+
-
-
---- cppu/prj/build.lst      2007-05-09 14:35:41.000000000 +0100
-+++ cppu/prj/build.lst  2007-07-09 14:13:10.000000000 +0100
-@@ -8,4 +8,5 @@
- cu     cppu\source\helper\purpenv              nmake   -       all     cu_helper_purpenv cu_inc NULL
- cu     cppu\source\UnsafeBridge            nmake       -       all     cu_UnsafeBridge cu_inc NULL
- cu     cppu\source\AffineBridge            nmake       -       all     cu_AffineBridge cu_inc NULL
--cu     cppu\util                                               nmake   -       all     cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge NULL
-+cu     cppu\util                                               nmake   -       all     cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge NULL
-+cu     cppu\source\except                      nmake   -       all cu_except cu_util NULL
-
-
- diff -u -p -r1.19 d.lst
---- cppu/prj/d.lst      9 May 2007 13:35:55 -0000       1.19
-+++ cppu/prj/d.lst      9 Jul 2007 11:21:58 -0000
-@@ -56,6 +56,7 @@ mkdir: %_DEST%\inc%_EXT%\uno
- ..\%__SRC%\lib\icppu.lib %_DEST%\lib%_EXT%\icppu.lib
- ..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\*
- ..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\*
-+..\%__SRC%\lib\libexlink* %_DEST%\lib%_EXT%\*
- 
- ..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib%_EXT%\*
- ..\%__SRC%\bin\purpenvhelper*.dll     %_DEST%\bin%_EXT%\*
-
-
-Index: scp2/source/ooo/file_library_ooo.scp
-===================================================================
-RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
-retrieving revision 1.184.2.2
-diff -u -p -u -r1.184.2.2 file_library_ooo.scp
---- scp2/source/ooo/file_library_ooo.scp	17 Feb 2006 16:52:02 -0000	1.184.2.2
-+++ scp2/source/ooo/file_library_ooo.scp	3 Apr 2006 10:13:58 -0000
-@@ -468,6 +490,15 @@ STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl
- 
- STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
- 
-+#ifdef LINUX
-+File gid_File_Lib_ExLib
-+    TXT_FILE_BODY;
-+    Styles = (PACKED,PATCH);
-+    Dir = gid_Dir_Program;
-+    Name = LIBNAME(exlink);
-+End
-+#endif
-+
- #ifndef SYSTEM_CURL
- 
- File gid_File_Lib_Curl
-
-
-diff -u -p -u -r1.7 makefile.mk
---- offuh/source/makefile.mk	8 Sep 2005 15:51:01 -0000	1.7
-+++ offuh/source/makefile.mk	12 Apr 2006 14:48:09 -0000
-@@ -45,7 +45,7 @@ TARGET=		offuh
- 
- $(MISC)$/$(TARGET).don : $(UNOUCRRDB)
- 	@@-$(RM) $@
--	$(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
-+	$(CPPUMAKER) -E$(UNOUCROUT)/linking_catch.hxx -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
- 
- # --- Targets ------------------------------------------------------
- 
-
-Index: offuh/prj/d.lst
-===================================================================
-RCS file: /cvs/api/offuh/prj/d.lst,v
-retrieving revision 1.59
-diff -u -p -u -r1.59 d.lst
---- offuh/prj/d.lst     9 Jun 2005 14:54:16 -0000       1.59
-+++ offuh/prj/d.lst     3 Apr 2006 09:56:29 -0000
-@@ -319,6 +326,9 @@ mkdir: %_DEST%\inc%_EXT%\com\sun\star\xm
- 
- ..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse\*.hpp
- ..\%__SRC%\inc\offuh\com\sun\star\script\browse\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\browse\*.hdl
-+
-+..\%__SRC%\inc\offuh\linking_catch.hxx %_DEST%\inc%_EXT%\offuh\linking_catch.hxx
-+
- ..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hpp %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider\*.hpp
- ..\%__SRC%\inc\offuh\com\sun\star\script\provider\*.hdl %_DEST%\inc%_EXT%\offuh\com\sun\star\script\provider\*.hdl
- 
-
-Index: codemaker/source/cppumaker/cppumaker.cxx
-===================================================================
-RCS file: /cvs/udk/codemaker/source/cppumaker/cppumaker.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 cppumaker.cxx
---- codemaker/source/cppumaker/cppumaker.cxx	8 Sep 2005 02:11:34 -0000	1.8
-+++ codemaker/source/cppumaker/cppumaker.cxx	12 Apr 2006 14:47:29 -0000
-@@ -39,6 +39,7 @@
+diff --git codemaker/source/cppumaker/cppumaker.cxx codemaker/source/cppumaker/cppumaker.cxx
+index d2be93f..31bf594 100644
+--- codemaker/source/cppumaker/cppumaker.cxx
++++ codemaker/source/cppumaker/cppumaker.cxx
+@@ -37,6 +37,7 @@
  
  #include "codemaker/typemanager.hxx"
  #include "codemaker/generatedtypeset.hxx"
@@ -139,7 +10,7 @@
  
  #include "cppuoptions.hxx"
  #include "cpputype.hxx"
-@@ -245,6 +245,43 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+@@ -241,6 +242,43 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
  		exit(99);
  	}
  
@@ -183,14 +54,11 @@
  	return 0;
  }
  
-Index: codemaker/source/cppumaker/cppuoptions.cxx
-===================================================================
-RCS file: /cvs/udk/codemaker/source/cppumaker/cppuoptions.cxx,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 cppuoptions.cxx
---- codemaker/source/cppumaker/cppuoptions.cxx	8 Sep 2005 02:11:54 -0000	1.9
-+++ codemaker/source/cppumaker/cppuoptions.cxx	12 Apr 2006 14:47:29 -0000
-@@ -71,6 +71,9 @@ sal_Bool CppuOptions::initOptions(int ac
+diff --git codemaker/source/cppumaker/cppuoptions.cxx codemaker/source/cppumaker/cppuoptions.cxx
+index cdce000..1f9119b 100644
+--- codemaker/source/cppumaker/cppuoptions.cxx
++++ codemaker/source/cppumaker/cppuoptions.cxx
+@@ -70,6 +70,9 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
  		{
  			switch (av[i][1])
  			{
@@ -200,7 +68,7 @@
  				case 'O':
  					if (av[i][2] == '\0')
  					{
-@@ -335,6 +338,7 @@ OString	CppuOptions::prepareHelp()
+@@ -342,6 +345,7 @@ OString	CppuOptions::prepareHelp()
  	help += "    -G         = generate only target files which does not exists.\n";
  	help += "    -Gc        = generate only target files which content will be changed.\n";
  	help += "    -X<file>   = extra types which will not be taken into account for generation.\n";
@@ -208,15 +76,11 @@
  	help += prepareVersion();
  	
  	return help;
-Index: codemaker/source/cppumaker/cpputype.cxx
-===================================================================
-RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.cxx,v
-retrieving revision 1.37
-diff -u -p -u -r1.37 cpputype.cxx
---- codemaker/source/cppumaker/cpputype.cxx	26 Jan 2006 17:42:38 -0000	1.37
-+++ codemaker/source/cppumaker/cpputype.cxx	12 Apr 2006 14:47:30 -0000
-@@ -56,7 +56,9 @@
- 
+diff --git codemaker/source/cppumaker/cpputype.cxx codemaker/source/cppumaker/cpputype.cxx
+index 69fa71a..7a2359f 100644
+--- codemaker/source/cppumaker/cpputype.cxx
++++ codemaker/source/cppumaker/cpputype.cxx
+@@ -56,6 +56,8 @@
  using namespace rtl;
  using namespace codemaker::cpp;
  
@@ -224,8 +88,8 @@
 +
  namespace {
  
- rtl::OString translateSimpleUnoType(rtl::OString const & unoType) {
-@@ -3265,6 +3267,13 @@ sal_Bool ExceptionType::dumpHFile(
+ rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoType=false) {
+@@ -3077,6 +3079,13 @@ sal_Bool ExceptionType::dumpHFile(
  	return sal_True;
  }
  
@@ -239,14 +103,11 @@
  sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
  	throw( CannotDumpException )
  {
-Index: codemaker/source/cppumaker/cpputype.hxx
-===================================================================
-RCS file: /cvs/udk/codemaker/source/cppumaker/cpputype.hxx,v
-retrieving revision 1.9
-diff -u -p -u -r1.9 cpputype.hxx
---- codemaker/source/cppumaker/cpputype.hxx	10 Jan 2006 15:46:47 -0000	1.9
-+++ codemaker/source/cppumaker/cpputype.hxx	12 Apr 2006 14:47:30 -0000
-@@ -61,6 +61,9 @@ enum CppuTypeDecl
+diff --git codemaker/source/cppumaker/cpputype.hxx codemaker/source/cppumaker/cpputype.hxx
+index c8c5f34..2140f3e 100644
+--- codemaker/source/cppumaker/cpputype.hxx
++++ codemaker/source/cppumaker/cpputype.hxx
+@@ -56,6 +56,9 @@ enum CppuTypeDecl
  class CppuOptions;
  class FileStream;
  
@@ -256,7 +117,7 @@
  class CppuType
  {
  public:
-@@ -300,6 +303,7 @@ public:
+@@ -295,6 +298,7 @@ public:
  
  	virtual ~ExceptionType();
  
@@ -264,3 +125,107 @@
  	sal_Bool	dumpDeclaration(FileStream& o) throw( CannotDumpException );
  	sal_Bool	dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
  	sal_Bool	dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
+diff --git cppu/prj/build.lst cppu/prj/build.lst
+index a0caa14..4de1deb 100644
+--- cppu/prj/build.lst
++++ cppu/prj/build.lst
+@@ -8,4 +8,5 @@ cu	cppu\source\cppu				nmake	-	all	cu_cppu cu_inc NULL
+ cu	cppu\source\helper\purpenv		nmake	-	all	cu_helper_purpenv cu_inc NULL
+ cu	cppu\source\UnsafeBridge	    nmake	-	all	cu_UnsafeBridge cu_inc NULL
+ cu	cppu\source\AffineBridge	    nmake	-	all	cu_AffineBridge cu_inc NULL
+-cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge NULL
++cu      cppu\util                                               nmake   -       all     cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge NULL
++cu      cppu\source\except                      nmake   -       all cu_except cu_util NULL
+diff --git cppu/prj/d.lst cppu/prj/d.lst
+index f019d78..c40325b 100644
+--- cppu/prj/d.lst
++++ cppu/prj/d.lst
+@@ -56,6 +56,7 @@ mkdir: %_DEST%\inc%_EXT%\uno
+ ..\%__SRC%\lib\icppu.lib %_DEST%\lib%_EXT%\icppu.lib
+ ..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\*
+ ..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\*
++..\%__SRC%\lib\libexlink* %_DEST%\lib%_EXT%\*
+ 
+ ..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib%_EXT%\*
+ ..\%__SRC%\bin\purpe*.dll     %_DEST%\bin%_EXT%\*
+diff --git cppu/source/except/except.cxx cppu/source/except/except.cxx
+new file mode 100644
+index 0000000..4406885
+--- /dev/null
++++ cppu/source/except/except.cxx
+@@ -0,0 +1,15 @@
++#include <sal/config.h>
++#include <cppu/macros.hxx>
++#include <com/sun/star/uno/Any.hxx>
++#include <com/sun/star/uno/Reference.hxx>
++
++// We don't want to hide all this shared goodness:
++#undef CPPU_GCC_DLLPUBLIC_EXPORT
++#define CPPU_GCC_DLLPUBLIC_EXPORT 
++#undef CPPU_GCC_DLLPRIVATE
++#define CPPU_GCC_DLLPRIVATE 
++
++#define CPPU_INTERNAL_IMPL 1 
++
++#include <linking_catch.hxx>
++
+diff --git cppu/source/except/makefile.mk cppu/source/except/makefile.mk
+new file mode 100644
+index 0000000..66e6328
+--- /dev/null
++++ cppu/source/except/makefile.mk
+@@ -0,0 +1,21 @@
++# --- Settings -----------------------------------------------------
++
++PRJ=..$/..
++
++PRJNAME=cppu
++TARGET=unotypes
++ENABLE_EXCEPTIONS=TRUE
++
++.INCLUDE :  settings.mk
++
++LIB1TARGET= $(SLB)$/$(TARGET).lib
++LIB1OBJFILES= $(SLO)$/except.obj
++
++SHL1TARGET=exlink$(DLLPOSTFIX)
++SHL1LIBS=$(LIB1TARGET)
++SHL1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CPPULIB)
++
++# --- Targets -------------------------------------------------------
++
++.INCLUDE :  target.mk
++
+diff --git offuh/source/makefile.mk offuh/source/makefile.mk
+index 8c490a8..a257099 100644
+--- offuh/source/makefile.mk
++++ offuh/source/makefile.mk
+@@ -41,7 +41,7 @@ TARGET=		offuh
+ 
+ $(MISC)$/$(TARGET).don : $(UNOUCRRDB)
+ 	@@-$(RM) $@
+-	$(CPPUMAKER) -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
++	$(CPPUMAKER) -E$(UNOUCROUT)/linking_catch.hxx -Gc $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOUCRRDB) && echo > $@
+ 
+ # --- Targets ------------------------------------------------------
+ 
+diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
+index dbbe327..abc0c7c 100644
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -200,6 +200,15 @@ STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl)
+ 
+ STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
+ 
++#ifdef LINUX
++File gid_File_Lib_ExLib
++    TXT_FILE_BODY;
++    Styles = (PACKED,PATCH);
++    Dir = gid_Dir_Program;
++    Name = LIBNAME(exlink);
++End
++#endif
++
+ #ifndef SYSTEM_CURL
+ 
+ File gid_File_Lib_Curl
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]