ooo-build r12975 - in trunk: . bin doc

[michael svn gnome org]

Author: michael
Date: Thu Jun 26 15:57:35 2008
New Revision: 12975
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12975&view=rev

Log:
add --with-split to configure.in update src-pack2


Modified:
   trunk/bin/src-pack2
   trunk/configure.in
   trunk/doc/split.txt

Modified: trunk/bin/src-pack2
==============================================================================
--- trunk/bin/src-pack2	(original)
+++ trunk/bin/src-pack2	Thu Jun 26 15:57:35 2008
@@ -68,6 +68,7 @@
 
     opendir my $dirh, "$src" || die "Can't open $src: $!";
     while (my $entry = readdir ($dirh)) {
+	next if ($entry =~ /^\./);
 	$entries{$entry} = 1;
     }
     closedir ($dirh);
@@ -95,7 +96,7 @@
     }
     my @left_over = keys %{$modules};
     if (@left_over) {
-	print "\n\nError: modules not included in any section: @left_over\n\n";
+	print "\n\nError: modules not included in any section: '@left_over'\n\n";
 	$failed = 1;
     }
     
@@ -124,66 +125,18 @@
 
 verify_module_map ($src, \%module_map);
 
+print STDERR "packing source in $src to directory $dest\n";
+
 for my $a (keys %module_map) {
-    print "module '$a' =>";
+    print STDERR "\tpack $a ...";
+    my $dest_tar = "$dest/$src-$a.tar.bz2";
+    my $cmd = "tar $tar_opts -f $dest_tar ";
     for my $b (@{$module_map{$a}}) {
-	print " $b";
+	$cmd .= "$src/$b ";
     }
-    print "\n";
-}
-
-#, 
-#echo "packing source in $src to directory $dest";, 
-#, 
-#if test ! -f "$src/vcl/source/gdi/outdev.cxx"; then, 
-#    echo "Doesn't look like an OO.o source tree";, 
-#    exit 1;, 
-#fi, 
-#, 
-#system_dirs="$src/python $src/bitstream_vera_fonts $src/freetype $src/jpeg";
-#system_dirs="$system_dirs $src/dictionaries $src/libxml2 $src/zlib $src/moz";
-#system_dirs="$system_dirs $src/curl $src/neon ";
-#
-## future system bits:
-#incomplete_modules="$src/curl $src/expat $src/icu $src/libxmlsec $src/neon";
-#incomplete_modules="$incomplete_modules $src/msfontextract $src/regexp $src/rhino ";
-#incomplete_modules="$incomplete_modules $src/sablot $src/sane $src/stlport $src/twain";
-#incomplete_modules="$incomplete_modules $src/unixODBC $src/x11_extensions $src/boost";
-#
-## FIXME - remove svdbt.dll with an unclear license; it looks unused anyway; http://www.openoffice.org/issues/show_bug.cgi?id=80408
-#rm -f $src/sfx2/util/svdbt.dll
-#
-#echo "Packing binfilter ...";
-#tar $tar_opts -f $dest/$src-binfilter.tar.bz2 $src/binfilter || exit 1;
-#rm -Rf $src/binfilter || exit 1;
-#
-#echo "Packing sdk_oo ...";
-#tar $tar_opts -f $dest/$src-sdk_oo.tar.bz2 $src/sdk_oo || exit 1;
-#rm -Rf $src/sdk_oo || exit 1;
-#
-#echo "Packing system pieces ...";
-#tar $tar_opts -f $dest/$src-system.tar.bz2 $system_dirs || exit 1;
-#rm -Rf $system_dirs || exit 1;
-#
-## This saves only 1.5Mb
-##
-## echo "Packing win32 bits ...";
-## tar $tar_opts -f $dest/$src-win32.tar.bz2 $win32_dirs || exit 1;
-## rm -Rf $win32_dirs || exit 1;
-#
-#echo "Packing i18n bits ...";
-#find $src -name localize.sdf > localize.lst || exit 1;
-#find $src/extras/source/templates -type f | grep -v 'CVS' | grep -v 'delzip' | grep -v 'makefile.mk' | grep -v '/de' | grep -v '/en-US' >> localize.lst || exit 1;
-#tar $tar_opts -f $dest/$src-lang.tar.bz2 --files-from=localize.lst || exit 1;
-#cat localize.lst | xargs rm -Rf || exit 1
-#rm localize.lst
-#
-#echo "Packing core source ...";
-#tar $tar_opts -f $dest/$src-core.tar.bz2 $src || exit 1;
-#rm -Rf $src
-#
-#echo "Generating md5 sums ...";
-#for suffix in binfilter sdk_oo system lang core; do # win32 cvs
-#	md5sum $dest/$src-$suffix.tar.bz2 > $dest/$src-$suffix.tar.bz2.md5 || exit 1;
-#done
+    system ($cmd) && die "Failed to execute '$cmd': $!";
 
+    $cmd = "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 Jun 26 15:57:35 2008
@@ -26,6 +26,12 @@
 			  Example:  --with-tag=dev300-mXYZ],
 ,)
 
+AC_ARG_WITH(split,
+[
+  --with-split            try to compile a smaller split off piece of OO.o
+			  rather than the whole project.],
+,)
+
 AC_ARG_WITH(srcdir,
 [
   --with-srcdir           define the directory where to download the source

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Thu Jun 26 15:57:35 2008
@@ -176,3 +176,14 @@
 	+ do we wrap all the bits with ooo-build ?
 	+ can we adapt it's behavior based on what we see in src/ ? :-)
 
+
++ configure.in:
+	+ added "--with-split" ...
+        --with-installed-ooo-dirname=%ooo_home: ooo_home => "ooo-2.0"
+	from "setup.in":
+		OOINSTBASE= libdir@/@OOOINSTALLDIRNAME@
+
+	+ whack the solver in: /usr/lib/ooo-2.0/solver/
+		+ prune down the things that are simply not used ...
+
+