ooo-build r13289 - trunk

[tml svn gnome org]

Author: tml
Date: Fri Jul 18 10:46:50 2008
New Revision: 13289
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13289&view=rev

Log:
2008-07-18  Tor Lillqvist  <tml novell com>

	* download.in: Don't unconditionally attempt to download the
	"system" tarball if building for Win32, only do it in the
	non-split case. (But then, --with-split is de facto mandatory for
	dev300-m* now.) Don't unconditionally attempt to download the
	"binfilter" tarball if binfilter is enabled, it shouldn't be
	needed in the --with-split case, says Rene. Download the
	libs_extern_sys tarball also for NovellWin32 and GoOoWin32. Fix
	spelling of "libs_extern_sys" in the non-split case of mapping it
	to "system".



Modified:
   trunk/ChangeLog
   trunk/download.in

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Fri Jul 18 10:46:50 2008
@@ -110,7 +110,7 @@
 	    $what = "lang";
 	} elsif ( "$upstream_what" eq "sdk" ) {
 	    $what = "sdk_oo";
-	} elsif ( "$upstream_what" eq "libs-extern-sys" ) {
+	} elsif ( "$upstream_what" eq "libs_extern_sys" ) {
 	    $what = "system";
 	}
     }
@@ -196,7 +196,7 @@
     push @files, ( 'gcc-3.4.1.tar.bz2', 'gcc-3.4.1-Enums.diff', 'gcc-3.4.1-VisibilityPatch2.diff' );
 }
 
-if ($download_all || '@BUILD_WIN32@' ne '') 
+if (!$SPLIT && ($download_all || '@BUILD_WIN32@' ne ''))
 {
     push @files, ( source_file( "system" ) );
 }
@@ -292,7 +292,7 @@
 # Temporary utf-8ization of bibliograpy bits
 push @files, ( "biblio.tar.bz2" );
 
-if ($download_all || '@ENABLE_BINFILTER@' eq 'TRUE') {
+if (!$SPLIT && ($download_all || '@ENABLE_BINFILTER@' eq 'TRUE')) {
     push @files, ( source_file( "binfilter" ) );
 }
 
@@ -347,6 +347,7 @@
     $distro eq 'Gentoo.conf' ||
     $distro eq 'openmamba' ||
     $distro eq 'SUSE-9.1' || $distro eq 'SUSE-9.2' || $distro eq 'SUSE-9.3' ||
+    $distro eq 'NovellWin32' || $distro eq 'GoOoWin32' ||
     $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( "libs_extern_sys" ) );