ooo-build r15472 - in trunk: . bin

[pmladek svn gnome org]

Author: pmladek
Date: Thu Mar  5 13:04:00 2009
New Revision: 15472
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15472&view=rev

Log:
2009-03-05  Petr Mladek  <pmladek suse cz>

	* bin/unpack: fix backward compatibility with < ooo310-m4
	* download.in: update for ooo310-m4



Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/download.in

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Thu Mar  5 13:04:00 2009
@@ -57,7 +57,11 @@
 	if test "z$PIECE" != "z"; then
 		CORE_PKGS=$PIECE
 	else
-		CORE_PKGS="sdk ure base calc help extras writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern libs-extern-sys components postprocess extensions"
+		if test `echo $CVSTAG | sed "s|ooo310-m||"` -lt 4 ; then 
+		    CORE_PKGS="sdk ure base calc l10n writer impress artwork filters testing bootstrap libs_gui libs_core libs_extern libs_extern_sys components postprocess extensions"
+		else
+		    CORE_PKGS="sdk ure base calc help extras writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern libs-extern-sys components postprocess extensions"
+		fi
 	fi
 	for pkg in $CORE_PKGS; do
 		check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2"

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Thu Mar  5 13:04:00 2009
@@ -296,6 +296,10 @@
 }
 
 if ($SPLIT) {
+  # temporary hack until we drop support for ooo310-m3 and lower
+  my $milestone = '@CVSTAG@';
+  $tag =~ s/ooo310-m//;
+  if ($tag < 4) {
     push @files, ( source_file( "ure" ) );
     push @files, ( source_file( "sdk" ) );
     push @files, ( source_file( "base" ) );
@@ -314,6 +318,27 @@
     push @files, ( source_file( "postprocess" ) );
 # for now ...
     push @files, ( source_file( "libs_extern_sys" ) );
+  } else {
+    push @files, ( source_file( "artwork" ) );
+    push @files, ( source_file( "base" ) );
+    push @files, ( source_file( "bootstrap" ) );
+    push @files, ( source_file( "calc" ) );
+    push @files, ( source_file( "components" ) );
+    push @files, ( source_file( "extras" ) );
+    push @files, ( source_file( "filters" ) );
+    push @files, ( source_file( "help" ) );
+    push @files, ( source_file( "impress" ) );
+    push @files, ( source_file( "libs-gui" ) );
+    push @files, ( source_file( "libs-core" ) );
+    push @files, ( source_file( "libs-extern" ) );
+    push @files, ( source_file( "postprocess" ) );
+    push @files, ( source_file( "sdk" ) );
+    push @files, ( source_file( "testing" ) );
+    push @files, ( source_file( "ure" ) );
+    push @files, ( source_file( "writer" ) );
+# for now ...
+    push @files, ( source_file( "libs-extern-sys" ) );
+}
 } else {
     push @files, ( source_file( "core" ) );
 }