ooo-build r12978 - trunk

[michael svn gnome org]

Author: michael
Date: Thu Jun 26 16:59:59 2008
New Revision: 12978
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12978&view=rev

Log:
2008-06-26  Michael Meeks  <michael meeks novell com>

        * configure.in, download.in: add --with-split option, and
        download rather more packages if we're split; correct drink
        text.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/download.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jun 26 16:59:59 2008
@@ -329,7 +329,7 @@
 
 AC_ARG_WITH(drink,
 [
-  --with-drink            The parameter is a favourite drink that unpack should advice you to take.
+  --with-drink            The parameter is a favourite drink that unpack should advise you to take.
 		      
 			  Example: --with-drink=coffee],
 ,)
@@ -457,6 +457,9 @@
 AC_MSG_RESULT([$MWS])
 AC_SUBST(MWS)
 
+SPLIT=$with_split
+AC_SUBST(SPLIT)
+
 # FIXME: We currently do not support starting build with already unpackaged
 # sources, so the following warning is always printed
 warn_use_download="	./download
@@ -1129,7 +1132,6 @@
 AC_SUBST(UPSTREAM_SOURCE)
 AC_SUBST(UPSTREAM_URI)
 
-dnl MIRROR="http://go-oo.org/packages";
 MIRROR="http://download.go-oo.org/";
 if test "z$with_mirror" != "z" ; then
    MIRROR="$with_mirror"

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Thu Jun 26 16:59:59 2008
@@ -93,21 +93,30 @@
 }
 
 $WGET='@WGET@';
+if ('@SPLIT@' eq '') {
+    $SPLIT = 0;
+} else {
+    $SPLIT = 1;
+}
 
 sub source_file($)
 {
     my ($upstream_what) = @_;
     my $what = $upstream_what;
 
-    if ( "$upstream_what" eq "l10n" ) {
-        $what = "lang";
-    }
-    elsif ( "$upstream_what" eq "sdk" ) {
-        $what = "sdk_oo";
+    if (!$SPLIT) {
+	if ( "$upstream_what" eq "l10n" ) {
+	    $what = "lang";
+	} elsif ( "$upstream_what" eq "sdk" ) {
+	    $what = "sdk_oo";
+	} elsif ( "$upstream_what" eq "libs-extern-sys" ) {
+	    $what = "system";
+	}
     }
 
     my $tag = '@CVSTAG@';
     if ( '@UPSTREAM_SOURCE@' eq "YES" ) {
+	die "Up-stream doesn't have a package split" if ($SPLIT);
         return '@UPSTREAM_URI@' . "&lang=$upstream_what";
     }
     elsif ( '@UPSTREAM_SOURCE@' eq "MIRROR" ) {
@@ -254,14 +263,25 @@
     push @files, ( '@MDBTOOLS_SRC@' );
 }
 
-push @files, ( source_file( "core" ) );
-
-my @m = split(/-/, '@CVSTAG@' );
-$m[1] =~ s/m//;
-if ( "$m[1]" >= "13" ) {
-    push @files, ( source_file( "swext" ) );
+if ($SPLIT) {
+    push @files, ( source_file( "ure" ) );
+    push @files, ( source_file( "base" ) );
+    push @files, ( source_file( "calc" ) );
+    push @files, ( source_file( "l10n" ) );
+    push @files, ( source_file( "writer" ) );
+    push @files, ( source_file( "impress" ) );
+    push @files, ( source_file( "artwork" ) );
+    push @files, ( source_file( "filters" ) );
+    push @files, ( source_file( "testing" ) );
+    push @files, ( source_file( "bootstrap" ) );
+    push @files, ( source_file( "libs-gui" ) );
+    push @files, ( source_file( "libs-core" ) );
+    push @files, ( source_file( "libs-extern" ) );
+    push @files, ( source_file( "extensions" ) );
+    push @files, ( source_file( "postprocess" ) );
 } else {
-    push @files, ( 'swext- CVSTAG@.tar.gz' );
+    push @files, ( source_file( "core" ) );
+    push @files, ( source_file( "swext" ) );
 }
 
 push @files, ( '@OOO_CUSTOM_IMAGES@') if '@OOO_CUSTOM_IMAGES@';
@@ -326,7 +346,7 @@
     $distro eq 'SUSE-9.1' || $distro eq 'SUSE-9.2' || $distro eq 'SUSE-9.3' ||
     $distro eq 'OxygenOfficeLinux' || $distro eq 'OxygenOfficeWindows' || 
     $distro eq 'translate-org-za-linux' || $distro eq 'translate-org-za-win32' || $distro eq 'Pardus') {
-    push @files, ( source_file( "system" ) );
+    push @files, ( source_file( "libs-extern-sys" ) );
 }
 
 if ($download_all ||