[ooo-build-commit] Branch 'ooo-build-3-1-1' - 2 commits - bin/setup.in bin/unpack configure.in download.in patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Tue Sep 1 01:28:46 PDT 2009
bin/setup.in | 1
bin/unpack | 7 +++++
configure.in | 22 ++++++++++++++++-
download.in | 8 +++++-
patches/dev300/extensions_configure.diff | 22 +++++++++++++++--
patches/dev300/extensions_packinfo.diff | 18 +++++++++++++
patches/dev300/scp2_extensions.diff | 40 +++++++++++++++++++++++++++++--
7 files changed, 111 insertions(+), 7 deletions(-)
New commits:
commit 37fc038bb08dc2a7e22ed55fc7c89e79faed65a0
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Tue Sep 1 10:26:14 2009 +0200
Added download script
* download.in:
diff --git a/download.in b/download.in
index 27be8ab..812419d 100755
--- a/download.in
+++ b/download.in
@@ -117,8 +117,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/',
+# Numbertext extension
+ 'numbertext-*' => 'ftp://ftp.devall.hu/kami/go-oo/'
);
if ( '@UPSTREAM_NAME@' ne '' ) {
@@ -399,6 +401,10 @@ if ('@LIGHTPROOF_EXTENSION@' ne '') {
push @files, ( '@LIGHTPROOF_EXTENSION@' );
}
+if ('@NUMBERTEXT_EXTENSION@' ne '') {
+ push @files, ( '@NUMBERTEXT_EXTENSION@' );
+}
+
if ('@OXYGEN_IMAGES_TAR@' ne '') {
push @files, ( '@OXYGEN_IMAGES_TAR@' );
}
commit a34f801a9668ab29f8d2d19d33a88f88859d3443
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Tue Sep 1 10:18:28 2009 +0200
Adding Numbertext extension to installset
Add Numbertext extension (optional) to installset
You can use --with-numbertext configure parameter to use it
Additionally one small fix for configure.in typo
* bin/setup.in:
* bin/unpack:
* configure.in:
* patches/dev300/extensions_configure.diff:
* patches/dev300/extensions_packinfo.diff:
* patches/dev300/scp2_extensions.diff:
diff --git a/bin/setup.in b/bin/setup.in
index 05361da..0d4765b 100644
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -32,6 +32,7 @@ OOOP_GALLERY_PACK='@OOOP_GALLERY_PACK@'
OOOP_SAMPLES_PACK='@OOOP_SAMPLES_PACK@'
OOOP_TEMPLATES_PACK='@OOOP_TEMPLATES_PACK@'
LIGHTPROOF_EXTENSION='@LIGHTPROOF_EXTENSION@'
+NUMBERTEXT_EXTENSION='@NUMBERTEXT_EXTENSION@'
SUNTEMPLATES_LANG='@SUNTEMPLATES_LANG@'
OOO_BUILDVERSION='@OOO_BUILDVERSION@'
OOO_STRIP='@OOO_STRIP@'
diff --git a/bin/unpack b/bin/unpack
index 7bd5e40..6a1807b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -832,6 +832,13 @@ if test "x$LIGHTPROOF_EXTENSION" != "x"; then
$GNUCP -a $SRCDIR/$LIGHTPROOF_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
fi
+if test "x$NUMBERTEXT_EXTENSION" != "x"; then
+ check_file $SRCDIR/$NUMBERTEXT_EXTENSION
+ echo "Copying Numbertext extension into the tree"
+ mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+ $GNUCP -a $SRCDIR/$NUMBERTEXT_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 49ee054..a25c42e 100644
--- a/configure.in
+++ b/configure.in
@@ -367,6 +367,12 @@ AC_ARG_WITH(lightproof,
checker" extension.],
,)
+AC_ARG_WITH(numbertext,
+[
+ --with-numbertext Download and integrate the Numbertext (spreadsheet functions for
+ number to number name and currency name conversion) as extension.],
+,)
+
AC_ARG_WITH(gnu-cp,
[
--with-gnu-cp The parameter is an absolute path to GNU cp.
@@ -1307,7 +1313,7 @@ else
fi
AC_SUBST(SUNTEMPLATES_LANG)
-AC_MSG_CHECKING([whether to include tproof 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"
@@ -1321,6 +1327,20 @@ fi
AC_SUBST(WITH_LIGHTPROOF)
AC_SUBST(LIGHTPROOF_EXTENSION)
+AC_MSG_CHECKING([whether to include numbertext extension])
+if test "$enable_extensions" != "no" ; then
+ if test "z$with_numbertext" = "zyes" ; then
+ NUMBERTEXT_EXTENSION="numbertext-0.5.oxt"
+ WITH_NUMBERTEXT=YES
+ AC_MSG_RESULT([yes])
+ else
+ WITH_NUMBERTEXT=NO
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(WITH_NUMBERTEXT)
+AC_SUBST(NUMBERTEXT_EXTENSION)
+
AC_MSG_CHECKING([whether to enable debugging code])
if test "$enable_dbgutil" = "yes" ; then
build_product=debug
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 2e77681..b251334 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -14,10 +14,11 @@
AC_ARG_WITH(fonts,
[ --without-fonts Removes Bitstream Vera fonts from
openoffice.org installation set, for people building
-@@ -810,6 +817,16 @@
+@@ -802,6 +802,22 @@
[ --with-alloc Define which allocator to build with
(choices are oo, system, tcmalloc)
],,)
++
+AC_ARG_WITH(sun-templates,
+[
+ --with-sun-templates Integrate Sun template packages.],
@@ -28,6 +29,11 @@
+ --with-lightproof Integrate Lightproof extension],
+,)
+
++AC_ARG_WITH(numbertext,
++[
++ --with-numbertext Integrate Numbertext extension],
++,)
++
AC_ARG_ENABLE(verbose,
[ --enable-verbose Increase build verbosity.
--disable-verbose Decrease build verbosity.
@@ -63,7 +69,7 @@
SYSTEM_JFREEREPORT=NO
fi
AC_SUBST(ENABLE_REPORTBUILDER)
-@@ -6055,6 +6068,64 @@
+@@ -6055,6 +6068,76 @@
fi
dnl ===================================================================
@@ -93,6 +99,18 @@
+AC_SUBST(WITH_LIGHTPROOF_EXTENSION)
+
+dnl ===================================================================
++dnl Test whether to include Numbertext extension
++dnl ===================================================================
++AC_MSG_CHECKING([for Numbertext extension integration])
++if test "z$with_numbertext" = "z" -o "z$with_numbertext" = "zno" ; then
++ AC_MSG_RESULT([no])
++ SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_NUMBERTEXT"
++else
++ AC_MSG_RESULT([yes])
++fi
++AC_SUBST(WITH_NUMBERTEXT_EXTENSION)
++
++dnl ===================================================================
+dnl Test whether to include Sun Professinal Template Pack
+dnl ===================================================================
+AC_MSG_CHECKING([for Sun Professinal Template Pack integration (only supported languages displayed)])
diff --git a/patches/dev300/extensions_packinfo.diff b/patches/dev300/extensions_packinfo.diff
index d069c67..21188d4 100644
--- a/patches/dev300/extensions_packinfo.diff
+++ b/patches/dev300/extensions_packinfo.diff
@@ -1,6 +1,6 @@
--- setup_native/source/packinfo/packinfo_extensions.txt.orig 2008-01-14 20:09:47.000000000 +0100
+++ setup_native/source/packinfo/packinfo_extensions.txt 2008-03-29 11:00:24.000000000 +0100
-@@ -0,0 +1,115 @@
+@@ -0,0 +1,131 @@
+# Format:
+
+# Start
@@ -115,4 +115,20 @@
+packageversion = "%PACKAGEVERSION"
+End
+
++Start
++module = "gid_Module_Optional_Extensions_NumberText"
++script = "shellscripts_extensions.txt"
++solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-numbertext"
++solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
++packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extension-numbertext"
++requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07"
++linuxpatchrequires = ""
++copyright = "2009 by FSF.hu"
++solariscopyright = "solariscopyrightfile"
++vendor = "OpenOffice.org"
++description = "Numbertext extension for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%PACKAGEVERSION"
++End
++
+
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index 05ed0b6..8d6a1b4 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
+
++/* ** Numbertext ** */
++
++#ifndef WITHOUT_EXTENSION_NUMBERTEXT
++
++File gid_File_Oxt_NumberText
++ TXT_FILE_BODY;
++ Styles = (PACKED);
++ Dir = gid_Brand_Dir_Share_Extension_Install;
++ Name = "numbertext-0.5.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,183 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -349,6 +362,23 @@ diff -Naur scp2.old/source/extensions/module_extensions.scp scp2/source/extensio
+End
+#endif
+#endif
++
++/* ** Numbertext ** */
++
++#ifndef WITHOUT_EXTENSION_NUMBERTEXT
++#ifdef WITH_EXTENSION_INTEGRATION
++Module gid_Module_Optional_Extensions_NumberText
++ PackageInfo = "packinfo_extensions.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT);
++ ParentID = gid_Module_Optional_Extensions;
++ Files = (
++ gid_File_Oxt_NumberText );
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++#endif
++#endif
+
+/* ** Sun Template Pack ** */
+
@@ -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_NUMBERTEXT]
++en-US = "Numbertext"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
++en-US = "Numbertext"
++
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
+en-US = "Sun Professional Template Pack"
+
More information about the ooo-build-commit
mailing list