[Libreoffice-commits] .: 2 commits - bin/setup.in bin/unpack configure.in download.in po/sdf-templates
Kalman "" Szalai
kami911 at kemper.freedesktop.org
Sat Oct 30 21:15:51 PDT 2010
bin/setup.in | 2 +
bin/unpack | 14 +++++++++++++
configure.in | 40 +++++++++++++++++++++++++++++++++++++-
download.in | 14 +++++++++++++
po/sdf-templates/OxygenOffice.sdf | 4 +++
5 files changed, 73 insertions(+), 1 deletion(-)
New commits:
commit fc7ff06827ca7cca024664160fb7311f71b097d7
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Oct 31 05:12:51 2010 +0100
Adding Barcode extension
diff --git a/bin/setup.in b/bin/setup.in
index cad4f0e..6133d77 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -45,6 +45,7 @@ CT2N_EXTENSION='@CT2N_EXTENSION@'
WATCH_WINDOW_EXTENSION='@WATCH_WINDOW_EXTENSION@'
DIAGRAM_EXTENSION='@DIAGRAM_EXTENSION@'
VALIDATOR_EXTENSION='@VALIDATOR_EXTENSION@'
+BARCODE_EXTENSION='@BARCODE_EXTENSION@'
GOOGLE_DOCS_EXTENSION='@GOOGLE_DOCS_EXTENSION@'
NLPSOLVER_EXTENSION='@NLPSOLVER_EXTENSION@'
LANGUAGETOOL_EXTENSION='@LANGUAGETOOL_EXTENSION@'
diff --git a/bin/unpack b/bin/unpack
index c90a018..a576f25 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -922,6 +922,13 @@ if test "x$VALIDATOR_EXTENSION" != "x"; then
cp $SRCDIR/$VALIDATOR_EXTENSION $OOBUILDDIR/extras/source/extensions/Validator.oxt || exit 1
fi
+if test "x$BARCODE_EXTENSION" != "x"; then
+ check_file $SRCDIR/$BARCODE_EXTENSION
+ echo "Copying Barcode extension into the tree"
+ mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+ cp $SRCDIR/$BARCODE_EXTENSION $OOBUILDDIR/extras/source/extensions/Barcode.oxt || 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 1a417cd..29f245f 100755
--- a/configure.in
+++ b/configure.in
@@ -486,6 +486,11 @@ AC_ARG_WITH(validator,
--with-validator Download and integrate Validator extension to Calc.],
,)
+AC_ARG_WITH(barcode,
+[
+ --with-barcode Download and integrate Barcode extension.],
+,)
+
AC_ARG_WITH(win32,
[
--with-win32 Define the build to be on Win32; this sets a number of
@@ -1392,7 +1397,6 @@ fi
AC_SUBST(WITH_DIAGRAM)
AC_SUBST(DIAGRAM_EXTENSION)
-
AC_MSG_CHECKING([whether to include Validator extension for Calc])
if test "$enable_extensions" != "no" ; then
if test "z$with_validator" = "zyes" ; then
@@ -1407,6 +1411,20 @@ fi
AC_SUBST(WITH_VALIDATOR)
AC_SUBST(VALIDATOR_EXTENSION)
+AC_MSG_CHECKING([whether to include Barcode extension])
+if test "$enable_extensions" != "no" ; then
+ if test "z$with_barcode" = "zyes" ; then
+ BARCODE_EXTENSION="Barcode_1.3.1.0.oxt"
+ WITH_BARCODE=YES
+ AC_MSG_RESULT([yes])
+ else
+ WITH_BARCODE=NO
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(WITH_BARCODE)
+AC_SUBST(BARCODE_EXTENSION)
+
AC_MSG_CHECKING([whether to include Google Docs extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_google_docs" = "zyes" ; then
diff --git a/download.in b/download.in
index e35e91c..250bae7 100755
--- a/download.in
+++ b/download.in
@@ -219,6 +219,9 @@ sub download_tests_dependencies() {
# Validator extension
'Validator*' => 'http://ftp.devall.hu/kami/go-oo/',
+# Barcode extension
+ 'Barcode*' => 'http://ftp.devall.hu/kami/go-oo/',
+
# Google Docs Extension
'gdocs*' => 'http://download.go-oo.org/src/',
@@ -610,6 +613,10 @@ if ('@VALIDATOR_EXTENSION@' ne '') {
source_file( '@VALIDATOR_EXTENSION@' );
}
+if ('@BARCODE_EXTENSION@' ne '') {
+ source_file( '@BARCODE_EXTENSION@' );
+}
+
if ('@GOOGLE_DOCS_EXTENSION@' ne '') {
source_file( '@GOOGLE_DOCS_EXTENSION@' );
}
diff --git a/po/sdf-templates/OxygenOffice.sdf b/po/sdf-templates/OxygenOffice.sdf
index 5834a41..d63bb0c 100644
--- a/po/sdf-templates/OxygenOffice.sdf
+++ b/po/sdf-templates/OxygenOffice.sdf
@@ -44,6 +44,8 @@ scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM 0 en-US Create organization chart, Venn and other diagrams for your documents. 20101030 19:19:00
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR 0 en-US Validator 20101031 04:32:00
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR 0 en-US Checking and fixing cells in Calc. 20101031 04:32:00
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_BARCODE 0 en-US Barcode 20101031 04:32:00
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_BARCODE 0 en-US Inserts barcode to your documents. 20101031 04:32:00
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 0 en-US Metaweblog Support 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 0 en-US Metaweblog Support 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER 0 en-US NLP Solver 20090819 18:33:07
commit 1370014cf4484d62977798b933f1743570f8e0e3
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Sun Oct 31 04:51:54 2010 +0100
Adding Validator extension
diff --git a/bin/setup.in b/bin/setup.in
index 14db4b9..cad4f0e 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -44,6 +44,7 @@ TYPO_EXTENSION='@TYPO_EXTENSION@'
CT2N_EXTENSION='@CT2N_EXTENSION@'
WATCH_WINDOW_EXTENSION='@WATCH_WINDOW_EXTENSION@'
DIAGRAM_EXTENSION='@DIAGRAM_EXTENSION@'
+VALIDATOR_EXTENSION='@VALIDATOR_EXTENSION@'
GOOGLE_DOCS_EXTENSION='@GOOGLE_DOCS_EXTENSION@'
NLPSOLVER_EXTENSION='@NLPSOLVER_EXTENSION@'
LANGUAGETOOL_EXTENSION='@LANGUAGETOOL_EXTENSION@'
diff --git a/bin/unpack b/bin/unpack
index 461e10b..c90a018 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -915,6 +915,13 @@ if test "x$DIAGRAM_EXTENSION" != "x"; then
cp $SRCDIR/$DIAGRAM_EXTENSION $OOBUILDDIR/extras/source/extensions/Diagram.oxt || exit 1
fi
+if test "x$VALIDATOR_EXTENSION" != "x"; then
+ check_file $SRCDIR/$VALIDATOR_EXTENSION
+ echo "Copying Validator extension into the tree"
+ mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+ cp $SRCDIR/$VALIDATOR_EXTENSION $OOBUILDDIR/extras/source/extensions/Validator.oxt || 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 c229e8d..1a417cd 100755
--- a/configure.in
+++ b/configure.in
@@ -481,6 +481,11 @@ AC_ARG_WITH(diagram,
--with-diagram Download and integrate Diagram extension.],
,)
+AC_ARG_WITH(validator,
+[
+ --with-validator Download and integrate Validator extension to Calc.],
+,)
+
AC_ARG_WITH(win32,
[
--with-win32 Define the build to be on Win32; this sets a number of
@@ -1373,7 +1378,7 @@ fi
AC_SUBST(WITH_WATCH_WINDOW)
AC_SUBST(WATCH_WINDOW_EXTENSION)
-AC_MSG_CHECKING([whether to include Diagram extension for Calc])
+AC_MSG_CHECKING([whether to include Diagram extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_diagram" = "zyes" ; then
DIAGRAM_EXTENSION="Diagram_1.1.0.0.oxt"
@@ -1387,6 +1392,21 @@ fi
AC_SUBST(WITH_DIAGRAM)
AC_SUBST(DIAGRAM_EXTENSION)
+
+AC_MSG_CHECKING([whether to include Validator extension for Calc])
+if test "$enable_extensions" != "no" ; then
+ if test "z$with_validator" = "zyes" ; then
+ VALIDATOR_EXTENSION="Validator_1.1.0.0.oxt"
+ WITH_VALIDATOR=YES
+ AC_MSG_RESULT([yes])
+ else
+ WITH_VALIDATOR=NO
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(WITH_VALIDATOR)
+AC_SUBST(VALIDATOR_EXTENSION)
+
AC_MSG_CHECKING([whether to include Google Docs extension])
if test "$enable_extensions" != "no" ; then
if test "z$with_google_docs" = "zyes" ; then
diff --git a/download.in b/download.in
index 784d99d..e35e91c 100755
--- a/download.in
+++ b/download.in
@@ -216,6 +216,9 @@ sub download_tests_dependencies() {
# Diagram extension
'Diagram*' => 'http://ftp.devall.hu/kami/go-oo/',
+# Validator extension
+ 'Validator*' => 'http://ftp.devall.hu/kami/go-oo/',
+
# Google Docs Extension
'gdocs*' => 'http://download.go-oo.org/src/',
@@ -603,6 +606,10 @@ if ('@DIAGRAM_EXTENSION@' ne '') {
source_file( '@DIAGRAM_EXTENSION@' );
}
+if ('@VALIDATOR_EXTENSION@' ne '') {
+ source_file( '@VALIDATOR_EXTENSION@' );
+}
+
if ('@GOOGLE_DOCS_EXTENSION@' ne '') {
source_file( '@GOOGLE_DOCS_EXTENSION@' );
}
diff --git a/po/sdf-templates/OxygenOffice.sdf b/po/sdf-templates/OxygenOffice.sdf
index 36f630b..5834a41 100644
--- a/po/sdf-templates/OxygenOffice.sdf
+++ b/po/sdf-templates/OxygenOffice.sdf
@@ -42,6 +42,8 @@ scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW 0 en-US The Watch Window is a separate, small window that remains "on top" and enables users to monitor a selected set of cells. 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM 0 en-US Diagram 20101030 19:19:00
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM 0 en-US Create organization chart, Venn and other diagrams for your documents. 20101030 19:19:00
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR 0 en-US Validator 20101031 04:32:00
+scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR 0 en-US Checking and fixing cells in Calc. 20101031 04:32:00
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 0 en-US Metaweblog Support 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER 0 en-US Metaweblog Support 20090819 18:33:07
scp2 source\extensions\module_extensions.ulf 0 LngText STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER 0 en-US NLP Solver 20090819 18:33:07
More information about the Libreoffice-commits
mailing list