[ooo-build-commit] bin/setup.in bin/unpack configure.in download.in patches/dev300

Fridrich Strba fridrich at kemper.freedesktop.org
Wed Oct 21 03:07:31 PDT 2009 

 bin/setup.in                        |    1 
 bin/unpack                          |   13 ++++++++---
 configure.in                        |   22 ++++++++++++++++++
 download.in                         |    9 ++++++-
 patches/dev300/scp2_extensions.diff |   42 +++++++++++++++++++++++++++++++++---
 5 files changed, 79 insertions(+), 8 deletions(-)

New commits:
commit a483277e7d08b7aeadd9e90e5d5e1ee33eb7329a
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 21 12:06:24 2009 +0200

    Integrating the Google Docs and Zoho extension
    
    * bin/setup.in:
    * bin/unpack:
    * configure.in:
    * download.in:
    * patches/dev300/scp2_extensions.diff:

diff --git a/bin/setup.in b/bin/setup.in
index c7bb690..240b4a3 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -33,6 +33,7 @@ OOOP_GALLERY_PACK='@OOOP_GALLERY_PACK@'
 OOOP_SAMPLES_PACK='@OOOP_SAMPLES_PACK@'
 OOOP_TEMPLATES_PACK='@OOOP_TEMPLATES_PACK@'
 LIGHTPROOF_EXTENSION='@LIGHTPROOF_EXTENSION@'
+GOOGLE_DOCS_EXTENSION='@GOOGLE_DOCS_EXTENSION@'
 SUNTEMPLATES_LANG='@SUNTEMPLATES_LANG@'
 OOO_BUILDVERSION='@OOO_BUILDVERSION@'
 OOO_STRIP='@OOO_STRIP@'
diff --git a/bin/unpack b/bin/unpack
index 6077216..441784e 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -595,9 +595,9 @@ if test "z$BUILD_WIN32" != "z"; then
 	check_file $SRCDIR/$APACHE_ANT_TARBALL
 else
 	ANT_VERSION=`ant -version | awk '{ print $4 }'`
-	if test -x /usr/bin/ant && \
-	   test "`echo $ANT_VERSION | cut -d. -f1`" = "1" \
-                -a "`echo $ANT_VERSION | cut -d. -f2`" -lt "7" ]; then
+	if test -x /usr/bin/ant -a \
+	   "`echo $ANT_VERSION | cut -d. -f1`" -eq "1" \
+                -a "`echo $ANT_VERSION | cut -d. -f2`" -lt "7"; then
 		check_file $SRCDIR/$APACHE_ANT_TARBALL
 	fi
 fi
@@ -861,6 +861,13 @@ if test "x$LIGHTPROOF_EXTENSION" != "x"; then
     $GNUCP $SRCDIR/$LIGHTPROOF_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
 fi
 
+if test "x$GOOGLE_DOCS_EXTENSION" != "x"; then
+    check_file $SRCDIR/$GOOGLE_DOCS_EXTENSION
+    echo "Copying Google Docs extension into the tree"
+    mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+    $GNUCP $SRCDIR/$GOOGLE_DOCS_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
+fi
+
 if test "x$OXYGEN_IMAGES_TAR" != "x"; then
     check_tarball $SRCDIR/$OXYGEN_IMAGES_TAR
     echo "Copying $OXYGEN_IMAGES_TAR into external_images"
diff --git a/configure.in b/configure.in
index 630e20c..7586e1a 100644
--- a/configure.in
+++ b/configure.in
@@ -345,6 +345,12 @@ AC_ARG_WITH(sun-templates,
 ,)
 
 
+AC_ARG_WITH(google-docs,
+[
+  --with-google-docs      Download and integrate Google Documents extension.],
+,)
+
+
 AC_ARG_WITH(dejavu-fonts,
 [
   --with-dejavu-fonts     Download and install updated DejaVu fonts. The parameter is
@@ -1309,7 +1315,21 @@ else
 fi
 AC_SUBST(SUNTEMPLATES_LANG)
 
-AC_MSG_CHECKING([whether to include tproof extension])
+AC_MSG_CHECKING([whether to include Google Docs extension])
+if test "$enable_extensions" != "no" ; then
+    if test "z$with_google_docs" = "zyes" ; then
+	GOOGLE_DOCS_EXTENSION="gdocs_1.8.1_modified.oxt"        
+	WITH_GOOGLE_DOCS=YES
+        AC_MSG_RESULT([yes])
+    else
+        WITH_GOOGLE_DOCS=NO
+        AC_MSG_RESULT([no])
+    fi
+fi
+AC_SUBST(WITH_GOOGLE_DOCS)
+AC_SUBST(GOOGLE_DOCS_EXTENSION)
+
+AC_MSG_CHECKING([whether to include lightproof extension])
 if test "$enable_extensions" != "no" ; then
     if test "z$with_lightproof" = "zyes" ; then
 	LIGHTPROOF_EXTENSION="lightproof-1.0.oxt"        
diff --git a/download.in b/download.in
index 680cdfb..2e44e87 100755
--- a/download.in
+++ b/download.in
@@ -144,7 +144,10 @@ sub trim($)
     'Sun_ODF_Template_Pack_*'	 => 'ftp://ftp.devall.hu/kami/go-oo/',
 
 # Lightproof extension
-    'lightproof-*'			 => 'http://extensions.services.openoffice.org/files/2297/2/'
+    'lightproof-*'			 => 'http://extensions.services.openoffice.org/files/2297/2/',
+
+# Google Docs Extension
+    'gdocs_*'                => 'http://download.go-oo.org/src/'
 
 );
 
@@ -458,6 +461,10 @@ if ('@LIGHTPROOF_EXTENSION@' ne '') {
     source_file( '@LIGHTPROOF_EXTENSION@' );
 }
 
+if ('@GOOGLE_DOCS_EXTENSION@' ne '') {
+    source_file( '@GOOGLE_DOCS_EXTENSION@' );
+}
+
 if ('@OXYGEN_IMAGES_TAR@' ne '') {
     source_file( '@OXYGEN_IMAGES_TAR@' );
 }
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index 05ed0b6..2dc1b95 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -1,7 +1,7 @@
 diff -Naur scp2.old/source/extensions/file_extensions.scp scp2/source/extensions/file_extensions.scp
 --- scp2.old/source/extensions/file_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/file_extensions.scp	2008-12-15 10:19:14.000000000 +0100
-@@ -0,0 +1,134 @@
+@@ -0,0 +1,147 @@
 +/*************************************************************************
 +*
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -119,6 +119,19 @@ diff -Naur scp2.old/source/extensions/file_extensions.scp scp2/source/extensions
 +
 +#endif
 +
++/* ** Google Docs ** */
++
++#ifdef WITH_EXTENSION_GOOGLE_DOCS
++
++File gid_File_Oxt_Google_Docs
++    TXT_FILE_BODY;
++    Styles = (PACKED);
++    Dir = gid_Brand_Dir_Share_Extension_Install;
++    Name = "gdocs_1.8.1_modified.oxt";
++End
++
++#endif
++
 +/* ** Sun Template Pack ** */
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
@@ -201,7 +214,7 @@ diff -Naur scp2.old/source/extensions/makefile.mk scp2/source/extensions/makefil
 diff -Naur scp2.old/source/extensions/module_extensions.scp scp2/source/extensions/module_extensions.scp
 --- scp2.old/source/extensions/module_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.scp	2008-12-18 11:47:16.000000000 +0100
-@@ -0,0 +1,167 @@
+@@ -0,0 +1,184 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -350,6 +363,23 @@ diff -Naur scp2.old/source/extensions/module_extensions.scp scp2/source/extensio
 +#endif
 +#endif
 +
++/* ** Google Docs ** */
++
++#ifdef WITH_EXTENSION_GOOGLE_DOCS
++#ifdef WITH_EXTENSION_INTEGRATION
++Module gid_Module_Optional_Extensions_Google_Docs
++    PackageInfo = "packinfo_extensions.txt";
++    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS);
++    ParentID = gid_Module_Optional_Extensions;
++    Files = (
++        gid_File_Oxt_Google_Docs );
++    Minimal = NO;
++    Default = YES;
++    Styles = ( );
++End
++#endif
++#endif
++
 +/* ** Sun Template Pack ** */
 +
 +#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
@@ -431,7 +461,7 @@ diff -Naur scp2.old/source/extensions/module_extensions_sun_templates.scp scp2/s
 diff -Naur scp2.old/source/extensions/module_extensions.ulf scp2/source/extensions/module_extensions.ulf
 --- scp2.old/source/extensions/module_extensions.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.ulf	2008-12-19 11:39:02.000000000 +0100
-@@ -0,0 +1,736 @@
+@@ -0,0 +1,742 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -509,6 +539,12 @@ diff -Naur scp2.old/source/extensions/module_extensions.ulf scp2/source/extensio
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
 +en-US = "Lightproof"
 +
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
++en-US = "Google Docs & Zoho"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
++en-US = "Google Docs & Zoho"
++
 +[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
 +en-US = "Sun Professional Template Pack"
 +

More information about the ooo-build-commit mailing list