ooo-build r11218 - in trunk: . bin

[pmladek svn gnome org]

Author: pmladek
Date: Tue Jan  8 11:21:36 2008
New Revision: 11218
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11218&view=rev

Log:
2008-01-08  Petr Mladek  <pmladek suse cz>

	* configure.in, bin/setup.in, download.in, bin/unpack: download/unpack
	  OxygenOffice extras; is OxygenOffice-specific now

	* bin/localize-ooo: support multilang packs; for example, defined by
	  --with-lang="hu_en-US_de_it_fr"



Modified:
   trunk/ChangeLog
   trunk/bin/localize-ooo
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/configure.in
   trunk/download.in

Modified: trunk/bin/localize-ooo
==============================================================================
--- trunk/bin/localize-ooo	(original)
+++ trunk/bin/localize-ooo	Tue Jan  8 11:21:36 2008
@@ -20,7 +20,7 @@
     # find if this localization is required
     trans_lang=`echo $file | sed "s|^$SRCDIR/GSI_\(.*\).sdf\$|\1|"`
     for lang in $OOO_LANGS_LIST ; do
-        if test "z$lang" = "z$trans_lang" ; then
+	if echo "$lang" | grep -q "$trans_lang" ; then
 	    extra_trans_langs="$trans_lang $extra_trans_langs"
 	    break;
 	fi
@@ -55,7 +55,7 @@
 	fi
 	
 	# workaround for i#56622, n#210797
-	if test "$langcode" = "hu" ; then
+	if echo "$langcode" | grep -q "hu" ; then
 	    echo "Fixing Hungarian strings: OOo vs. SO"
 	    for file in `find $OOBUILDDIR -type f -name "localize.sdf"` ; do
 		$TOOLSDIR/bin/a2az.pl $file >$file.a2az

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Tue Jan  8 11:21:36 2008
@@ -21,6 +21,10 @@
 OOO_WIDGET_FLAGS='@OOO_WIDGET_FLAGS@'
 OOO_CUSTOM_IMAGES='@OOO_CUSTOM_IMAGES@'
 OOO_CRYSTAL_IMAGES='@OOO_CRYSTAL_IMAGES@'
+OOOP_FONTS_PACK='@OOOP_FONTS_PACK@'
+OOOP_GALLERY_PACK='@OOOP_GALLERY_PACK@'
+OOOP_SAMPLES_PACK='@OOOP_SAMPLES_PACK@'
+OOOP_TEMPLATES_PACK='@OOOP_TEMPLATES_PACK@'
 OOO_BUILDVERSION='@OOO_BUILDVERSION@'
 OOO_STRIP='@OOO_STRIP@'
 SPLIT_APP_MODULES='@SPLIT_APP_MODULES@'

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Jan  8 11:21:36 2008
@@ -499,6 +499,13 @@
     ($OOO_DECOMPRESS_CMD $SRCDIR/$WRITERFILTER_MODULE_TARBALL | $GNUTAR xpf - ) || exit 1
 fi
 
+# OxygenOffice extras
+for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
+    check_tarball $SRCDIR/$pack
+    echo "Unpacking $pack"
+    unzip $SRCDIR/$pack -d $OOBUILDDIR/extras/source
+done
+
 echo "Copying scsolver directory into the tree"
 $GNUCP -Rf $TOOLSDIR/scratch/scsolver $OOBUILDDIR/ || exit 1
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan  8 11:21:36 2008
@@ -616,6 +616,22 @@
    fi
 fi
 
+OOOP_FONTS_PACK=
+OOOP_GALLERY_PACK=
+OOOP_SAMPLES_PACK=
+OOOP_TEMPLATES_PACK=
+if test "z$with_distro" = "zOxygenOfficeLinux" -o \
+        "z$with_distro" = "zOxygenOfficeWindows" ; then
+    OOOP_FONTS_PACK="OOOP-fonts-pack-2.3.1.6.zip"
+    OOOP_GALLERY_PACK="OOOP-gallery-pack-2.3.1.6.zip"
+    OOOP_SAMPLES_PACK="OOOP-samples-pack-2.3.1.6.zip"
+    OOOP_TEMPLATES_PACK="OOOP-templates-pack-2.3.1.6.zip"
+fi
+AC_SUBST(OOOP_FONTS_PACK)
+AC_SUBST(OOOP_GALLERY_PACK)
+AC_SUBST(OOOP_SAMPLES_PACK)
+AC_SUBST(OOOP_TEMPLATES_PACK)
+
 AC_MSG_CHECKING([for widget sets])
 OOO_WIDGET_FLAGS=
 if test "$enable_kde" != "no"; then

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Jan  8 11:21:36 2008
@@ -79,7 +79,9 @@
 # cairo sources
     'cairo-.*'			         => 'http://cairographics.org/releases/',
 # libsvg source
-    'libsvg-.*'			         => 'http://cairographics.org/snapshots/'
+    'libsvg-.*'			         => 'http://cairographics.org/snapshots/',
+# OxygenOffice extras
+    'OOOP-.*\.zip'                 	 => 'http://heanet.dl.sourceforge.net/sourceforge/ooop/'
 );
 
 if ( '@UPSTREAM_NAME@' ne '' ) {
@@ -262,6 +264,22 @@
    push @files, ( 'libsvg-0.1.4.tar.gz' );
 }
 
+if ('@OOOP_FONTS_PACK@' ne '') {
+    push @files, ( '@OOOP_FONTS_PACK@' );
+}
+
+if ('@OOOP_GALLERY_PACK@' ne '') {
+    push @files, ( '@OOOP_GALLERY_PACK@' );
+}
+
+if ('@OOOP_SAMPLES_PACK@' ne '') {
+    push @files, ( '@OOOP_SAMPLES_PACK@' );
+}
+
+if ('@OOOP_TEMPLATES_PACK@' ne '') {
+    push @files, ( '@OOOP_TEMPLATES_PACK@' );
+}
+
 push @files, ( '@OOX_MODULE_TARBALL@' );
 
 push @files, ( '@WRITERFILTER_MODULE_TARBALL@' );