Re: HttpClient - HttpComponents

[Niko Rönkkö]

Hi


Any idea?


Isn't there any C/C++ equivalent to replace that and at the same time
ged rid of one Java depedency?

--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: convert setup_native to gbuild and add to tail_build

[Niko Rönkkö]

Hi!

This commit breaks my Mac build with error message:
Unrecognized option: -p
Usage: ulfconv [-o output file] [-t encoding table] [ulf file]

Problem seems to be on line 22 in CustomTarget_mac.mk:
http://opengrok.libreoffice.org/xref/core/setup_native/CustomTarget_mac.mk#22

--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[SOLVED] Re: convert setup_native to gbuild and add to tail_build

[Niko Rönkkö]

Peter,


Can you see if it works now?


Yes, it works now, thanks.

--
RN

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Weird code found by clang

[Niko Rönkkö]

On 1.3.2012 23.13, Tor Lillqvist wrote:
 svtools/source/dialogs/addresstemplate.cxx:195:23: error:
 self-comparison always evaluates to false
 [-Werror,-Wtautological-compare]
  for (;pFields != pFields; ++pFields)
^
 What should this be? Or is what it currently does, exit the loop after
 one pass through, actually what's wanted?

Probably it should be pFields != pFieldsEnd ? See original commit:
http://opengrok.libreoffice.org/xref/core/svtools/source/dialogs/addresstemplate.cxx?a=truer=447a63cfb6d6d3dff63af72490a4c0b96295db6d#250

--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-5, 3-5-1] Fix leap year calculation

[Niko Rönkkö]

Hi

The fix is correct so +1 from me if that counts.

--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [Pushed] Removed LineListBox methods listed in unusedcode.easy

[Niko Rönkkö]

Hi!

On 23.01.2012 10:26, Muthu Subramanian K wrote:

Pushed! Thank you for the patch!


The only problem is that these entries will come back when the call
catcher magician Caolán regenerates the unusedcode.easy list next time.

--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Flat ODF usage in Git [Was: concept for c++ based subsequenttests]

[Niko Rönkkö]

Only one query; I wonder whether we should be using the flat (fods)
file-type for these tests - so we can read meaningful diffs to them in
the git history.


+1 for this...
... and I also think that all ODF files in git repos should be in Flat
ODFormat so that the Git can track them easily.

Just my 2 snt's.

--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] RFC Operation Spamzilla

[Niko Rönkkö]

On 22.12.2011 22.33, Bjoern Michaelsen wrote:

[This is an automated message.]
This bug was filed before the changes to Bugzilla on 2011-10-16. Thus it
started right out as NEW without ever being explicitly confirmed. The bug is
changed to state NEEDINFO for this reason. To move this bug from NEEDINFO back
to NEW please check if the bug still persists with the 3.5.0 beta1 prerelease.
Details on how to test the 3.5.0 beta1 can be found at:
http://wiki.documentfoundation.org/QA/BugHunting_Session_3.5.0.-1


Shouldn't it be 3.5.0 Beta 2 and not Beta 1?

--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] Easy hack regex compile infinite loop ( bug 41738 )

[Niko Rönkkö]

Hi Karl,

Seems that nobody has noticed your message:
http://lists.freedesktop.org/archives/libreoffice/2011-November/020211.html

You should always use [PATCH] in your Subject when sending patches to
the list to get needed attention from developers.

-- 
Kind regards

Niko, who is not a developer
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Easy hack regex compile infinite loop ( bug 41738 )

[Niko Rönkkö]

Sorry all,

I was wrong – Karls later message has been noticed:
http://lists.freedesktop.org/archives/libreoffice/2011-November/020417.html

-- 
Silly Niko
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Updated [Patch] new BITxxx functions for ODF 1.2

[Niko Rönkkö]

Hi


Wonderful, great stuff - I have to apologize, the many whitespace
changes in the calc part of the patch are because of my substandard
mentoring - cleaned-up version of the first patch attached.


I was in the belief that we shall use spaces instead of tabs.

Corrected patches attached.

--
RN
From 9536eed6be175243f9e55f5715d1fb784a6f5f4f Mon Sep 17 00:00:00 2001
From: Wolfgang Pechlaner l...@pechlaner.at
Date: Sun, 4 Sep 2011 14:40:25 +0200
Subject: [PATCH] BITxxx functions for ODF 1.2

---
 sc/inc/helpids.h |5 +
 sc/qa/unit/ucalc.cxx |5 +
 sc/source/core/inc/interpre.hxx  |5 +
 sc/source/core/tool/interpr1.cxx |  101 
 sc/source/core/tool/interpr4.cxx |5 +
 sc/source/ui/src/scfuncs.src |  156 ++
 sc/util/hidother.src |5 +
 7 files changed, 282 insertions(+), 0 deletions(-)

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index c80dd1b..b04aa77 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -692,3 +692,8 @@
 #define HID_FUNC_UNICODESC_HID_FUNC_UNICODE
 #define HID_FUNC_UNICHARSC_HID_FUNC_UNICHAR
 #define HID_FUNC_NUMBERVALUESC_HID_FUNC_NUMBERVALUE
+#define HID_FUNC_BITAND SC_HID_FUNC_BITAND
+#define HID_FUNC_BITOR  SC_HID_FUNC_BITOR
+#define HID_FUNC_BITXOR SC_HID_FUNC_BITXOR
+#define HID_FUNC_BITLSHIFT  SC_HID_FUNC_BITLSHIFT
+#define HID_FUNC_BITRSHIFT  SC_HID_FUNC_BITRSHIFT
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 7430a60..533fbe2 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1742,6 +1742,11 @@ void Test::testFunctionLists()
 
 const char* aLogical[] = {
 AND,
+BITAND,
+BITLSHIFT,
+BITOR,
+BITRSHIFT,
+BITXOR,
 FALSE,
 IF,
 NOT,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 27027d5..50881d6 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -412,6 +412,11 @@ void ScAnd();
 void ScOr();
 void ScNot();
 void ScNeg();
+void ScBitAnd();
+void ScBitOr();
+void ScBitXor();
+void ScBitRshift();
+void ScBitLshift();
 void ScPercentSign();
 void ScIntersect();
 void ScRangeFunc();
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f581ac7..3921e0e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -1391,6 +1391,107 @@ void ScInterpreter::ScNeg()
 }
 
 
+void ScInterpreter::ScBitAnd()
+{
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, ScInterpreter::ScBitAnd );
+
+if ( !MustHaveParamCount( GetByte(), 2 ) )
+  return;
+
+ double num1, num2;
+ num1 = GetDouble();
+ num2 = GetDouble();
+ if ((num1  281474976710655) or (num1  0) or
+ (num2  281474976710655) or (num2  0)) {
+PushIllegalArgument();
+ }
+
+  PushDouble ((sal_uInt64) num1  (sal_uInt64) num2);
+}
+
+
+void ScInterpreter::ScBitOr()
+{
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, ScInterpreter::ScBitOr );
+
+  if ( !MustHaveParamCount( GetByte(), 2 ) )
+  return;
+
+double num1, num2;
+num1 = GetDouble();
+num2 = GetDouble();
+if ((num1  281474976710655) or (num1  0) or
+(num2  281474976710655) or (num2  0)) {
+  PushIllegalArgument();
+}
+
+PushDouble ((sal_uInt64) num1 | (sal_uInt64) num2);
+}
+
+
+void ScInterpreter::ScBitXor()
+{
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, ScInterpreter::ScBitXor );
+
+if ( !MustHaveParamCount( GetByte(), 2 ) )
+  return;
+
+double num1, num2;
+num1 = GetDouble();
+num2 = GetDouble();
+if ((num1  281474976710655) or (num1  0) or
+(num2  281474976710655) or (num2  0)) {
+ PushIllegalArgument();
+}
+
+PushDouble ((sal_uInt64) num1 ^ (sal_uInt64) num2);
+}
+
+
+void ScInterpreter::ScBitLshift()
+{
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, ScInterpreter::ScBitLshift );
+
+if ( !MustHaveParamCount( GetByte(), 2 ) )
+  return;
+
+sal_uInt64 erg;
+sal_Int32 ishift = GetDouble();
+double num = GetDouble();
+if ((num  281474976710655) or (num  0))  {
+PushIllegalArgument();
+}
+if (ishift  0) {
+  erg = (sal_uInt64) num  -ishift;
+} else {
+  erg = (sal_uInt64) num  ishift;
+}
+PushDouble (erg);
+}
+
+void ScInterpreter::ScBitRshift()
+{
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, ScInterpreter::ScBitRshift );
+
+if ( !MustHaveParamCount( GetByte(), 2 ) )
+  return;
+sal_uInt64 erg;
+sal_Int32 ishift = GetDouble();
+double num = GetDouble();
+if ((num  281474976710655) 

Re: [Libreoffice] Git hangs?

[Niko Rönkkö]

Hi Olivier

As Michael mentioned you can try to use http reguest instead:
$ git clone 
http://anongit.freedesktop.org/git/libreoffice/bootstrap.git/ libo


--
RN
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH] Add config.guess to .gitignore

[Niko Rönkkö]

To origin/master and MPL 1.1 / GPLv3+ / LGPLv3+ of course.
From 98ab4a6a5089266257603171ac9f40e28f85cf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi
Date: Wed, 18 May 2011 17:35:08 +0300
Subject: [PATCH] Add config.guess to .gitignore

Added pattern '/config.guess' to gitignore file.
---
 .gitignore |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index c17ae1f..98d742b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@
 /autogen.lastrun
 /bootstrap
 /ChangeLog
+/config.guess
 /config.log
 /config.parms
 /config.status
-- 
1.7.4.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH] Removal of deprecated options

[Niko Rönkkö]

Still to master and MPL 1.1 / GPLv3+ / LGPLv3+
From f284735c1be452cf65a9f8b93fa535e00471aff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi
Date: Thu, 19 May 2011 00:28:04 +0300
Subject: [PATCH] Removal of deprecated options

Removed all deprecated options of extensions from configure and
fixed style of next subtitle.

Fixed distro-configs LibreOfficeWin32 and NovellWin32 correspondingly.
---
 configure.in|  110 +--
 distro-configs/LibreOfficeWin32.conf.in |2 +-
 distro-configs/NovellWin32.conf.in  |2 +-
 3 files changed, 4 insertions(+), 110 deletions(-)

diff --git a/configure.in b/configure.in
index cfc9aa1..18ef132 100755
--- a/configure.in
+++ b/configure.in
@@ -524,117 +524,11 @@ AC_ARG_WITH(win32,
   defaults suitable for that platform.],
 ,)
 
-dnl -- Deprecated since 2010-11-05 --
-
-AC_ARG_WITH(barcode,
-AS_HELP_STRING([--with-barcode],
-[Deprecated: use --enable-ext-barcode instead.]),
-if test -z $enable_ext_barcode; then
-enable_ext_barcode=$with_barcode;
-fi ,
-)
-
-AC_ARG_WITH(ct2n,
-AS_HELP_STRING([--with-ct2n],
-[Deprecated: use --enable-ext-ct2n instead.]),
-if test -z $enable_ext_ct2n; then
-enable_ext_ct2n=$with_ct2n;
-fi ,
-)
-
-AC_ARG_WITH(diagram,
-AS_HELP_STRING([--with-diagram],
-[Deprecated: use --enable-ext-diagram instead.]),
-if test -z $enable_ext_diagram; then
-enable_ext_diagram=$with_diagram;
-fi ,
-)
-
-AC_ARG_WITH(google-docs,
-AS_HELP_STRING([--with-google-docs],
-[Deprecated: use --enable-ext-google-docs instead.]),
-if test -z $enable_ext_google_docs; then
-enable_ext_google_docs=$with_google_docs;
-fi ,
-)
-
-AC_ARG_WITH(hunart,
-AS_HELP_STRING([--with-hunart],
-[Deprecated: use --enable-ext-hunart instead.]),
-if test -z $enable_ext_hunart; then
-enable_ext_hunart=$with_hunart;
-fi ,
-)
-
-AC_ARG_WITH(languagetool,
-AS_HELP_STRING([--with-languagetool],
-[Deprecated: use --enable-ext-languagetool instead.]),
-if test -z $enable_ext_languagetool; then
-enable_ext_languagetool=$with_languagetool;
-fi ,
-)
-
-AC_ARG_WITH(lightproof,
-AS_HELP_STRING([--with-lightproof],
-[Deprecated: use --enable-ext-lightproof instead.]),
-if test -z $enable_ext_lightproof; then
-enable_ext_lightproof=$with_lightproof;
-fi ,
-)
-
-AC_ARG_WITH(nlpsolver,
-AS_HELP_STRING([--with-nlpsolver],
-[Deprecated: use --enable-ext-nlpsolver instead.]),
-if test -z $enable_ext_nlpsolver; then
-enable_ext_nlpsolver=$with_nlpsolver;
-fi ,
-)
-
-AC_ARG_WITH(numbertext,
-AS_HELP_STRING([--with-numbertext],
-[Deprecated: use --enable-ext-numbertext instead.]),
-if test -z $enable_ext_numbertext; then
-enable_ext_numbertext=$with_numbertext;
-fi ,
-)
-
-AC_ARG_WITH(oooblogger,
-AS_HELP_STRING([--with-oooblogger],
-[Deprecated: use --enable-ext-oooblogger instead.]),
-if test -z $enable_ext_oooblogger; then
-enable_ext_oooblogger=$with_oooblogger;
-fi ,
-)
-
-AC_ARG_WITH(typo,
-AS_HELP_STRING([--with-typo],
-[Deprecated: use --enable-ext-typo instead.]),
-if test -z $enable_ext_typo; then
-enable_ext_typo=$with_typo;
-fi ,
-)
-
-AC_ARG_WITH(validator,
-AS_HELP_STRING([--with-validator],
-[Deprecated: use --enable-ext-validator instead.]),
-if test -z $enable_ext_validator; then
-enable_ext_validator=$with_validator;
-fi ,
-)
-
-AC_ARG_WITH(watch-window,
-AS_HELP_STRING([--with-watch-window],
-[Deprecated: use --enable-ext-watch-window instead.]),
-if test -z $enable_ext_watch_window; then
-enable_ext_watch_window=$with_watch_window;
-fi ,
-)
-
 AM_MAINTAINER_MODE
 
-dnl
+dnl ===
 dnl Setup the misc. tweaks we need.
-dnl
+dnl ===
 BASEDIR=$PWD
 TOOLSDIR=$BASEDIR
 
diff --git a/distro-configs/LibreOfficeWin32.conf.in b/distro-configs/LibreOfficeWin32.conf.in
index 5a675d9..18d6bbd 100644
--- a/distro-configs/LibreOfficeWin32.conf.in
+++ b/distro-configs/LibreOfficeWin32.conf.in
@@ -3,9 +3,9 @@
 --without-junit
 --without-helppack-integration
 --without-agfa-monotype-fonts
---with-nlpsolver
 --with-java-target-version=1.5
 --with-extension-integration
+--enable-ext-nlpsolver
 --enable-wiki-publisher
 --enable-report-builder
 --enable-presenter-console
diff --git a/distro-configs/NovellWin32.conf.in b/distro-configs/NovellWin32.conf.in
index 461ede0..33c9e70 100644
--- a/distro-configs/NovellWin32.conf.in
+++ b/distro-configs/NovellWin32.conf.in
@@ -7,10 +7,10 @@
 --enable-activex-component
 --disable-xrender-link
 --without-junit
---with-nlpsolver
 --with-java-target-version=1.5
 

[Libreoffice] [PATCH] Removal of obsolete option --with-unstable-wp

[Niko Rönkkö]

MPL 1.1 / GPLv3+ / LGPLv3+

see:
http://cgit.freedesktop.org/libreoffice/build/commit/?id=9e0f4d66e7b219baa142fe86f2167e37d8f8e6f7
From dc6697dec2cd2ad3ba9e1b21bd4f73699bb80b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi
Date: Tue, 16 Nov 2010 16:50:30 +0200
Subject: [PATCH] Removal of obsolete option --with-unstable-wp

Removed obsolete option --with-unstable-wp.

See: 9e0f4d66e7b219baa142fe86f2167e37d8f8e6f7
---
 configure.in |5 -
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index c2a2a01..a20045c 100755
--- a/configure.in
+++ b/configure.in
@@ -494,11 +494,6 @@ AC_ARG_WITH(system-libwps,
   --with-system-libwpsUse system libwps* library.],
 ,)
 
-AC_ARG_WITH(unstable-wp,
-[
-  --with-unstable-wp  Use new unstable libwp* libraries.],
-,)
-
 AC_ARG_WITH(win32,
 [
   --with-win32Define the build to be on Win32; this sets a number of
-- 
1.7.0.4

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCHES] Eight small patches to remove trailing whitespaces from help

[Niko Rönkkö]

All trailing whitespaces (spaces and tabs) removed from help repository.
In that place those really multiplies and quickly...

Patches found in:
http://ronkko.wippiespace.com/LibO/

MPL 1.1 / GPLv3+ / LGPLv3+

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH] Fix configure --help width

[Niko Rönkkö]

Fixed width of description of --with-openclipart to 80 chars.

MPL 1.1 / GPLv3+ / LGPLv3+
From 66397cc937db66708b1ff2d8f7ba93c4b2397fe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi
Date: Wed, 10 Nov 2010 11:56:19 +0200
Subject: [PATCH] Fix configure --help width

Fixed width of configure --help to be 80 chars.
---
 configure.in |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 3ec64c6..4343f05 100755
--- a/configure.in
+++ b/configure.in
@@ -424,9 +424,9 @@ AC_ARG_WITH(ooo-builddir,
 
 AC_ARG_WITH(openclipart,
 [
-  --with-openclipart  Build and install LibreOffice galleries from the Open Clip Art
-  Library. The parameter is either a version of the
-  library or an absolute path to the prebuilt and
+  --with-openclipart  Build and install LibreOffice galleries from the Open
+  Clip Art Library. The parameter is either a version of
+  the library or an absolute path to the prebuilt and
   preinstalled .png files.
 
   Examples:  --with-openclipart=0.13
-- 
1.7.0.4

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCHES] Renaming to --enable-ext-*

[Niko Rönkkö]

New try.
From 3cad28b8c61f66c06a4e76f398e78c57597ce49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi
Date: Fri, 5 Nov 2010 19:08:58 +0200
Subject: [PATCH] Renaming extension options consistently
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renamed all extensions to --enable-ext-* because
we do want to present them together in ./configure --help

See: b765a28ea9d63b60a14786b1a5484227175d413e

Deprecated old options not removed but commented instead.

¡There are still extensions which are only in build/configure.in!

Changed BUILD_TYPE from OOo to LibO

See: Elide all SO: and OOo: build.lst prefixes
---
 configure.in |  335 ++
 1 files changed, 242 insertions(+), 93 deletions(-)

diff --git a/configure.in b/configure.in
index aab3995..1caf430 100644
--- a/configure.in
+++ b/configure.in
@@ -8,6 +8,103 @@ echo $@ config.parms
 dnl ===
 dnl Optional Features (--enable/disable-)
 dnl ===
+
+dnl -- Extensions --
+
+AC_ARG_ENABLE(ext-barcode,
+AS_HELP_STRING([--enable-ext-barcode],
+[Enables the Barcode extension.]),
+,)
+
+AC_ARG_ENABLE(ext-diagram,
+AS_HELP_STRING([--enable-ext-diagram],
+[Enables the Diagram extension.]),
+,)
+
+AC_ARG_ENABLE(ext-google-docs,
+AS_HELP_STRING([--enable-ext-google-docs],
+[Download and enables the Google Documents extension.]),
+,)
+
+AC_ARG_ENABLE(ext-hunart,
+AS_HELP_STRING([--enable-ext-hunart],
+[Enables the Hungarian Cross-reference Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-lightproof,
+AS_HELP_STRING([--enable-ext-lightproof],
+[Enables the Lightproof extension.]),
+,)
+
+AC_ARG_ENABLE(ext-mysql-connector,
+AS_HELP_STRING([--enable-ext-mysql-connector],
+[Enables the build of the MySQL Connector/LibO extension. This requires
+ access to the MySQL Connector/C (aka libmysql) to be given, too, with
+ either the --with-system-mysql or --with-libmysql-path option.]),
+,)
+
+AC_ARG_ENABLE(ext-nlpsolver,
+AS_HELP_STRING([--enable-ext-nlpsolver],
+[Download and enables the NLPSolver extension.]),
+,)
+
+AC_ARG_ENABLE(ext-numbertext,
+AS_HELP_STRING([--enable-ext-numbertext],
+[Enables the Numbertext extension.]),
+,)
+
+AC_ARG_ENABLE(ext-oooblogger,
+AS_HELP_STRING([--enable-ext-oooblogger],
+[Download and enables the OOo Blogger extension.]),
+,)
+
+AC_ARG_ENABLE(ext-pdfimport,
+AS_HELP_STRING([--enable-ext-pdfimport],
+[Enables the PDF Import extension and xpdf.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-console,
+AS_HELP_STRING([--enable-ext-presenter-console],
+[Enables the Presenter Console extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-minimizer,
+AS_HELP_STRING([--enable-ext-presenter-minimizer],
+[Enables the Presentation Minimizer extension.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-ui,
+AS_HELP_STRING([--enable-ext-presenter-ui],
+[Enables extra functionality during slideshows, e.g. selecting pen color.]),
+,)
+
+AC_ARG_ENABLE(ext-report-builder,
+AS_HELP_STRING([--enable-ext-report-builder],
+[Enables the build of the Report Builder extension.]),
+,)
+
+AC_ARG_ENABLE(ext-typo,
+AS_HELP_STRING([--enable-ext-typo],
+[Enables the Typography Toolbar extension.]),
+,)
+
+AC_ARG_ENABLE(ext-validator,
+AS_HELP_STRING([--enable-ext-validator],
+[Enables the Validator extension.]),
+,)
+
+AC_ARG_ENABLE(ext-watch-window,
+AS_HELP_STRING([--enable-ext-watch-window],
+[Enables the Watch Window extension to Calc.]),
+,)
+
+AC_ARG_ENABLE(ext-wiki-publisher,
+AS_HELP_STRING([--enable-ext-wiki-publisher],
+[Enables the Wiki Publisher extension.]),
+,)
+
+dnl -- *** --
+
 AC_ARG_ENABLE(graphite,
 AS_HELP_STRING([--enable-graphite],
 [Enables the compilation of Graphite smart font rendering.]),
@@ -377,6 +474,64 @@ AC_ARG_ENABLE(cl-x64,
 [Use the Microsoft C/C++ x64 compiler instead of the default x86 one.]),
 ,)
 
+dnl -- Deprecated since 2010-11-05 --
+
+AC_ARG_ENABLE(mysql-connector,
+AS_HELP_STRING([--enable-mysql-connector],
+[Deprecated: use --enable-ext-mysql-connector instead.]),
+if test -z $enable_ext_mysql_connector; then
+enable_ext_mysql_connector=$enable_mysql_connector;
+fi ,
+)
+
+AC_ARG_ENABLE(presenter-extra-ui,
+AS_HELP_STRING([--enable-presenter-extra-ui],
+[Deprecated: use --enable-ext-presenter-ui instead.]),
+if test -z $enable_ext_presenter_ui; then
+enable_ext_presenter_ui=$enable_presenter_extra_ui;
+fi ,
+)
+
+AC_ARG_ENABLE(minimizer,
+AS_HELP_STRING([--enable-minimizer],
+[Deprecated: use --enable-ext-presenter-minimizer instead.]),
+

[Libreoffice] [PATCH] Renaming extension options consistently

[Niko Rönkkö]

Renamed all extensions to --enable-ext-* because
we do want to present them together in ./configure --help

Deprecated old options not removed but commented instead.

Fixed: --without-java (from Wol)
---
 configure.in |  296 
--

 1 files changed, 205 insertions(+), 91 deletions(-)

Patch updated after changes made by Andras Timar.

Remember to push also:
lists.freedesktop.org/archives/libreoffice/2010-November/002154.html
lists.freedesktop.org/archives/libreoffice/2010-November/002159.html

diff --git a/configure.in b/configure.in
index b7d7852..8db9da5 100755
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,9 @@ AC_SUBST(OOO_BUILDVERSION)
 PROPAGATED_ARGS=$ac_configure_args
 AC_SUBST(PROPAGATED_ARGS)
 
-# Optional Features:
+dnl ===
+dnl Optional Features (--enable/disable-)
+dnl ===
 AC_ARG_ENABLE(access,
 [
   --disable-accessDisable the Access import pieces.],
@@ -55,6 +57,81 @@ AC_ARG_ENABLE(dbgutil,
   (This generates a non-product build.)],
 ,)
 
+AC_ARG_ENABLE(ext-barcode,
+[
+  --enable-ext-barcodeDownload and integrate Barcode extension.],
+,)
+
+AC_ARG_ENABLE(ext-ct2n,
+[
+  --enable-ext-ct2n   Download and integrate ConvertTextToNumber extension.],
+,)
+
+AC_ARG_ENABLE(ext-diagram,
+[
+  --enable-ext-diagramDownload and integrate Diagram extension.],
+,)
+
+AC_ARG_ENABLE(ext-google-docs,
+[
+  --enable-ext-google-docs
+  Download and integrate Google Documents extension.],
+,)
+
+AC_ARG_ENABLE(ext-hunart,
+[
+  --enable-ext-hunart Download and integrate the Hungarian cross-reference
+  toolbar extension.],
+,)
+
+AC_ARG_ENABLE(ext-languagetool,
+[
+  --enable-ext-languagetool
+  Download and integrate LanguageTool extension.],
+,)
+
+AC_ARG_ENABLE(ext-lightproof,
+[
+  --enable-ext-lightproof
+  Download and integrate the Lightproof grammar
+  checker extension.],
+,)
+
+AC_ARG_ENABLE(ext-nlpsolver,
+[
+  --enable-ext-nlpsolver  Download and integrate NLPSolver extension.],
+,)
+
+AC_ARG_ENABLE(ext-numbertext,
+[
+  --enable-ext-numbertext
+  Download and integrate the Numbertext Calc numerical
+  extension.],
+,)
+
+AC_ARG_ENABLE(ext-oooblogger,
+[
+  --enable-ext-oooblogger
+  Download and integrate oooblogger extension.],
+,)
+
+AC_ARG_ENABLE(ext-typo,
+[
+  --enable-ext-typo   Download and integrate the Typography toolbar
+  extension.],
+,)
+
+AC_ARG_ENABLE(ext-validator,
+[
+  --enable-ext-validator  Download and integrate Validator extension to Calc.],
+,)
+
+AC_ARG_ENABLE(ext-watch-window,
+[
+  --enable-ext-watch-window
+  Download and integrate Watch Window extension to Calc.],
+,)
+
 AC_ARG_ENABLE(extensions,
 [
   --enable-extensions Enables the unpacking of the extensions sources.],
@@ -125,14 +202,9 @@ AC_ARG_ENABLE(tests,
   --enable-tests  Enables the execution of the tests.],
 ,)
 
-# This is here only to make --help work nicely:
-# Shouldn't this be a --enabe-java or AC_ARG_WITH instead?
-AC_ARG_ENABLE(java,
-[
-  --with-java Build LibO with a JDK  Java support.],
-,)
-
-# Optional Packages:
+dnl ===
+dnl Optional Packages (--with/without-)
+dnl ===
 AC_ARG_WITH(additional-sections,
 [
   --with-additional-sections
@@ -168,11 +240,6 @@ AC_ARG_WITH(binsuffix,
   Default:   --with-binsuffix=2.0],
 ,)
 
-AC_ARG_WITH(ct2n,
-[
-  --with-ct2n Download and integrate ConvertTextToNumber extension.],
-,)
-
 AC_ARG_WITH(dejavu-fonts,
 [
   --with-dejavu-fonts Download and install updated DejaVu fonts.
@@ -254,17 +321,6 @@ AC_ARG_WITH(gnu-tar,
   Example:   --with-gnu-cp=/usr/local/bin/gtar],
 ,)
 
-AC_ARG_WITH(google-docs,
-[
-  --with-google-docs  Download and integrate Google Documents extension.],
-,)
-
-AC_ARG_WITH(hunart,
-[
-  --with-hunart   Download and integrate the Hungarian cross-reference
-  toolbar extension.],
-,)
-
 AC_ARG_WITH(icecream-bindir,
 [
   --with-icecream-bindir  Location of icecream's gcc and g++.
@@ -288,6 +344,11 @@ AC_ARG_WITH(internal-gcc,
   binutils 2.18).],
 ,)
 
+AC_ARG_WITH(java,
+[
+  --without-java  Build LibO without a JDK  Java support.],
+,with_java=yes)
+
 AC_ARG_WITH(lang,
 [
   --with-lang Define the localizations to build. The English one is
@@ -297,11 +358,6 @@ AC_ARG_WITH(lang,
  --with-lang=ALL],
 ,)
 
-AC_ARG_WITH(languagetool,
-[
-  

[Libreoffice] [PATCH] Elide all SO: and OOo: prefixes

[Niko Rönkkö]

---
 stlport/prj/build.lst |2 +-
 crashrep/prj/build.lst|2 +-
 xmlsecurity/prj/build.lst |2 +-
 connectivity/prj/build.lst |2 +-
 desktop/prj/build.lst  |2 +-
 boost/prj/build.lst  |2 +-
 moz/prj/build.lst|2 +-
 python/prj/build.lst |2 +-
 libxmlsec/prj/build.lst |2 +-
 vcl/prj/build.lst |2 +-
 postprocess/prj/build.lst |2 +-
 sw/prj/build.lst |2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)


diff --git a/stlport/prj/build.lst b/stlport/prj/build.lst
index 259feec..61ca4be 100644
--- a/stlport/prj/build.lst
+++ b/stlport/prj/build.lst
@@ -1,2 +1,2 @@
-sl	stlport	:   SO:so_prereq solenv NULL
+sl	stlport	:   so_prereq solenv NULL
 sl	stlport		nmake	-	all	sl_mkout NULL

diff --git a/crashrep/prj/build.lst b/crashrep/prj/build.lst
index ef1c85c..51d1510 100755
--- a/crashrep/prj/build.lst
+++ b/crashrep/prj/build.lst
@@ -1,4 +1,4 @@
-cr	crashrep	:l10n sal sysui SO:tools shell NULL
+cr	crashrep	:l10n sal sysui tools shell NULL
 cr	crashrepusr1	-	all	cr_mkout NULL
 cr	crashrep\source\all		nmake	-	all	cr_sresource NULL
 cr	crashrep\source\unx		nmake	-	u	cr_sunx NULL
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index cd43832..358038b 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,4 +1,4 @@
-xs	xmlsecurity	:l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss NULL
+xs	xmlsecurity	:l10n xmloff unotools offapi unoil svx MOZ:moz moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss NULL
 xs	xmlsecurityusr1	 -	all	xs_mkout	NULL
 xs	xmlsecurity\inc   nmake -	all	xs_inc NULL
 xs	xmlsecurity\source\framework   nmake -	all	xs_fw xs_inc NULL

diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 0b15c06..7960c2e 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity:shell  l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL
+cn  connectivity:shell  l10n comphelper MOZ:moz moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss NULL
 cn  connectivityusr1-   all cn_mkout NULL
 cn  connectivity\incnmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb nmake   -   all cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 162c43b..1a9fd86 100644
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -1,4 +1,4 @@
-dt  desktop :l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
+dt  desktop :l10n sfx2 stoc BERKELEYDB:berkeleydb sysui sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
 dt	desktop	usr1	-	all	dt_mkout NULL
 dt	desktop\incnmake	-	all	dt_inc NULL
 dt	desktop\prjget		-	all	dt_prj NULL

diff --git a/boost/prj/build.lst b/boost/prj/build.lst
index 421265b..694f356 100644
--- a/boost/prj/build.lst
+++ b/boost/prj/build.lst
@@ -1,3 +1,3 @@
-bo  boost : SO:so_prereq solenv NULL
+bo  boost : so_prereq solenv NULL
 bo  boost   usr1-   all bo_mkout NULL
 bo  boost   nmake   -   all bo_boost NULL
diff --git a/moz/prj/build.lst b/moz/prj/build.lst
index 717c309..822d848 100644
--- a/moz/prj/build.lst
+++ b/moz/prj/build.lst
@@ -1,4 +1,4 @@
-moz	moz : solenv SO:so_prereq NSS:nss NULL
+moz	moz : solenv so_prereq NSS:nss NULL
 moz	mozusr1	-	all	moz_mkout NULL
 moz	moznmake	-	all	moz_mozilla NULL
 moz	moz\zipped			nmake	-	all	moz_zipped	moz_mozilla NULL
diff --git a/python/prj/build.lst b/python/prj/build.lst
index f5ea98a..19132e3 100644
--- a/python/prj/build.lst
+++ b/python/prj/build.lst
@@ -1,3 +1,3 @@
-py	python	:	SO:so_prereq solenv OPENSSL:openssl NULL
+py	python	:	so_prereq solenv OPENSSL:openssl NULL
 py	python			nmake	-	w,vc7	py_mkout NULL
 py	python			nmake	-	u	py_mkout NULL

diff --git a/libxmlsec/prj/build.lst b/libxmlsec/prj/build.lst
index a4faaa8..6ee4f6c 100644
--- a/libxmlsec/prj/build.lst
+++ b/libxmlsec/prj/build.lst
@@ -1,3 +1,3 @@
-ls  libxmlsec   : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL
+ls  libxmlsec   : stlport soltools LIBXML2:libxml2 MOZ:moz moz_prebuilt NULL
 ls	libxmlsec			usr1	-	all	ls_mkout NULL
 ls	libxmlsec			nmake	-	all	ls_xmlsec1 NULL

diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index e6f6365..75da64a 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx 

[Libreoffice] [PATCH] Distro-configs: adapt to new configure options for extensions

[Niko Rönkkö]

Some extensions options for configure were renamed to --with-ext-*
---
 distro-configs/GoOoLinux.conf.in |   10 +-
 distro-configs/GoOoMacOSX.conf.in|   10 +-
 distro-configs/LibreOfficeLinux.conf.in  |   10 +-
 distro-configs/LibreOfficeLinuxDevel.conf.in |   12 ++--
 distro-configs/LibreOfficeMacOSX.conf.in |   10 +-
 distro-configs/LibreOfficeOpenBSD.conf.in|   10 +-
 distro-configs/OOo4Kids.conf.in  |2 +-
 distro-configs/OxygenOfficeLinux.conf.in |   10 +-
 distro-configs/OxygenOfficeWindows.conf.in   |   10 +-
 distro-configs/SUSE-10.3.conf.in |8 
 distro-configs/SUSE-11.0.conf.in |   10 +-
 distro-configs/SUSE-11.1.conf.in |   10 +-
 distro-configs/SUSE-11.2.conf.in |   10 +-
 distro-configs/SUSE.conf.in  |   10 +-
 14 files changed, 66 insertions(+), 66 deletions(-)


diff --git a/distro-configs/GoOoLinux.conf.in b/distro-configs/GoOoLinux.conf.in
index fb78eaf..42d45c8 100644
--- a/distro-configs/GoOoLinux.conf.in
+++ b/distro-configs/GoOoLinux.conf.in
@@ -38,12 +38,12 @@
 --without-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
---enable-ext-presenter-minimizer
---enable-presenter-console
---enable-ext-pdfimport
+--with-ext-presenter-minimizer
+--with-ext-presenter-console
+--with-ext-pdfimport
 --without-system-poppler
---enable-ext-wiki-publisher
---enable-report-builder
+--with-ext-wiki-publisher
+--with-ext-report-builder
 --with-extension-integration
 --with-linker-hash-style=both
 --with-ant-home=$BUILDDIR/$APACHE_ANT
diff --git a/distro-configs/GoOoMacOSX.conf.in b/distro-configs/GoOoMacOSX.conf.in
index ba03e81..a9bb928 100644
--- a/distro-configs/GoOoMacOSX.conf.in
+++ b/distro-configs/GoOoMacOSX.conf.in
@@ -2,9 +2,9 @@
 --with-about-bitmaps=\$TOOLSDIR/src/openabout_go-oo.bmp\
 --with-vendor=\Go-oo Project\
 --enable-hids
---enable-ext-presenter-minimizer
---enable-presenter-console
---enable-ext-pdfimport
---enable-ext-wiki-publisher
---enable-report-builder
+--with-ext-presenter-minimizer
+--with-ext-presenter-console
+--with-ext-pdfimport
+--with-ext-wiki-publisher
+--with-ext-report-builder
 --with-extension-integration
diff --git a/distro-configs/LibreOfficeLinux.conf.in b/distro-configs/LibreOfficeLinux.conf.in
index cbc4339..75383b3 100644
--- a/distro-configs/LibreOfficeLinux.conf.in
+++ b/distro-configs/LibreOfficeLinux.conf.in
@@ -33,12 +33,12 @@
 --without-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
---enable-ext-presenter-minimizer
---enable-presenter-console
---enable-ext-pdfimport
+--with-ext-presenter-minimizer
+--with-ext-presenter-console
+--with-ext-pdfimport
 --without-system-poppler
---enable-ext-wiki-publisher
---enable-report-builder
+--with-ext-wiki-publisher
+--with-ext-report-builder
 --with-extension-integration
 --with-linker-hash-style=both
 --with-ant-home=$BUILDDIR/$APACHE_ANT
diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in b/distro-configs/LibreOfficeLinuxDevel.conf.in
index 704e43d..22db74a 100644
--- a/distro-configs/LibreOfficeLinuxDevel.conf.in
+++ b/distro-configs/LibreOfficeLinuxDevel.conf.in
@@ -30,12 +30,12 @@
 --without-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
---enable-ext-presenter-minimizer
---enable-presenter-console
---enable-ext-pdfimport
+--with-ext-presenter-minimizer
+--with-ext-presenter-console
+--with-ext-pdfimport
 --without-system-poppler
---enable-ext-wiki-publisher
---enable-report-builder
+--with-ext-wiki-publisher
+--with-ext-report-builder
 --with-extension-integration
 --with-ant-home=$BUILDDIR/$APACHE_ANT
 --with-system-dicts
@@ -45,4 +45,4 @@
 --with-dict=ALL
 --without-system-openssl
 --disable-epm
---enable-broffice
\ No newline at end of file
+--enable-broffice
diff --git a/distro-configs/LibreOfficeMacOSX.conf.in b/distro-configs/LibreOfficeMacOSX.conf.in
index 1ebbf3a..f3d84c3 100644
--- a/distro-configs/LibreOfficeMacOSX.conf.in
+++ b/distro-configs/LibreOfficeMacOSX.conf.in
@@ -1,9 +1,9 @@
 --with-vendor=\The Document Foundation\
 --enable-hids
---enable-ext-presenter-minimizer
---enable-presenter-console
---enable-ext-pdfimport
---enable-ext-wiki-publisher
---enable-report-builder
+--with-ext-presenter-minimizer
+--with-ext-presenter-console
+--with-ext-pdfimport
+--with-ext-wiki-publisher
+--with-ext-report-builder
 --with-extension-integration
 --enable-broffice
diff --git a/distro-configs/LibreOfficeOpenBSD.conf.in b/distro-configs/LibreOfficeOpenBSD.conf.in
index 541954c..e7e9abb 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf.in
+++ b/distro-configs/LibreOfficeOpenBSD.conf.in
@@ -34,12 +34,12 @@
 --with-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
---enable-ext-presenter-minimizer
---enable-presenter-console
---enable-ext-pdfimport
+--with-ext-presenter-minimizer
+--with-ext-presenter-console
+--with-ext-pdfimport
 

[Libreoffice] [PATCH] Removed deprecated option --with-unzip-home

[Niko Rönkkö]

MPL 1.1 / GPLv3+ / LGPLv3+
From 8d356d68781be2a312072c7b2855f45c9a60a169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi
In-Reply-To: 4cceeef3.5050...@iki.fi
References: 4cceeef3.5050...@iki.fi
Date: Mon, 1 Nov 2010 18:41:45 +0200
Subject: [PATCH] Removed deprecated option
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=kaben8Ohv4ahdainoh7Ohche4iequood

This is a multi-part message in MIME format.
--kaben8Ohv4ahdainoh7Ohche4iequood
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit


--with-unzip-home has been deprecated since 2003.
---
 configure.in |9 -
 1 files changed, 0 insertions(+), 9 deletions(-)


--kaben8Ohv4ahdainoh7Ohche4iequood
Content-Type: text/x-patch; name=0001-Removed-deprecated-option-bootstrap.patch
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename=0001-Removed-deprecated-option-bootstrap.patch

diff --git a/configure.in b/configure.in
index 7a9dc43..38d2e7b 100644
--- a/configure.in
+++ b/configure.in
@@ -1037,9 +1037,6 @@ AC_ARG_WITH(os-version,
   Usage: --with-os-version=OSVERSION
 ],,)
 
-AC_ARG_WITH(unzip-home,
-[  --with-unzip-home   Deprecated: use --with-zip-home instead],,)
-
 AC_ARG_WITH(zip-home,
 [  --with-zip-home If you use a non standard zip, for example windows
   please supply the path for zip
@@ -5882,12 +5879,6 @@ ASM_HOME=$with_asm_home
 AC_SUBST(ASM_HOME)
 
 dnl ===
-dnl testing handle deprecated unzip switch
-dnl ===
-if test -z $with_zip_home; then
-with_zip_home=$with_unzip_home
-fi
-dnl ===
 dnl Zip will be found where you tell me to find it
 dnl ===
 if test -n $with_zip_home ; then

--kaben8Ohv4ahdainoh7Ohche4iequood--


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PATCH] Internal separation of options of configure

[Niko Rönkkö]

Correct description would be:

Grouped inner Optional Features (--enable/disable-) and
Optional Packages (--with/without-) to ease maintenance.

Minor fix: ]\n] - ]\n

Option --with-servlet-api-jar=JARFILE was named wrong in --help.
(It was named as --servlet-api-jar=JARFILE.)

No changes to the order of configure --help options.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] (no subject)

[Niko Rönkkö]

 From 09a62885c6c5aea12412d9bcb37a997bce87fa2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi
Date: Mon, 1 Nov 2010 00:36:23 +0200
Subject: [PATCH] Wrong option name in help
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=kaben8Ohv4ahdainoh7Ohche4iequoodah1thahph0aiyefaingeeshohzaihaes

This is a multi-part message in MIME format.
--kaben8Ohv4ahdainoh7Ohche4iequoodah1thahph0aiyefaingeeshohzaihaes
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit


Option --with-servlet-api-jar was named wrong in --help.
---
 configure.in |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


--kaben8Ohv4ahdainoh7Ohche4iequoodah1thahph0aiyefaingeeshohzaihaes
Content-Type: text/x-patch; name=0001-Wrong-option-name-in-help-bootstrap.patch
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename=0001-Wrong-option-name-in-help-bootstrap.patch

diff --git a/configure.in b/configure.in
index 6f0539a..af00634 100644
--- a/configure.in
+++ b/configure.in
@@ -641,9 +641,10 @@ AC_ARG_WITH(commons-logging-jar,
 ])
 
 AC_ARG_WITH(servlet-api-jar,
-[  --servlet-api-jar=JARFILE   Specify path to jarfile manually ],
-[ SERVLETAPI_JAR=$withval
-])
+AS_HELP_STRING([--with-servlet-api-jar=JARFILE],
+[Specify path to jarfile manually.]),
+[SERVLETAPI_JAR=$withval],
+)
 
 AC_ARG_WITH(system-jfreereport,
 [  --with-system-jfreereport  Use JFreeReport already on system

--kaben8Ohv4ahdainoh7Ohche4iequoodah1thahph0aiyefaingeeshohzaihaes--


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH] (bootstrap) Internal separation of options of configure

[Niko Rönkkö]

MPL 1.1 / GPLv3+ / LGPLv3+
From e7d71554ce70c6082853fcbeb528e62e3398028b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niko=20R=C3=B6nkk=C3=B6?= ron...@iki.fi
Date: Sat, 30 Oct 2010 22:36:57 +0300
Subject: [PATCH] (bootstrap) Internal separation of options of configure

Grouped inner Optional Features (--enable/disable-) and
Optional Packages (--with/without-) to ease maintenance.

Minor fix: ]\n] - ]\n

Option --with-servlet-api-jar=JARFILE was named wrong in --help.
(It was named as --servlet-api-jar=JARFILE.)

No changes to the order of configure --help options.
---
 configure.in |  513 --
 1 files changed, 352 insertions(+), 161 deletions(-)

diff --git a/configure.in b/configure.in
index 29dd71d..ca376f5 100644
--- a/configure.in
+++ b/configure.in
@@ -16,139 +16,86 @@ AC_REVISION( $Revision: 1.290 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo $@ config.parms
-AC_ARG_WITH(gnu-patch,
-[  --with-gnu-patchSpecify location of GNU patch on Solaris or FreeBSD
-],,)
-AC_ARG_WITH(gnu-cp,
-[  --with-gnu-cp   Specify location of GNU cp on Solaris or FreeBSD
-],,)
+
+dnl ===
+dnl Optional Features (--enable/disable-)
+dnl ===
 AC_ARG_ENABLE(graphite,
 [  --enable-graphite   Enables the compilation of Graphite smart font rendering
 ],,)
-AC_ARG_WITH(system-graphite,
-[  --with-system-graphiteuse graphite library already installed on system
-],,)
+
 AC_ARG_ENABLE(ldap,
 [  --disable-ldap  Disables the use of LDAP backend via Netscape/Mozilla
   or OpenLDAP LDAP SDK
 ],,)
+
 AC_ARG_ENABLE(fetch-external,
 [  --disable-fetch-external Disables fetching external tarballs from web sources.
 ],,)
-AC_ARG_WITH(external-tar,
-[  --with-external-tar=TARFILE PATH   Specify path to tarfiles manually ],
-[ TARFILE_LOCATION=$withval
-])
-AC_ARG_WITH(openldap,
-[  --with-openldap Enables the use of the OpenLDAP LDAP SDK instead
-  of the Netscape/Mozilla one
-],,)
+
 AC_ARG_ENABLE(lockdown,
 [  --enable-lockdown   Enables the gconf integration work in OOo
 ],,)
+
 AC_ARG_ENABLE(vba,
 [  --disable-vba   disables the vba compatibility feature
 ],,)
-AC_ARG_WITH(vba-package-format,
-[  --with-vba-package-format   specify package format for vba compatibility api.
-  Specifying  builtin means the api component and
-  associated type library are  part of the installation set.
-  Specifying extn creates an uno extension that is
-  part of the installation set ( located in the program
-  directory ) that MUST be optionly registered using
-  either the unopkg executeable or the extension manager
-  gui.
 
-  Note: builtin is the default, extn can cause
-  problems.
-  Usage: --with-vba-package-format=builtin or
- --with-vba-package-format=extn
-],,)
 AC_ARG_ENABLE(pch,
 [  --enable-pchEXPERIMENTAL: Enables precompiled header support for C++.
 ],,)
+
 AC_ARG_ENABLE(hids,
 [  --enable-hidsEnables generation of HelpId lists.
 ],,)
+
 AC_ARG_ENABLE(mozilla,
 [  --disable-mozilla   OO.o usually includes a strangely hacked up mozilla
   binary for your platform, to build without this
   version, use this option.
 ],,enable_mozilla=yes)
 
-AC_ARG_WITH(extension-integration,
-[
-  --with-extension-integration  It will integrate the builded extensions
-  to the installer of the product.],
-,)
-
-AC_ARG_WITH(fonts,
-[  --without-fonts OOo includes some third-party fonts to provide a reliable
-  basis for help content, templates, samples, etc.
-  When these fonts are already known to be available on the
-  system then you should use this option.
-],,)
-AC_ARG_WITH(ppds,
-[  --without-ppds  Removes Postscript Printer definition files from
-  openoffice.org installation set, for people building
-  for specific distributions where PPDs are known to be
-  already available (every recent distro with CUPS
-  backend)
-],,)
-AC_ARG_WITH(afms,
-[  --without-afms  Removes bitmap font files from openoffice.org
-  installation set, for people building for specific
-  distributions where AFM files or TrueType Fonts
-  are known to be available.
-],,)
 AC_ARG_ENABLE(epm,
 [  --disable-epm   OO.o includes self-packaging code, that requires
   

Re: [Libreoffice] [PATCH] Cleaning and organizing of configure.in

[Niko Rönkkö]

Hi all!

On 25.10.2010 01:55, Christian Lohmaier wrote:

I personally disagree that an alphabetically sortet list is best. e.g.
now the font inclusion options wrt dejavu and liberation fonts are
spread apart, build tool options are interspread the feature/code
switches, extension-switches are mixed with core ones, etc.

I personally don't like that part of the patch.


I think that it would be best to name all options consistently like:

  --with-ext-google-docs
  --with-ext-hunart
  --with-ext-languagetool
  --with-ext-nlpsolver
  --with-ext-numbertext
  --with-ext-oooblogger
  --with-ext-typo
  --with-fonts-dejavu
  --with-fonts-liberation
 ... adn so on...

I just don't know hot to make those changes elsewhere than in configure.

There is also a lots of non documented options like --enable-epm.

And then there is that:
  http://cgit.freedesktop.org/libreoffice/build/tree/configure.in#n128
Which is definedly wrong and which nobody knows how it should be...

I'd like to make a patch to those if only I would know where those
changes shall made in.


PS. There is also some OOo'isms like --with-ooo-builddir. Should be
--with-builddir or something like that - I think.
--
Niko R.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice