ooo-build r13243 - in trunk: . bin bin/piece doc patches/vba

[michael svn gnome org]

Author: michael
Date: Wed Jul 16 09:26:28 2008
New Revision: 13243
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13243&view=rev

Log:
fix vba patching, split docs, generic build & add src pack comment.


Modified:
   trunk/ChangeLog
   trunk/bin/piece/build-generic
   trunk/bin/src-pack2
   trunk/doc/split.txt
   trunk/patches/vba/ObjectModule.diff

Modified: trunk/bin/piece/build-generic
==============================================================================
--- trunk/bin/piece/build-generic	(original)
+++ trunk/bin/piece/build-generic	Wed Jul 16 09:26:28 2008
@@ -19,10 +19,11 @@
     $custom_unpack $OO_TOOLSDIR/.. `pwd`
 fi
 
+# drop --distro=Localize for now ...
 $OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces \
 	--tag=$ooo_build_tag \
 	--distro=$distro --distro=Piece --distro=Binfilter \
-	--distro=System --distro=Sdk --distro=Localize --distro=swext \
+	--distro=System --distro=Sdk --distro=swext \
 	 `pwd` || exit 1;
 
 dirs=`/bin/ls | grep -v 'applied_patches' | tr '\n' ':'`

Modified: trunk/bin/src-pack2
==============================================================================
--- trunk/bin/src-pack2	(original)
+++ trunk/bin/src-pack2	Wed Jul 16 09:26:28 2008
@@ -1,5 +1,11 @@
 #!/usr/bin/perl -w
 
+#
+# this script is run on go-oo from ~ooweb/ooo-build 
+# to auto-pack the source code on milestone release.
+# don't forget to update it there.
+#
+
 use strict;
 
 # Towards a more modular build ...

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Wed Jul 16 09:26:28 2008
@@ -330,3 +330,7 @@
 	=> we need to ensure that our compile flags [etc.]
 	   include the local intermediate / non-solver.
 
+
+* Debian: doesn't need file lists ...
+* RPM doesn't really need file-lists either 
+

Modified: trunk/patches/vba/ObjectModule.diff
==============================================================================
--- trunk/patches/vba/ObjectModule.diff	(original)
+++ trunk/patches/vba/ObjectModule.diff	Wed Jul 16 09:26:28 2008
@@ -1109,9 +1109,9 @@
                      case 0xDE:  Olesize(); break;
  					case 0x01BA: Codename( TRUE ); break;
  
-diff -rup sc/source/filter/excel/xiescher.cxx sc.patched/source/filter/excel/xiescher.cxx
+diff -rup sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
 --- sc/source/filter/excel/xiescher.cxx	2008-06-03 16:08:20.000000000 +0100
-+++ sc.patched/source/filter/excel/xiescher.cxx	2008-06-03 16:36:05.000000000 +0100
++++ sc/source/filter/excel/xiescher.cxx	2008-06-03 16:36:05.000000000 +0100
 @@ -834,7 +834,7 @@ bool XclImpTbxControlObj::FillMacroDescr
          {
              // set the macro name
@@ -1130,7 +1130,7 @@
                  if ( aHlink.getLength() > 0 )
                  pInfo->SetHlink( aHlink );
              }
-diff -rup sc/source/filter/excel/xlescher.cxx sc.patched/source/filter/excel/xlescher.cxx
+diff -rup sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx
 --- sc/source/filter/excel/xlescher.cxx	2008-05-29 23:19:09.000000000 +0100
 +++ sc/source/filter/excel/xlescher.cxx	2008-06-03 15:38:21.000000000 +0100
 @@ -37,7 +37,10 @@
@@ -1164,9 +1164,9 @@
  }
  
  String XclControlObjHelper::GetXclMacroName( const OUString& rScMacroName )
-diff -rup sc/source/filter/inc/xlescher.hxx sc.patched/source/filter/inc/xlescher.hxx
+diff -rup sc/source/filter/inc/xlescher.hxx sc/source/filter/inc/xlescher.hxx
 --- sc/source/filter/inc/xlescher.hxx	2008-05-29 23:19:09.000000000 +0100
-+++ sc.patched/source/filter/inc/xlescher.hxx	2008-06-03 15:28:12.000000000 +0100
++++ sc/source/filter/inc/xlescher.hxx	2008-06-03 15:28:12.000000000 +0100
 @@ -279,7 +279,7 @@ public:
      static ::rtl::OUString GetTbxScriptType();