[ooo-build-commit] bin/setup.in bin/unpack configure.in download.in patches/dev300
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Fri Nov 20 22:21:27 PST 2009
bin/setup.in | 1
bin/unpack | 7 +++++
configure.in | 19 ++++++++++++++
download.in | 7 +++++
patches/dev300/extensions_configure.diff | 21 ++++++++++++++-
patches/dev300/extensions_packinfo.diff | 18 ++++++++++++-
patches/dev300/scp2_extensions.diff | 42 ++++++++++++++++++++++++++++---
7 files changed, 109 insertions(+), 6 deletions(-)
New commits:
commit 23f08d871accb3738c205e32d832f0ff3dc7ac1c
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sat Nov 21 05:21:37 2009 +0100
Added Numbertext extension and fixed some extension related issue
* bin/setup.in:
Added Numbertext extension
* bin/unpack:
Added Numbertext extension
* configure.in:
Added Numbertext extension
* download.in:
Added Numbertext extension
Fixed NLPSolver extension download
* patches/dev300/extensions_configure.diff:
Added Numbertext extension
* patches/dev300/extensions_packinfo.diff:
Added Numbertext extension
* patches/dev300/scp2_extensions.diff:
Added Numbertext extension
Fixed Google Docs extension version number (1.9.0)
diff --git a/bin/setup.in b/bin/setup.in
index e505692..04aad65 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@'
+NUMBERTEXT_EXTENSION='@NUMBERTEXT_EXTENSION@'
GOOGLE_DOCS_EXTENSION='@GOOGLE_DOCS_EXTENSION@'
NLPSOLVER_EXTENSION='@NLPSOLVER_EXTENSION@'
OOOBLOGGER_EXTENSION='@OOOBLOGGER_EXTENSION@'
diff --git a/bin/unpack b/bin/unpack
index 332ae1c..60bd0ed 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -872,6 +872,13 @@ if test "x$LIGHTPROOF_EXTENSION" != "x"; then
$GNUCP $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 $SRCDIR/$NUMBERTEXT_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"
diff --git a/configure.in b/configure.in
index da93193..4b3c8b2 100644
--- a/configure.in
+++ b/configure.in
@@ -388,6 +388,11 @@ AC_ARG_WITH(lightproof,
checker" extension.],
,)
+AC_ARG_WITH(numbertext,
+[
+ --with-numbertext Download and integrate the Numbertext Calc numerical extension.],
+,)
+
AC_ARG_WITH(gnu-cp,
[
--with-gnu-cp The parameter is an absolute path to GNU cp.
@@ -1382,6 +1387,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.7.1.oxt"
+ WITH_NUMBERTEXT=YES
+ AC_MSG_RESULT([yes])
+ else
+ WITH_NUMBERTEXTF=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/download.in b/download.in
index 7343348..0a10cee 100755
--- a/download.in
+++ b/download.in
@@ -146,6 +146,9 @@ sub trim($)
# Lightproof extension
'lightproof-*' => 'http://ftp.devall.hu/kami/go-oo/',
+# Numbertext extension
+ 'numbertext-*' => 'http://ftp.devall.hu/kami/go-oo/',
+
# Google Docs Extension
'gdocs*' => 'http://download.go-oo.org/src/',
@@ -467,6 +470,10 @@ if ('@LIGHTPROOF_EXTENSION@' ne '') {
source_file( '@LIGHTPROOF_EXTENSION@' );
}
+if ('@NUMBERTEXT_EXTENSION@' ne '') {
+ source_file( '@NUMBERTEXT_EXTENSION@' );
+}
+
if ('@GOOGLE_DOCS_EXTENSION@' ne '') {
source_file( '@GOOGLE_DOCS_EXTENSION@' );
}
diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 2bed7e6..d95f249 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -14,7 +14,7 @@
AC_ARG_WITH(fonts,
[ --without-fonts OOo includes some third-party fonts to provide a reliable
basis for help content, templates, samples, etc.
-@@ -829,6 +836,31 @@ AC_ARG_WITH(alloc,
+@@ -829,6 +836,36 @@ AC_ARG_WITH(alloc,
[ --with-alloc Define which allocator to build with
(choices are oo, system, tcmalloc)
],,)
@@ -28,6 +28,11 @@
+ --with-lightproof Integrate Lightproof extension],
+,)
+
++AC_ARG_WITH(numbertext,
++[
++ --with-numbertext Integrate Numbertext extension],
++,)
++
+AC_ARG_WITH(google-docs,
+[
+ --with-google-docs Download and integrate Google Documents extension.],
@@ -86,7 +91,7 @@
SYSTEM_JFREEREPORT=NO
fi
AC_SUBST(ENABLE_REPORTBUILDER)
-@@ -6609,6 +6646,98 @@ else
+@@ -6609,6 +6646,110 @@ else
fi
dnl ===================================================================
@@ -116,6 +121,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 Google Docs extension
+dnl ===================================================================
+AC_MSG_CHECKING([for Google Docs extension integration])
diff --git a/patches/dev300/extensions_packinfo.diff b/patches/dev300/extensions_packinfo.diff
index e206876..521cd80 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,161 @@
+@@ -0,0 +1,177 @@
+# Format:
+
+# Start
@@ -116,6 +116,22 @@
+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
++
++Start
+module = "gid_Module_Optional_Extensions_Google_Docs"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extension-google-docs"
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index cd00d52..a9a092b 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -1,6 +1,6 @@
--- scp2/source/extensions/file_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/file_extensions.scp 2009-10-27 15:36:41.000000000 +0100
-@@ -0,0 +1,174 @@
+@@ -0,0 +1,187 @@
+/*************************************************************************
+*
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -118,6 +118,19 @@
+
+#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.7.1.oxt";
++End
++
++#endif
++
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
@@ -238,7 +251,7 @@
+.INCLUDE : target.mk
--- scp2/source/extensions/module_extensions.scp.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/module_extensions.scp 2009-10-27 15:40:55.000000000 +0100
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,234 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -386,6 +399,23 @@
+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
+
+/* ** Google Docs ** */
+
@@ -517,7 +547,7 @@
+#endif
--- scp2/source/extensions/module_extensions.ulf.old 2009-10-27 15:31:48.000000000 +0100
+++ scp2/source/extensions/module_extensions.ulf 2009-10-27 15:50:25.000000000 +0100
-@@ -0,0 +1,760 @@
+@@ -0,0 +1,766 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -595,6 +625,12 @@
+[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_GOOGLE_DOCS]
+en-US = "Google Docs & Zoho"
+
More information about the ooo-build-commit
mailing list