ooo-build r14337 - in branches/ooo-build-3-0: . bin

[szalaik svn gnome org]

Author: szalaik
Date: Sat Oct 18 10:10:53 2008
New Revision: 14337
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14337&view=rev

Log:
2008-10-18  Kalman Szalai - KAMI <kamihir freemail hu>

	* bin/setup.in
	* bin/unpack
	* configure.in
	* download.in: Added extensionaids options for OxygenOffice Professional.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/setup.in
   branches/ooo-build-3-0/bin/unpack
   branches/ooo-build-3-0/configure.in
   branches/ooo-build-3-0/download.in

Modified: branches/ooo-build-3-0/bin/setup.in
==============================================================================
--- branches/ooo-build-3-0/bin/setup.in	(original)
+++ branches/ooo-build-3-0/bin/setup.in	Sat Oct 18 10:10:53 2008
@@ -47,6 +47,7 @@
 CAIRO_ENABLED= CAIRO_ENABLED@
 SYSTEM_CAIRO= SYSTEM_CAIRO@
 PREBUILT_WRITINGAIDS_TIMESTAMP= PREBUILT_WRITINGAIDS_TIMESTAMP@
+PREBUILT_EXTENSIONAIDS_TIMESTAMP= PREBUILT_EXTENSIONAIDS_TIMESTAMP@
 SYSTEM_LIBWPD= SYSTEM_LIBWPD@
 SYSTEM_LIBWPG= SYSTEM_LIBWPG@
 SYSTEM_LIBWPS= SYSTEM_LIBWPS@

Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack	(original)
+++ branches/ooo-build-3-0/bin/unpack	Sat Oct 18 10:10:53 2008
@@ -151,6 +151,12 @@
 	    ;;
     esac
 
+    case "$DISTRO" in
+	OxygenOffice*)
+	    check_file $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip
+	    ;;
+    esac
+
 if test "z$SYSTEM_GCC" = "z"; then
     # unpack binutils
     cd $BUILDDIR
@@ -587,6 +593,12 @@
     ;;
 esac
 
+case "$DISTRO" in
+	OxygenOffice*)
+	    unzip -q $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip $OOBUILDDIR/dictionaries/
+	    ;;
+esac
+
 if test "z$SYSTEM_GCC" = "z"; then
     echo "Checking for gcc sources and prerequisities"
     if test -d "$BUILDDIR/$GCC_VER" &&

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Sat Oct 18 10:10:53 2008
@@ -779,6 +779,9 @@
 PREBUILT_WRITINGAIDS_TIMESTAMP=20080320
 AC_SUBST(PREBUILT_WRITINGAIDS_TIMESTAMP)
 
+PREBUILT_EXTENSIONAIDS_TIMESTAMP=20081017
+AC_SUBST(PREBUILT_EXTENSIONAIDS_TIMESTAMP)
+
 BUILD_MOZILLA_SOURCE='mozilla-source-1.7.5.tar.gz'
 AC_SUBST(BUILD_MOZILLA_SOURCE)
 

Modified: branches/ooo-build-3-0/download.in
==============================================================================
--- branches/ooo-build-3-0/download.in	(original)
+++ branches/ooo-build-3-0/download.in	Sat Oct 18 10:10:53 2008
@@ -65,6 +65,9 @@
     'silgraphite-.*'                     => '@MIRROR@/SRC680',
 # Prebuilt dictionaries for Novell Windows builds
     'writingaids.*\.zip'                 => '@MIRROR@/SRC680',
+
+# Prebuilt extension dictionaries for OxygenOffice builds
+    'extensionaids.*\.zip'                 => 'http://ftp.devall.hu/kami/go-oo/',
 # Win32 bits:
     'unicows\.exe'			 => 'http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642',
     # from http://www.microsoft.com/downloads/release.asp?releaseid=30682'
@@ -264,6 +267,8 @@
 push @files, ( 'writingaids- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
 push @files, ( 'writingaids-doc- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
 
+push @files, ( 'extensionaids- PREBUILT_EXTENSIONAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/OxygenOfficeLinux|OxygenOfficeWindows/;
+
 if ('@CAIRO_ENABLED@' eq 'TRUE' && '@SYSTEM_CAIRO@' ne 'TRUE') {
     push @files, ( 'cairo- CAIRO_VER@.tar.gz' );
 }
@@ -368,7 +373,6 @@
 @templang = split (/ /, $suntemplang);
 foreach (@templang) {
     push @files, ( 'Sun_ODF_Template_Pack_' . $_ . '.oxt');
-	print $_. ' k';
 }
 
 my $distro = '@DISTRO@';