ooo-build r15325 - in trunk: . bin doc patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Thu Feb 12 19:53:45 2009
New Revision: 15325
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15325&view=rev

Log:
2009-02-12  Petr Mladek  <pmladek suse cz>

	* configure.in, patches/dev300/apply, download.in: initial support
	  for OOO310 MWS and ooo300-m1; many patches still does not apply;
	  will continue tomorrow

	* bin/src-pack2: generate correct md5sum when the dest directory
	  is defined
	* doc/src-pack2.txt: steps how to pack the upstream sources



Added:
   trunk/doc/src-pack2.txt
Modified:
   trunk/ChangeLog
   trunk/bin/src-pack2
   trunk/configure.in
   trunk/download.in
   trunk/patches/dev300/apply

Modified: trunk/bin/src-pack2
==============================================================================
--- trunk/bin/src-pack2	(original)
+++ trunk/bin/src-pack2	Thu Feb 12 19:53:45 2009
@@ -105,21 +105,21 @@
 
 for my $a (keys %module_map) {
     print STDERR "\tpack $a ...";
-    my $dest_tar = "$dest/$src-$a.tar.bz2";
-    my $cmd = "tar $tar_opts --dereference -f $dest_tar ";
+    my $dest_tar = "$src-$a.tar.bz2";
+    my $cmd = "tar $tar_opts --dereference -f $dest/$dest_tar ";
     my $newsrc = "$src-$a";
     symlink ($src, $newsrc ) if (! -l $newsrc);
 
     for my $b (@{$module_map{$a}}) {
 	$cmd .= "$newsrc/$b " if (-e "$newsrc/$b");
     }
-    if (-f $dest_tar) {
-	print "\twarning: $dest_tar exists, skipping\n";
+    if (-f "$dest/$dest_tar") {
+	print "\twarning: $dest/$dest_tar exists, skipping\n";
     } else {
 	system ($cmd) && die "Failed to execute '$cmd': $!";
     }
 
-    $cmd = "md5sum $dest_tar > $dest_tar.md5";
+    $cmd = "cd $dest; md5sum $dest_tar > $dest_tar.md5";
     system ($cmd) && die "Failed to generate md5: '$cmd': $!";
     print STDERR " done\n";
 }

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb 12 19:53:45 2009
@@ -484,7 +484,7 @@
    GREP=grep
 fi
 
-if echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300|beb300|BEB300|ooo300|OOO300)'] >/dev/null 2>/dev/null ; then
+if echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300|beb300|BEB300|ooo300|OOO300|ooo310|OOO310)'] >/dev/null 2>/dev/null ; then
    APPLY_DIR="$TOOLSDIR/patches/dev300"
 else
    APPLY_DIR="$TOOLSDIR/patches/$with_tag"

Added: trunk/doc/src-pack2.txt
==============================================================================
--- (empty file)
+++ trunk/doc/src-pack2.txt	Thu Feb 12 19:53:45 2009
@@ -0,0 +1,25 @@
+How to package the upstream sources using src-pack2
+===================================================
+
+For example we wanto to package DEV300_m40
+
+ssh ooweb seagull dreamhost com
+# the following commands will be done on seagull
+# check out the upstream sources
+ooo_mws=DEV300
+ooo_svn_tag=${ooo_mws}_m40
+ooo_build_tag=dev300-m40
+# FIXME: the is not much space in /tmp and /var/tmp
+#        we had troubles with the number of file in home
+mkdir -p /var/tmp/$ooo_build_tag
+cd /var/tmp/$ooo_build_tag
+svn co svn://svn.services.openoffice.org/ooo/tags/$ooo_svn_tag $ooo_build_tag
+# just to be sure
+svn co $ooo_build_tag
+svn stat $ooo_build_tag
+# check out the last ooo-build to get the last modules.txt and src-pack2
+svn co ~/ooo-build
+~/ooo-build/bin/src-pack2 $ooo_build_tag ~/download.go-oo.org/$ooo_mws
+# clean up
+cd ..
+rm -rf $ooo_build_tag

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Thu Feb 12 19:53:45 2009
@@ -44,6 +44,7 @@
     'oog680-m.*'			 => '@MIRROR@/OOG680',
     'ooh680-m.*'			 => '@MIRROR@/OOH680',
     'ooo300-m.*'			 => '@MIRROR@/OOO300',
+    'ooo310-m.*'			 => '@MIRROR@/OOO310',
     'ooo680-m.*'			 => '@MIRROR@/OOO680',
     'OOO_2_0_2.*'			 => '@MIRROR@/OOB680',
     'OOO_2_0_3.*'                        => '@MIRROR@/OOC680',

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Feb 12 19:53:45 2009
@@ -7,7 +7,8 @@
 
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../scsolver:../lwp
 
-OLDEST_SUPPORTED=dev300-m40
+# might be space separated list to support more MWS
+OLDEST_SUPPORTED=dev300-m40 ooo310-m1
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \