[Libreoffice-commits] core.git: autogen.sh bridges/Library_cpp_uno.mk bridges/source configure.ac cppu/source cpputools/scripts desktop/scripts desktop/source desktop/unx external/clucene external/cur

2023-01-26 Thread Stephan Bergmann (via logerrit) 
 Repository.mk |4 
 autogen.sh|1 
 bridges/Library_cpp_uno.mk|4 
 bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx   |  658 --
 bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx|  260 -
 bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx |   89 -
 bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx   |  501 --
 configure.ac  |   43 
 cppu/source/typelib/static_types.cxx  |7 
 cppu/source/typelib/typelib.cxx   |   13 
 cpputools/scripts/uno.sh  |   13 
 desktop/scripts/soffice.sh|4 
 desktop/scripts/unopkg.sh |   17 
 desktop/source/deployment/misc/dp_platform.cxx|2 
 desktop/unx/source/start.c|8 
 external/clucene/UnpackedTarball_clucene.mk   |1 
 external/clucene/patches/clucene-aix.patch|   40 
 external/curl/ExternalPackage_curl.mk |2 
 external/hunspell/ExternalProject_hunspell.mk |1 
 external/icu/ExternalProject_icu.mk   |2 
 external/icu/UnpackedTarball_icu.mk   |1 
 external/icu/icu4c-aix.patch.1|  143 ---
 external/libexttextcat/ExternalProject_libexttextcat.mk   |3 
 external/libnumbertext/ExternalProject_libnumbertext.mk   |1 
 external/lpsolve/ExternalProject_lpsolve.mk   |3 
 external/lpsolve/UnpackedTarball_lpsolve.mk   |1 
 external/lpsolve/lp_solve-aix.patch   |   39 
 external/nss/UnpackedTarball_nss.mk   |1 
 external/nss/nss.aix.patch|  140 --
 external/openldap/ExternalProject_openldap.mk |3 
 external/openssl/openssl-no-ipc-cmd.patch.0   |   23 
 external/python3/ExternalPackage_python3.mk   |2 
 external/python3/ExternalProject_python3.mk   |2 
 external/redland/UnpackedTarball_rasqal.mk|1 
 external/redland/rasqal/rasqal-aix.patch.1|   25 
 external/xmlsec/ExternalProject_xmlsec.mk |1 
 helpcompiler/inc/HelpLinker.hxx   |4 
 include/LibreOfficeKit/LibreOfficeKitInit.h   |7 
 include/osl/endian.h  |7 
 include/sal/alloca.h  |4 
 include/sal/config.h  |4 
 include/sal/main.h|4 
 instsetoo_native/inc_openoffice/unix/find-requires-x11.sh |   10 
 jvmfwk/Package_rcfiles.mk |2 
 odk/CustomTarget_check.mk |3 
 odk/source/unoapploader/unx/unoapploader.c|6 
 sal/osl/unx/file_error_transl.cxx |2 
 sal/osl/unx/module.cxx|   49 -
 sal/osl/unx/system.hxx|   14 
 sal/qa/osl/file/osl_File.cxx  |2 
 scp2/source/ooo/module_hidden_ooo.scp |   53 -
 scp2/source/ooo/module_ooo.scp|   12 
 scp2/source/ooo/ure.scp   |   73 -
 scp2/source/python/file_python_librelogo.scp  |2 
 scp2/source/python/module_python_librelogo.scp|2 
 shell/source/tools/lngconvex/lngconvex.cxx|5 
 shell/source/unix/misc/senddoc.sh |9 
 solenv/bin/concat-deps.c  |4 
 solenv/bin/modules/installer/epmfile.pm   |9 
 solenv/bin/modules/installer/parameter.pm |   10 
 solenv/clang-format/excludelist   |4 
 solenv/gbuild/platform/com_GCC_defs.mk|2 
 soltools/Executable_cpp.mk|2 
 soltools/cpp/_unix.c  |4 
 svx/source/gengal/gengal.sh   |   17 
 tools/source/stream/strmunx.cxx   |2 
 vcl/inc/unx/salunxtime.h  |4 
 vcl/inc/unx/screensaverinhibitor.hxx  |2 
 vcl/unx/generic/app/saldata.cxx   |3 
 vcl/unx/generic/app/saldisp.cxx   |2 
 vcl/unx/generic/window/screensaverinhibitor.cxx   |6 
 vcl/unx/gtk3/a11y/atklistener.cxx |6 
 vcl/unx/gtk3/a11y/atkutil.cxx |6 
 vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx |6

[Libreoffice-commits] core.git: autogen.sh bridges/Module_bridges.mk config_host.mk.in configure.ac desktop/Library_sofficeapp.mk external/apr external/boost external/breakpad external/cairo external/

2021-05-05 Thread Jan-Marek Glogowski (via logerrit) 
 .gitignore  |6 
 README.md   |4 
 Repository.mk   |   10 -
 autogen.sh  |   12 +
 bridges/Module_bridges.mk   |2 
 config_host.mk.in   |   13 +
 configure.ac|  140 +---
 desktop/Library_sofficeapp.mk   |4 
 external/apr/ExternalProject_apr.mk |2 
 external/apr/ExternalProject_apr_util.mk|2 
 external/boost/UnpackedTarball_boost.mk |1 
 external/boost/boost-emscripten-noshm.patch.0   |   11 +
 external/breakpad/ExternalProject_breakpad.mk   |2 
 external/cairo/ExternalProject_cairo.mk |9 -
 external/cairo/ExternalProject_pixman.mk|3 
 external/coinmp/ExternalProject_coinmp.mk   |2 
 external/cppunit/ExternalProject_cppunit.mk |5 
 external/cppunit/disable-dynloading.patch   |2 
 external/curl/ExternalProject_curl.mk   |2 
 external/epm/ExternalProject_epm.mk |2 
 external/expat/ExternalProject_expat.mk |2 
 external/firebird/ExternalProject_firebird.mk   |2 
 external/fontconfig/ExternalProject_fontconfig.mk   |5 
 external/freetype/ExternalProject_freetype.mk   |2 
 external/gpgmepp/ExternalProject_gpgmepp.mk |4 
 external/harfbuzz/ExternalProject_harfbuzz.mk   |2 
 external/hunspell/ExternalProject_hunspell.mk   |4 
 external/hyphen/ExternalProject_hyphen.mk   |2 
 external/icu/ExternalProject_icu.mk |8 
 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/icu4c-emscripten-cross.patch.1 |   99 +++
 external/lcms2/ExternalProject_lcms2.mk |2 
 external/libabw/ExternalProject_libabw.mk   |2 
 external/libassuan/ExternalProject_libassuan.mk |4 
 external/libatomic_ops/ExternalProject_libatomic_ops.mk |2 
 external/libcdr/ExternalProject_libcdr.mk   |2 
 external/libebook/ExternalProject_libebook.mk   |2 
 external/libeot/ExternalProject_libeot.mk   |2 
 external/libepubgen/ExternalProject_libepubgen.mk   |2 
 external/libetonyek/ExternalProject_libetonyek.mk   |2 
 external/libexttextcat/ExternalProject_libexttextcat.mk |2 
 external/libffi/ExternalProject_libffi.mk   |2 
 external/libfreehand/ExternalProject_libfreehand.mk |2 
 external/libgpg-error/ExternalProject_libgpg-error.mk   |4 
 external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk |2 
 external/liblangtag/ExternalProject_liblangtag.mk   |4 
 external/libmspub/ExternalProject_libmspub.mk   |2 
 external/libmwaw/ExternalProject_libmwaw.mk |2 
 external/libnumbertext/ExternalProject_libnumbertext.mk |2 
 external/libodfgen/ExternalProject_libodfgen.mk |2 
 external/liborcus/ExternalProject_liborcus.mk   |4 
 external/libpagemaker/ExternalProject_libpagemaker.mk   |2 
 external/libqxp/ExternalProject_libqxp.mk   |2 
 external/librevenge/ExternalProject_librevenge.mk   |2 
 external/libstaroffice/ExternalProject_libstaroffice.mk |2 
 external/libvisio/ExternalProject_libvisio.mk   |2 
 external/libwpd/ExternalProject_libwpd.mk   |2 
 external/libwpg/ExternalProject_libwpg.mk   |2 
 external/libwps/ExternalProject_libwps.mk   |2 
 external/libxml2/ExternalProject_libxml2.mk |6 
 external/libxslt/ExternalProject_libxslt.mk |2 
 external/libzmf/ExternalProject_libzmf.mk   |2 
 external/mythes/ExternalProject_mythes.mk   |2 
 external/openldap/ExternalProject_openldap.mk   |2 
 external/openssl/ExternalProject_openssl.mk |2 
 external/postgresql/ExternalProject_postgresql.mk   |2 
 external/python3/ExternalProject_python3.mk |2 
 external/redland/ExternalProject_raptor.mk  |2 
 external/redland/ExternalProject_rasqal.mk  |2 
 external/redland/ExternalProject_redland.mk |2 
 external/xmlsec/ExternalProject_xmlsec.mk   |4 
 i18nutil/source/utility/paper.cxx   |2 
 idl/source/objects/types.cxx|2 
 include/osl/endian.h|2 
 include/sal/alloca.h|2 
 include/sal/config.h|   11 +
 sal/osl/unx/system.hxx

[Libreoffice-commits] core.git: autogen.sh

2020-10-09 Thread Tor Lillqvist (via logerrit) 
 autogen.sh |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 6d680b67632b14ce14e761558c07652b7e6782ea
Author: Tor Lillqvist 
AuthorDate: Fri Oct 9 17:05:51 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Oct 9 17:27:24 2020 +0200

Enable building for WSL (Linux) on WSL

Change-Id: I47a81a730735ff8c315a57a78c418da2b771e838
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104123
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/autogen.sh b/autogen.sh
index beda712747ce..1779de77e6f3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -300,9 +300,14 @@ if (defined $ENV{NOCONFIGURE}) {
 # When running a shell script from Perl on WSL, weirdly named
 # environment variables like the "ProgramFiles(x86)" one don't get
 # imported by the shell. So export it as PROGRAMFILESX86 instead.
-if (`wslsys 2>/dev/null` ne "") {
+my $building_for_linux = 0;
+foreach my $arg (@args) {
+$building_for_linux = 1 if ($arg =~ /--host=x86_64.*linux/);
+}
+if (`wslsys 2>/dev/null` ne "" && !$building_for_linux) {
 if (!$ENV{"ProgramFiles(x86)"}) {
-print STDERR "To build on WSL, you need to set the WSLENV 
environment variable in the Control Panel to 'ProgramFiles(x86)'\n";
+print STDERR "To build for Windows on WSL, you need to set the 
WSLENV environment variable in the Control Panel to 'ProgramFiles(x86)'\n";
+print STDERR "If you actually do want to build for WSL (Linux) on 
WSL, pass a --host=x86_64-pc-linux-gnu option\n";
 exit (1);
 }
 $ENV{"PROGRAMFILESX86"} = $ENV{"ProgramFiles(x86)"};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2020-10-04 Thread Tor Lillqvist (via logerrit) 
 autogen.sh |   12 
 1 file changed, 12 insertions(+)

New commits:
commit d1b399b687193951978500056ce461a921575d3e
Author: Tor Lillqvist 
AuthorDate: Sun Oct 4 19:07:41 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Oct 4 21:16:22 2020 +0200

Step towards building for Windows on WSL: ProgramFiles(x86) handling

autogen.sh is a Perl script. When running Perl on WSL, weirdly named
environment variables like the "ProgramFiles(x86)" one don't seem to
get imported to a shell child process of the Perl process. So export
it as PROGRAMFILESX86 instead. configure.ac will look for that on WSL.
(Changes to configure.ac will be coming in small careful steps.)

Change-Id: I572c3b1e2f2fab3629d1856d33fcf0dda51217d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103921
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/autogen.sh b/autogen.sh
index 49835ff27e25..beda712747ce 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -296,6 +296,18 @@ if (defined $ENV{NOCONFIGURE}) {
 push @args, "--enable-option-checking=$option_checking";
 
 print "Running ./configure with '" . join (" ", @args), "'\n";
+
+# When running a shell script from Perl on WSL, weirdly named
+# environment variables like the "ProgramFiles(x86)" one don't get
+# imported by the shell. So export it as PROGRAMFILESX86 instead.
+if (`wslsys 2>/dev/null` ne "") {
+if (!$ENV{"ProgramFiles(x86)"}) {
+print STDERR "To build on WSL, you need to set the WSLENV 
environment variable in the Control Panel to 'ProgramFiles(x86)'\n";
+exit (1);
+}
+$ENV{"PROGRAMFILESX86"} = $ENV{"ProgramFiles(x86)"};
+}
+
 system ("./configure", @args) && die "Error running configure";
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh distro-configs/CPAndroidAarch64.conf distro-configs/CPAndroidBranding.conf distro-configs/CPAndroid.conf

2020-02-11 Thread Jan Holesovsky (via logerrit) 
 autogen.sh|7 +++
 distro-configs/CPAndroid.conf |4 
 distro-configs/CPAndroidAarch64.conf  |4 
 distro-configs/CPAndroidBranding.conf |   12 
 4 files changed, 27 insertions(+)

New commits:
commit b412daf79f2df41f88c6eacd09f3924e376ddec2
Author: Jan Holesovsky 
AuthorDate: Tue Feb 11 12:02:40 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Feb 11 20:25:32 2020 +0100

Introduce INCLUDE: in the distro-configs...

...to be able to have a common base for things, and then apply some
additional stuff on top - in this case the Android branding for the CP
builds.

Change-Id: I43118bba84fddb8508cc4688c83c2d81a103d781
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88440
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 
(cherry picked from commit 8dd75f47d9d571ed557fd360b8f9ff7aaca335af)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88400
Tested-by: Jenkins

diff --git a/autogen.sh b/autogen.sh
index 10bdffe610e2..49835ff27e25 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -84,6 +84,13 @@ sub read_args($)
 print STDERR "  $opt\n";
 }
 }
+} elsif ( /^INCLUDE:(.*)/ ) {
+# include another .conf into this one
+my $config = "$src_path/distro-configs/$1.conf";
+if (! -f $config) {
+invalid_distro ($config, $1);
+}
+push @lst, read_args ($config);
 } elsif ( substr($_, 0, 1) eq "#" ) {
 # comment
 } elsif ( length == 0 ) {
diff --git a/distro-configs/CPAndroid.conf b/distro-configs/CPAndroid.conf
new file mode 100644
index ..5aaeabedc03c
--- /dev/null
+++ b/distro-configs/CPAndroid.conf
@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroid.conf as the base
+INCLUDE:LibreOfficeAndroid
+# Add the CP stuff
+INCLUDE:CPAndroidBranding
diff --git a/distro-configs/CPAndroidAarch64.conf 
b/distro-configs/CPAndroidAarch64.conf
new file mode 100644
index ..5cef2d518cd1
--- /dev/null
+++ b/distro-configs/CPAndroidAarch64.conf
@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroidAarch64.conf as the base
+INCLUDE:LibreOfficeAndroidAarch64
+# Add the CP stuff
+INCLUDE:CPAndroidBranding
diff --git a/distro-configs/CPAndroidBranding.conf 
b/distro-configs/CPAndroidBranding.conf
new file mode 100644
index ..7c2f898b4105
--- /dev/null
+++ b/distro-configs/CPAndroidBranding.conf
@@ -0,0 +1,12 @@
+# CP specific stuff
+--build=x86_64-unknown-linux-gnu
+--disable-odk
+--enable-android-lok
+--with-android-api-level=21
+--with-android-package-name=com.collabora.libreoffice
+--with-vendor=Collabora
+--disable-scripting-beanshell
+--disable-scripting-javascript
+--with-lang=de en-US es pt-BR
+--with-myspell-dicts
+--enable-release-build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2019-12-18 Thread Stepas Toliautas (via logerrit) 
 autogen.sh |   12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 0286cde8c568a5652daf0b74f76816f980d86aee
Author: Stepas Toliautas 
AuthorDate: Tue Dec 17 00:18:11 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Dec 18 18:23:58 2019 +0100

Remove "--clean" option from autogen.sh

autogen.sh seems to be used as a preprocessor for configure script,
so it has only a few options itself. However, "--clean" option,
which is even documented in script's help message, now touches only
two items in repository (on Windows): autom4te.cache folder,
which is refreshed during autogen.sh run anyway, and install-sh
script, which is NOT regenerated afterwards. So using --clean
actually breaks configuration setup.
Please check if anyone still uses --clean for its original purpose
and remove this feature or automate install-sh regeneration.

Change-Id: Ic3991ea4e53cea5ad07696f9b75acf9176eb7ce1
Reviewed-on: https://gerrit.libreoffice.org/85247
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/autogen.sh b/autogen.sh
index 608e2b6ab82f..10bdffe610e2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,13 +31,6 @@ chdir ($build_path);
 # old path from the environment, not cwd.
 $ENV{PWD} = $build_path;
 
-sub clean()
-{
-system ("rm -Rf autom4te.cache");
-system ("rm -f missing install-sh mkinstalldirs libtool ltmain.sh");
-print "Cleaned the build tree\n";
-}
-
 my $aclocal;
 my $autoconf;
 
@@ -202,7 +195,6 @@ die "Failed to generate the configure script" if (! -f 
"configure");
 for my $arg (@ARGV) {
 if ($arg =~ /^(--help|-h|-\?)$/) {
 print STDOUT "autogen.sh - libreoffice configuration helper\n";
-print STDOUT "   --cleanforcibly re-generate configuration\n";
 print STDOUT "   --with-distro  use a config from distro-configs/\n";
 print STDOUT "  the name needs to be passed without 
extension\n";
 print STDOUT "   --best-effort  don't fail on un-known configure 
with/enable options\n";
@@ -256,9 +248,7 @@ if (-f $default_config) {
 push @args, read_args ($default_config);
 }
 for my $arg (@cmdline_args) {
-if ($arg eq '--clean') {
-clean();
-} elsif ($arg =~ m/--with-distro=(.*)$/) {
+if ($arg =~ m/--with-distro=(.*)$/) {
 my $config = "$src_path/distro-configs/$1.conf";
 if (! -f $config) {
 invalid_distro ($config, $1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2019-03-26 Thread Gabor Kelemen (via logerrit) 
 autogen.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c49583e9a005276b9393c2393ea79b92816e07f3
Author: Gabor Kelemen 
AuthorDate: Mon Mar 25 18:36:23 2019 +0100
Commit: Miklos Vajna 
CommitDate: Tue Mar 26 09:13:50 2019 +0100

autogen.sh: add --help description about the --with-distro switch

Change-Id: I8d9732251b05ec4ec93ce0fc0ba24f2f27d54b18
Reviewed-on: https://gerrit.libreoffice.org/69712
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/autogen.sh b/autogen.sh
index 0ac16f1f9779..608e2b6ab82f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -203,6 +203,8 @@ for my $arg (@ARGV) {
 if ($arg =~ /^(--help|-h|-\?)$/) {
 print STDOUT "autogen.sh - libreoffice configuration helper\n";
 print STDOUT "   --cleanforcibly re-generate configuration\n";
+print STDOUT "   --with-distro  use a config from distro-configs/\n";
+print STDOUT "  the name needs to be passed without 
extension\n";
 print STDOUT "   --best-effort  don't fail on un-known configure 
with/enable options\n";
 print STDOUT "\nOther arguments passed directly to configure:\n\n";
 system ("./configure --help");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh configure.ac

2019-01-30 Thread Libreoffice Gerrit user 
 autogen.sh   |8 ++--
 configure.ac |7 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 191966900865bd720f356941cb392abf3538df31
Author: Christian Lohmaier 
AuthorDate: Wed Jan 30 15:10:56 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 30 20:32:18 2019 +0100

don't require /autoconf/ to be 2.68 (also allow e.g. autoconf268)

partially reverts 182f5a0f34fa45d2f74ba22eda41d4e39dca93e5 in the sense
that configure still insists on autoconf 2.68, but in a way that allows
to specify an already installed copy (that the libnumbertext build
already picked up successfully)

While there is autoconf268 package, it gets installed as autoconf268, but
aclocal doesn't provide a way to use something else than "autoconf"

In the spirit of "keeping it simple", no conditional check is done
whether libnumbertext is actually enabled or not.

Change-Id: Ice05a70ef56a4ed3428c74d15d6aeeaa54f71c0b
Reviewed-on: https://gerrit.libreoffice.org/67159
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/autogen.sh b/autogen.sh
index 8c0bb0ade4ba..0ac16f1f9779 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -39,6 +39,7 @@ sub clean()
 }
 
 my $aclocal;
+my $autoconf;
 
 # check we have various vital tools
 sub sanity_checks($)
@@ -48,7 +49,7 @@ sub sanity_checks($)
 my %required =
   (
'pkg-config' => "pkg-config is required to be installed",
-   'autoconf'   => "autoconf is required",
+   $autoconf=> "autoconf is required",
$aclocal => "$aclocal is required",
   );
 
@@ -135,6 +136,9 @@ die "\$src_path must not contain spaces, but it is 
'$src_path'." if ($src_path =
 
 # Alloc $ACLOCAL to specify which aclocal to use
 $aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
+# Alloc $AUTOCONF to specify which autoconf to use
+# (e.g. autoconf268 from a backports repo)
+$autoconf = $ENV{AUTOCONF} ? $ENV{AUTOCONF} : 'autoconf';
 
 my $system = `uname -s`;
 chomp $system;
@@ -191,7 +195,7 @@ if ($src_path ne $build_path)
 }
 system ("$aclocal $aclocal_flags") && die "Failed to run aclocal";
 unlink ("configure");
-system ("autoconf -I ${src_path}") && die "Failed to run autoconf";
+system ("$autoconf -I ${src_path}") && die "Failed to run autoconf";
 die "Failed to generate the configure script" if (! -f "configure");
 
 # Handle help arguments first, so we don't clobber autogen.lastrun
diff --git a/configure.ac b/configure.ac
index 7ececcaeb282..7297c72a1db9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,12 @@ dnl in order to create a configure script.
 
 AC_INIT([LibreOffice],[6.3.0.0.alpha0+],[],[],[http://documentfoundation.org/])
 
-AC_PREREQ([2.68])
+dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
+dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
+dnl so check for the version of autoconf that is actually used to create the 
configure script
+AC_PREREQ([2.59])
+m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.68]), -1,
+[AC_MSG_ERROR([at least autoconf version 2.68 is needed (you can use 
AUTOCONF environment variable to point to a suitable one)])])
 
 if test -n "$BUILD_TYPE"; then
 AC_MSG_ERROR([You have sourced config_host.mk in this shell.  This may 
lead to trouble, please run in a fresh (login) shell.])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh compilerplugins/clang

2018-11-24 Thread Libreoffice Gerrit user 
 autogen.sh  |2 +-
 compilerplugins/clang/pluginhandler.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d057e61cb5aae15ea37ce9ac824647cd2060e331
Author: Stephan Bergmann 
AuthorDate: Sat Nov 24 22:36:48 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Nov 25 00:25:43 2018 +0100

Restrict Developer Toolset to Config=linux_gcc_release_64

The Jenkins "Gerrit Linux clang/dbgutil" builds started to fail in odd ways,
presumably because of having the Developer Toolset in the PATH now when 
building
compilerplugins.  So change compilerplugins/clang/pluginhandler.hxx 
slightly to
force rebuild.

Change-Id: I97b8f89dc2e20c85f130284ca5326a5c96c2a1ba
Reviewed-on: https://gerrit.libreoffice.org/63962
Tested-by: Stephan Bergmann 
Reviewed-by: Stephan Bergmann 

diff --git a/autogen.sh b/autogen.sh
index 478aed6944b5..98dcb950886e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -153,7 +153,7 @@ if (defined $ENV{LODE_HOME})
 }
 # For the Config=linux_gcc_release_64 Jenkins jobs that build on CentOS 
against Developer
 # Toolset 7:
-if (-d '/opt/rh/devtoolset-7/root/usr/bin')
+if ($ENV{Config} eq 'linux_gcc_release_64' && -d 
'/opt/rh/devtoolset-7/root/usr/bin')
 {
 $ENV{PATH}="/opt/rh/devtoolset-7/root/usr/bin:$ENV{PATH}";
 print STDERR "added /opt/rh/devtoolset-7/root/usr/bin to PATH\n";
diff --git a/compilerplugins/clang/pluginhandler.hxx 
b/compilerplugins/clang/pluginhandler.hxx
index 1cb405d54d35..d51afebccac7 100644
--- a/compilerplugins/clang/pluginhandler.hxx
+++ b/compilerplugins/clang/pluginhandler.hxx
@@ -91,7 +91,7 @@ private:
 std::vector< std::string > _args;
 };
 
-} // namespace
+}
 
 #endif // COMPILEPLUGIN_H
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh distro-configs/Jenkins

2018-11-24 Thread Libreoffice Gerrit user 
 autogen.sh  |7 +++
 distro-configs/Jenkins/linux_gcc_release_64 |1 +
 2 files changed, 8 insertions(+)

New commits:
commit d3f2c61e3b9faf577f692ece76cd830f0f74b028
Author: Stephan Bergmann 
AuthorDate: Fri Nov 23 14:22:14 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Nov 24 14:49:21 2018 +0100

Make Jenkins linux_gcc_release_64 pick up Developer Toolset 7

...as discussed at


"Re: Compiler baselines".

It doesn't look exactly right to enable the Developer Toolset from 
autogen.sh.
But the alternative would be to "hide" that in
, which 
would
probably not be helpful when developers try to track down why a certain 
Jenkins
build behaves the way it does.  So pragmatically stick it in autogen.sh.  
(Also,
it puts Developer Toolset on the PATH whenever it is found on a system using
LODE_HOME, not just for the specific Config=linux_gcc_release_64 case.  
Lets see
how that works out in practice.)

However, it turns out that the Developer Toolset 7's GCC 7.3.1 with
--enable-werror (that is implicitly enabled for LODE-driven builds in
configure.ac) and (implicit) --enable-optimized produces many false warnings
(i.e., errors), see below for a sample.  (Actually, my experience is that
contemporary GCC hardly ever work with -Werror in optimized builds, due to
analysis being done on already optimized code; it surprised me to find out 
that
the Jnekins linux_gcc_release_64 builds were apparently successfully done 
with
--enable-werror with GCC 4.8.5.)  So explicitly --disable-werror for these
builds.  (Which means that 
 "For linux_gcc_release_64, 
don't
let ccache strip comments" could probably be reverted again if it has 
negative
impact on Jenkins' performance.)

Some of the false warnings encountered:

> [CXX] jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
> In file included from 
/opt/rh/devtoolset-7/root/usr/include/c++/7/vector:69:0,
>  from 
/home/tdf/sberg/core/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:39:
> /opt/rh/devtoolset-7/root/usr/include/c++/7/bits/vector.tcc: In function 
‘javaPluginError jfw_plugin_startJavaVirtualMachine(const JavaInfo*, const 
JavaVMOption*, sal_Int32, JavaVM**, JNIEnv**)’:
> /opt/rh/devtoolset-7/root/usr/include/c++/7/bits/vector.tcc:407:15: 
error: variable ‘__new_finish’ might be clobbered by ‘longjmp’ or ‘vfork’ 
[-Werror=clobbered]
>pointer __new_finish(__new_start);
>^~~~
> cc1plus: all warnings being treated as errors

> [CXX] libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
> 
/home/tdf/sberg/core/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx: 
In function ‘gboolean gtv_calc_header_bar_draw(GtkWidget*, cairo_t*)’:
> 
/home/tdf/sberg/core/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx:89:117:
 error: ‘aRectangle._cairo_rectangle_int::height’ may be used uninitialized in 
this function [-Werror=maybe-uninitialized]
>  cairo_move_to(pCairo, rRectangle.x + rRectangle.width / 2 - 
extents.width / 2, rRectangle.y + rRectangle.height / 2 + extents.height / 2);
>   
 ~~^~~
> 
/home/tdf/sberg/core/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx:102:22:
 note: ‘aRectangle._cairo_rectangle_int::height’ was declared here
>  GdkRectangle aRectangle;
>   ^~
> 
/home/tdf/sberg/core/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx:89:59:
 error: ‘aRectangle._cairo_rectangle_int::width’ may be used uninitialized in 
this function [-Werror=maybe-uninitialized]
>  cairo_move_to(pCairo, rRectangle.x + rRectangle.width / 2 - 
extents.width / 2, rRectangle.y + rRectangle.height / 2 + extents.height / 2);
>   ~^~~
> 
/home/tdf/sberg/core/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx:102:22:
 note: ‘aRectangle._cairo_rectangle_int::width’ was declared here
>  GdkRectangle aRectangle;
>   ^~
> 
/home/tdf/sberg/core/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx:89:97:
 error: ‘aRectangle._cairo_rectangle_int::y’ may be used uninitialized in this 
function [-Werror=maybe-uninitialized]
>  cairo_move_to(pCairo, rRectangle.x + rRectangle.width / 2 - 
extents.width / 2, rRectangle.y + rRectangle.height / 2 + extents.height / 2);
>

[Libreoffice-commits] core.git: autogen.sh

2018-06-29 Thread Michael Stahl 
 autogen.sh |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit be1a2fb3ad0e5a7a364886a83c9bdc895717cdfd
Author: Michael Stahl 
Date:   Fri Jun 29 15:44:09 2018 +0200

autogen.sh: fix out-of-tree module Makefiles for Win32 make

These were created as symlinks, which doesn't work with Win32 make as it
doesn't understand Cygwin symlinks.

Instead, create them as actual files.

Note: the reason why they work as symlinks at all is that the Makefile
uses $(realpath) and partial_build.mk does not, so they can
resolve relative paths from 2 different directories...

Change-Id: I4a9abffae8256a9525fb35ed4b174cc8d96a
Reviewed-on: https://gerrit.libreoffice.org/56691
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/autogen.sh b/autogen.sh
index 20976ce66d3f..1f3bb813fbbf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -165,12 +165,18 @@ if ($src_path ne $build_path)
 {
 system ("ln -sf $src_path/configure.ac configure.ac");
 system ("ln -sf $src_path/g g");
+my $src_path_win=$src_path;
+if ($system =~ /CYGWIN.*/) {
+$src_path_win=`cygpath -m $src_path`;
+chomp $src_path_win;
+}
 my @modules = <$src_path/*/Makefile>;
 foreach my $module (@modules)
 {
 my $dir = basename (dirname ($module));
 mkdir ($dir);
-system ("ln -sf $src_path/$dir/Makefile $dir/Makefile");
+system ("rm $dir/Makefile");
+system ("printf 'module_directory:=$src_path_win/$dir/\ninclude 
\$(module_directory)/../solenv/gbuild/partial_build.mk\n' > $dir/Makefile");
 }
 my @external_modules = <$src_path/external/*/Makefile>;
 mkdir ("external");
@@ -179,7 +185,8 @@ if ($src_path ne $build_path)
 {
 my $dir = basename (dirname ($module));
 mkdir ("external/$dir");
-system ("ln -sf $src_path/external/$dir/Makefile 
external/$dir/Makefile");
+system ("rm external/$dir/Makefile");
+system ("printf 
'module_directory:=$src_path_win/external/$dir/\ninclude 
\$(module_directory)/../../solenv/gbuild/partial_build.mk\n' > 
external/$dir/Makefile");
 }
 }
 system ("$aclocal $aclocal_flags") && die "Failed to run aclocal";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2018-01-18 Thread Stephan Bergmann 
 autogen.sh |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 161af2120f41f34fe562f677907ccfba41f7012a
Author: Stephan Bergmann 
Date:   Thu Jan 18 15:33:44 2018 +0100

Don't set autogen.sh KEY=VALUE arguments as environment variables

> Jan 18 15:18:25  tml__, do you remember anything about
>  e3a07b8a6cc03b6d5063e4da5a474d8c91a84b0a ? looks odd to add configure
>  KEY=VALUE args to the environment
> Jan 18 15:18:27  core - Include environment variables already in
>  autogen.sh's environment -
>  
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e3a07b8a6cc03b6d5063e4da5a474d8c91a84b0a
> Jan 18 15:22:54  sberg: not really any recollection, sorry
> Jan 18 15:23:09  sberg: are you sure this isn't what makes it 
possible
>  to have CC=clang etc in autogen.input?
> Jan 18 15:24:07  or maybe this is related to propagating stuff when
>  make re-runs autogen.sh?
> Jan 18 15:24:28  tml__, configure already takes care itself of its
>  KEY=VALUE command line arguments
> Jan 18 15:24:36  sad that I didn't write a better commit message
> Jan 18 15:24:55  feel free to revert it, and see if anybody 
notices;)
> Jan 18 15:25:04 * cloph_away used it for CC/CXX and devtools repo
> Jan 18 15:26:11  cloph_away: yes, but I think sberg says that 
should
>  work anyway, even without that commit

The only reading from ENV after that code in autogen.sh (both today and at 
the
time of e3a07b8a6cc03b6d5063e4da5a474d8c91a84b0a) is the

  if (defined $ENV{NOCONFIGURE}) {
  print "Skipping configure process.";

check, which would now no longer work if you pass NOCONFIGURE= as an 
argument
to autogen.sh (in autogen.input or on the command line) instead of as an
environment variable.

Change-Id: If50639978190d219b063ff39f81e29d2054c0443
Reviewed-on: https://gerrit.libreoffice.org/48133
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/autogen.sh b/autogen.sh
index 6af2cf71da80..20976ce66d3f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -257,11 +257,6 @@ for my $arg (@cmdline_args) {
 push @args, $arg;
 }
 }
-for my $arg (@args) {
-if ($arg =~ /^([A-Z]+)=(.*)/) {
-$ENV{$1} = $2;
-}
-}
 
 if (defined $ENV{NOCONFIGURE}) {
 print "Skipping configure process.";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2018-01-18 Thread Stephan Bergmann 
 autogen.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2f9ee54cb7fa8767e43515bde1969f74be2533a8
Author: Stephan Bergmann 
Date:   Thu Jan 18 15:25:58 2018 +0100

Also strip leading whitespace from autogen.input lines

...which allows to align --enable/--disable switches on the part being 
en-/dis-
abled, as in

> --disable-assert-always-abort
>  --enable-avahi
>  --enable-breakpad
>  --enable-build-unowinreg
> --disable-ccache

for better readability

Change-Id: I490402c74ea1ee535deee6ef79274b588b614820
Reviewed-on: https://gerrit.libreoffice.org/48130
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/autogen.sh b/autogen.sh
index a4bab811a36b..6af2cf71da80 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -77,6 +77,7 @@ sub read_args($)
 open ($fh, $file) || die "can't open file: $file";
 while (<$fh>) {
 chomp();
+s/^\s+//;
 s/\s+$//;
 # migrate from the old system
 if ( substr($_, 0, 1) eq "'" ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh Makefile.in

2017-09-22 Thread Tor Lillqvist 
 Makefile.in |1 +
 autogen.sh  |   47 +--
 2 files changed, 46 insertions(+), 2 deletions(-)

New commits:
commit c32d54f244b0a18e0dcfcfceae140499e2dc3bbe
Author: Tor Lillqvist 
Date:   Fri Sep 22 16:51:22 2017 +0300

Revert "Goodbye autogen.lastrun"

Welcome back autogen.lastrun. I just don't have the energy to convince
tinderbox maintainers to fix their scripts. Oh well.

This reverts commit 7496c83374f68148c62ac23a6e4c4c314d67273d.

diff --git a/Makefile.in b/Makefile.in
index 03184af18d44..62924dc2aae0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,6 +46,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/configure.ac \
$(SRCDIR)/config_host/*.h.in \
$(BUILDDIR)/autogen.input \
+   $(BUILDDIR)/autogen.lastrun \
$(BUILDDIR)/autogen.sh \
) \
$(shell . $(SRCDIR)/bin/get_config_variables JAVA_HOME && \
diff --git a/autogen.sh b/autogen.sh
index 02d160bdca92..a4bab811a36b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,15 @@
 :
 #
+# This script checks various configure parameters and uses three files:
+#   * autogen.input (ro)
+#   * autogen.lastrun (rw)
+#   * autogen.lastrun.bak (rw)
+#
 # If _no_ parameters:
-#   Read args from autogen.input
+#   Read args from autogen.input or autogen.lastrun
+# Else
+#   Backup autogen.lastrun as autogen.lastrun.bak
+#   Write autogen.lastrun with new commandline args
 #
 # Run configure with checked args
 #
@@ -178,7 +186,7 @@ unlink ("configure");
 system ("autoconf -I ${src_path}") && die "Failed to run autoconf";
 die "Failed to generate the configure script" if (! -f "configure");
 
-# Handle help arguments first
+# Handle help arguments first, so we don't clobber autogen.lastrun
 for my $arg (@ARGV) {
 if ($arg =~ /^(--help|-h|-\?)$/) {
 print STDOUT "autogen.sh - libreoffice configuration helper\n";
@@ -193,10 +201,24 @@ for my $arg (@ARGV) {
 my @cmdline_args = ();
 
 my $input = "autogen.input";
+my $lastrun = "autogen.lastrun";
 
 if (!@ARGV) {
 if (-f $input) {
+if (-f $lastrun) {
+print STDERR < 0) {
+# if there's already an autogen.lastrun, make a backup first
+if (-e $lastrun) {
+open (my $fh, $lastrun) || warn "Can't open $lastrun.\n";
+open (BAK, ">$lastrun.bak") || warn "Can't create backup file 
$lastrun.bak.\n";
+while (<$fh>) {
+print BAK;
+}
+close (BAK) && close ($fh);
+}
+# print "Saving command-line args to $lastrun\n";
+my $fh;
+open ($fh, ">autogen.lastrun") || die "Can't open autogen.lastrun: 
$!";
+for my $arg (@cmdline_args) {
+print $fh "$arg\n";
+}
+close ($fh);
+}
+}
 push @args, "--srcdir=$src_path";
 push @args, "--enable-option-checking=$option_checking";
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh Makefile.in

2017-09-22 Thread Tor Lillqvist 
 Makefile.in |1 -
 autogen.sh  |   47 ++-
 2 files changed, 2 insertions(+), 46 deletions(-)

New commits:
commit 7496c83374f68148c62ac23a6e4c4c314d67273d
Author: Tor Lillqvist 
Date:   Mon Sep 18 17:16:33 2017 +0300

Goodbye autogen.lastrun

Change-Id: I46b92baf88661d49da2905699b9639522c0940d8
Reviewed-on: https://gerrit.libreoffice.org/42418
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/Makefile.in b/Makefile.in
index 62924dc2aae0..03184af18d44 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,6 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/configure.ac \
$(SRCDIR)/config_host/*.h.in \
$(BUILDDIR)/autogen.input \
-   $(BUILDDIR)/autogen.lastrun \
$(BUILDDIR)/autogen.sh \
) \
$(shell . $(SRCDIR)/bin/get_config_variables JAVA_HOME && \
diff --git a/autogen.sh b/autogen.sh
index a4bab811a36b..02d160bdca92 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,15 +1,7 @@
 :
 #
-# This script checks various configure parameters and uses three files:
-#   * autogen.input (ro)
-#   * autogen.lastrun (rw)
-#   * autogen.lastrun.bak (rw)
-#
 # If _no_ parameters:
-#   Read args from autogen.input or autogen.lastrun
-# Else
-#   Backup autogen.lastrun as autogen.lastrun.bak
-#   Write autogen.lastrun with new commandline args
+#   Read args from autogen.input
 #
 # Run configure with checked args
 #
@@ -186,7 +178,7 @@ unlink ("configure");
 system ("autoconf -I ${src_path}") && die "Failed to run autoconf";
 die "Failed to generate the configure script" if (! -f "configure");
 
-# Handle help arguments first, so we don't clobber autogen.lastrun
+# Handle help arguments first
 for my $arg (@ARGV) {
 if ($arg =~ /^(--help|-h|-\?)$/) {
 print STDOUT "autogen.sh - libreoffice configuration helper\n";
@@ -201,24 +193,10 @@ for my $arg (@ARGV) {
 my @cmdline_args = ();
 
 my $input = "autogen.input";
-my $lastrun = "autogen.lastrun";
 
 if (!@ARGV) {
 if (-f $input) {
-if (-f $lastrun) {
-print STDERR < 0) {
-# if there's already an autogen.lastrun, make a backup first
-if (-e $lastrun) {
-open (my $fh, $lastrun) || warn "Can't open $lastrun.\n";
-open (BAK, ">$lastrun.bak") || warn "Can't create backup file 
$lastrun.bak.\n";
-while (<$fh>) {
-print BAK;
-}
-close (BAK) && close ($fh);
-}
-# print "Saving command-line args to $lastrun\n";
-my $fh;
-open ($fh, ">autogen.lastrun") || die "Can't open autogen.lastrun: 
$!";
-for my $arg (@cmdline_args) {
-print $fh "$arg\n";
-}
-close ($fh);
-}
-}
 push @args, "--srcdir=$src_path";
 push @args, "--enable-option-checking=$option_checking";
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh avmedia/source basic/qa bin/lo-commit-stat bin/lo-pack-sources chart2/source cli_ure/qa configure.ac desktop/source editeng/source extensions/source filter/s

2017-08-17 Thread Andrea Gelmini 
 README.cross   
  |4 -
 autogen.sh 
  |2 
 avmedia/source/macavf/player.mm
  |2 
 basic/qa/vba_tests/replace.vb  
  |2 
 bin/lo-commit-stat 
  |2 
 bin/lo-pack-sources
  |2 
 chart2/source/view/charttypes/VSeriesPlotter.cxx   
  |2 
 cli_ure/qa/climaker/climaker.cs
  |2 
 configure.ac   
  |4 -
 desktop/source/pkgchk/unopkg/unopkg_app.cxx
  |2 
 editeng/source/accessibility/AccessibleContextBase.cxx 
  |2 
 extensions/source/inc/componentmodule.hxx  
  |2 
 filter/source/graphicfilter/ipict/ipict.cxx
  |2 
 filter/source/xslt/export/wordml/ooo2wordml_table.xsl  
  |4 -
 filter/source/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl  
  |2 
 filter/source/xslt/import/wordml/wordml2ooo_draw.xsl   
  |2 
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
  |4 -
 fpicker/source/office/iodlg.cxx
  |2 
 include/osl/security_decl.hxx  
  |2 
 include/svtools/brwbox.hxx 
  |2 
 include/svx/AccessibleShapeTreeInfo.hxx
  |2 
 include/svx/SmartTagMgr.hxx
  |2 
 odk/docs/install.html  
  |4 -
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.xcu
 |2 
 odk/examples/DevelopersGuide/examples.html 
  |6 +-
 odk/examples/examples.html 
  |6 +-
 offapi/com/sun/star/chart2/Axis.idl
  |2 
 offapi/com/sun/star/chart2/XScaling.idl
  |2 
 offapi/com/sun/star/document/ExtendedTypeDetection.idl 
  |2 
 offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl  
  |2 
 offapi/com/sun/star/document/XUndoManagerListener.idl  
  |4 -
 offapi/com/sun/star/drawing/DrawingDocumentFactory.idl 
  |2 
 offapi/com/sun/star/embed/XEmbeddedClient.idl  
  |2 
 offapi/com/sun/star/frame/XDispatch.idl
  |2 
 offapi/com/sun/star/script/provider/XScript.idl
  |2 
 offapi/com/sun/star/text/TextMarkupType.idl
  |2 
 offapi/com/sun/star/ucb/XInteractionAuthFallback.idl   
  |2 
 offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl 
  |2 
 officecfg/registry/schema/org/openoffice/Office/Labels.xcs 
  |2 
 officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs   
  |2 
 oovbaapi/ooo/vba/excel/XRange.idl  
  |2 
 qadevOOo/tests/java/ifc/lang/_XServiceInfo.java
  |2 
 qadevOOo/tests/java/ifc/sdb/_RowSet.java   
  |2 
 sal/osl/unx/thread.cxx 
  |2 
 sal/test/bootstrap.pl  
  |2 
 sal/textenc/tcvtest1.tab   
  |   16 +++---
 sal/textenc/tcvtlat1.tab

[Libreoffice-commits] core.git: autogen.sh

2017-05-17 Thread Stephan Bergmann 
 autogen.sh |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d21f97659e8ab8028deaa6d237caeeda088ddb1c
Author: Stephan Bergmann 
Date:   Wed May 17 10:28:07 2017 +0200

Revert "Don't worry if there is no distro-configs/Foo.conf"

This reverts commit 47bca2f06434346b556d4aa14b16770e0ae990ab.  I worry very 
much
when some --with-distro=foo due to a typo doesn't do what I'd expect, and 
the
non-fatal error message scrolled by so quickly nobody would notice.

Conflicts:
autogen.sh

Change-Id: I8e0938e28e5aa23b59c82bbd10db0018e32a44dd
Reviewed-on: https://gerrit.libreoffice.org/37701
Reviewed-by: Tor Lillqvist 
Tested-by: Jenkins 

diff --git a/autogen.sh b/autogen.sh
index bff17cd5b2b5..02c82a9708d0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -123,9 +123,10 @@ sub show_distro_configs($$)
 sub invalid_distro($$)
 {
 my ($config, $distro) = @_;
-print STDERR "Can't find distro option set: $config\nThis is not 
necessarily a problem.\n";
+print STDERR "Can't find distro option set: $config\n";
 print STDERR "Distros with distro option sets are:\n";
 show_distro_configs("", "$src_path/distro-configs");
+exit (1);
 }
 
 # Avoid confusing "aclocal: error: non-option arguments are not accepted: 
'.../m4'." error message.
@@ -247,9 +248,8 @@ for my $arg (@cmdline_args) {
 my $config = "$src_path/distro-configs/$1.conf";
 if (! -f $config) {
 invalid_distro ($config, $1);
-} else {
-push @args, read_args ($config);
 }
+push @args, read_args ($config);
 } elsif ($arg =~ m/--best-effort$/) {
 $option_checking = 'warn';
 } else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2017-05-17 Thread Stephan Bergmann 
 autogen.sh |   24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 4ecfc231b858e370cf62f7c5a0d5fb3073d25a9f
Author: Stephan Bergmann 
Date:   Wed May 17 10:24:00 2017 +0200

Show all available distro configs

Change-Id: Ibecd89bb12b3e488a4cf25766bd6ffe5a097f135

diff --git a/autogen.sh b/autogen.sh
index b021ccc05f29..bff17cd5b2b5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -102,20 +102,32 @@ sub read_args($)
 return @lst;
 }
 
-sub invalid_distro($$)
+sub show_distro_configs($$)
 {
-my ($config, $distro) = @_;
-print STDERR "Can't find distro option set: $config\nThis is not 
necessarily a problem.\n";
-print STDERR "Distros with distro option sets are:\n";
+my ($prefix, $path) = @_;
 my $dirh;
-opendir ($dirh, "$src_path/distro-configs");
+opendir ($dirh, "$path");
 while (($_ = readdir ($dirh))) {
+if (-d "$path/$_") {
+show_distro_configs(
+$prefix eq "" ? "$_/" : "$prefix/$_/", "$path/$_")
+unless $_ eq '.' || $_ eq '..';
+next;
+}
 /(.*)\.conf$/ || next;
-print STDERR "\t$1\n";
+print STDERR "\t$prefix$1\n";
 }
 closedir ($dirh);
 }
 
+sub invalid_distro($$)
+{
+my ($config, $distro) = @_;
+print STDERR "Can't find distro option set: $config\nThis is not 
necessarily a problem.\n";
+print STDERR "Distros with distro option sets are:\n";
+show_distro_configs("", "$src_path/distro-configs");
+}
+
 # Avoid confusing "aclocal: error: non-option arguments are not accepted: 
'.../m4'." error message.
 die "\$src_path must not contain spaces, but it is '$src_path'." if ($src_path 
=~ / /);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2016-12-14 Thread Mike Kaganski 
 autogen.sh |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c10e82ada28a49a7d4d44e804f49949fcd3417fc
Author: Mike Kaganski 
Date:   Wed Dec 14 10:27:23 2016 +0300

autogen.sh: Use STDOUT for --help output (as configure does)

Without this, first lines (up to "Other arguments passed directly
to configure:" inclusive) go to STDERR, while the rest to STDOUT

Change-Id: I95327d1ebe7941e5eb89f941ff1f9dc59297946b
Reviewed-on: https://gerrit.libreoffice.org/31999
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/autogen.sh b/autogen.sh
index 6c3856a..b021ccc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -176,10 +176,10 @@ die "Failed to generate the configure script" if (! -f 
"configure");
 # Handle help arguments first, so we don't clobber autogen.lastrun
 for my $arg (@ARGV) {
 if ($arg =~ /^(--help|-h|-\?)$/) {
-print STDERR "autogen.sh - libreoffice configuration helper\n";
-print STDERR "   --cleanforcibly re-generate configuration\n";
-print STDERR "   --best-effort  don't fail on un-known configure 
with/enable options\n";
-print STDERR "\nOther arguments passed directly to configure:\n\n";
+print STDOUT "autogen.sh - libreoffice configuration helper\n";
+print STDOUT "   --cleanforcibly re-generate configuration\n";
+print STDOUT "   --best-effort  don't fail on un-known configure 
with/enable options\n";
+print STDOUT "\nOther arguments passed directly to configure:\n\n";
 system ("./configure --help");
 exit;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2015-12-30 Thread Norbert Thiebaud 
 autogen.sh |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 4c23184a115b607f19a32134f8c91d6f9df61ade
Author: Norbert Thiebaud 
Date:   Tue Dec 29 13:32:18 2015 -0600

lode: make sure LODE_HOME/opt/bin is in the PATH for aclocal

When using a LODE setup, LODE_HOME must be defined in the environment
but setting LODE_HOME/opt/bin in the PATH is optional
and really only necessary as a convinience to get the right
'make' in the PATH.
configure.ac has code do deal with the absence of LODE_HOME/opt/bin
in the PATH but autogen.sh did not hence was failing in this
case, not finding aclocal.

Change-Id: I7a4449504dc539bb055798a6e1aea5268c5fb046
Reviewed-on: https://gerrit.libreoffice.org/21003
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/autogen.sh b/autogen.sh
index f208f35..6c3856a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -127,6 +127,18 @@ chomp $system;
 
 sanity_checks ($system) unless($system eq 'Darwin');
 
+# If we are running in a LODE env, make sure we find the right aclocal
+# by making sure that LODE_HOME/opt/bin is in the PATH
+if (defined $ENV{LODE_HOME})
+{
+my $lode_path = quotemeta "$ENV{LODE_HOME}/opt/bin";
+if($ENV{PATH} !~ $lode_path)
+{
+$ENV{PATH}="$ENV{LODE_HOME}/opt/bin:$ENV{PATH}";
+print STDERR "add LODE_HOME/opt/bin in PATH\n";
+}
+}
+
 my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
 
 $aclocal_flags .= " -I $src_path/m4";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh Makefile.in

2015-03-08 Thread Miklos Vajna 
 Makefile.in |1 +
 autogen.sh  |3 +++
 2 files changed, 4 insertions(+)

New commits:
commit aefc43ba5c2688a1301dcda08b56a42127904cbb
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sun Mar 8 16:58:35 2015 +0100

autogen.sh: better error message when src_path contains spaces

Change-Id: I921ffaf2ee4be73ecfffca8bc36cfae484b70a32

diff --git a/Makefile.in b/Makefile.in
index b4c1ecf..36bcaf3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,6 +45,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \

$(SRCDIR)/android/experimental/LOAndroid3/AndroidManifest.xml.in \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
+   $(BUILDDIR)/autogen.sh \
)
sh -c $(SRCDIR)/autogen.sh
 
diff --git a/autogen.sh b/autogen.sh
index cdf4e76..ab9c94d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -116,6 +116,9 @@ sub invalid_distro($$)
 closedir ($dirh);
 }
 
+# Avoid confusing aclocal: error: non-option arguments are not accepted: 
'.../m4'. error message.
+die \$src_path must not contain spaces, but it is '$src_path'. if ($src_path 
=~ / /);
+
 # Alloc $ACLOCAL to specify which aclocal to use
 $aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2014-11-13 Thread Michael Meeks 
 autogen.sh |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1e03a686a386314be25520dc70e7be01d0f7193b
Author: Michael Meeks michael.me...@collabora.com
Date:   Thu Nov 13 16:27:30 2014 +

autogen: add --best-effort to help automation bridge option changes.

When we add or deprecate configure --with / --enable options lots
of scripts can break. Instead just add --best-effort to your autogen.sh
command line to get warnings but not a failure in this case.

Change-Id: I73d6ba53ee179384c2e34bf6780d074b04f70c06

diff --git a/autogen.sh b/autogen.sh
index 1a1a2d4..cdf4e76 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -161,6 +161,10 @@ die Failed to generate the configure script if (! -f 
configure);
 # Handle help arguments first, so we don't clobber autogen.lastrun
 for my $arg (@ARGV) {
 if ($arg =~ /^(--help|-h|-\?)$/) {
+print STDERR autogen.sh - libreoffice configuration helper\n;
+print STDERR--cleanforcibly re-generate configuration\n;
+print STDERR--best-effort  don't fail on un-known configure 
with/enable options\n;
+print STDERR \nOther arguments passed directly to configure:\n\n;
 system (./configure --help);
 exit;
 }
@@ -203,6 +207,8 @@ WARNING
 
 my @args;
 my $default_config = $src_path/distro-configs/default.conf;
+my $option_checking = 'fatal';
+
 if (-f $default_config) {
 print STDERR Reading default config file: $default_config.\n;
 push @args, read_args ($default_config);
@@ -217,6 +223,8 @@ for my $arg (@cmdline_args) {
 } else {
 push @args, read_args ($config);
 }
+} elsif ($arg =~ m/--best-effort$/) {
+$option_checking = 'warn';
 } else {
 push @args, $arg;
 }
@@ -252,7 +260,7 @@ if (defined $ENV{NOCONFIGURE}) {
 }
 }
 push @args, --srcdir=$src_path;
-push @args, --enable-option-checking=fatal;
+push @args, --enable-option-checking=$option_checking;
 
 print Running ./configure with ' . join (' ', @args), '\n;
 system (./configure, @args)  die Error running configure;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2014-05-30 Thread Christian Lohmaier 
 autogen.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 86908b38dab9b699b801ddd18c1eee9c4ce71455
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri May 30 11:18:20 2014 +0200

strip trailing spaces when reading autogen.input/lastrun

Change-Id: I9d47d2d4c6d2eb14968bfd79ef2a406c57afa21d

diff --git a/autogen.sh b/autogen.sh
index 6894a8e..1a1a2d4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -77,6 +77,7 @@ sub read_args($)
 open ($fh, $file) || die can't open file: $file;
 while ($fh) {
 chomp();
+s/\s+$//;
 # migrate from the old system
 if ( substr($_, 0, 1) eq ' ) {
 print STDERR Migrating options from the old autogen.lastrun 
format, using:\n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh solenv/gbuild

2014-04-23 Thread Luboš Luňák 
 autogen.sh |   16 
 solenv/gbuild/partial_build.mk |5 -
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 2bf2bc2c7f257a818f3f723780690450f1a22c50
Author: Luboš Luňák l.lu...@collabora.com
Date:   Sun Mar 23 16:21:51 2014 +0100

make it possible to do 'make -C sw/' even with builddir!=srcdir

The change in partial_build.mk assumes all the Makefile's using it
are in builddir/module/ or builddir/external/module , these are
differentiated by checking for ../External_module.mk .

Change-Id: Iddc8fa2ec0842f181780f7491cf5a2244efd014a

diff --git a/autogen.sh b/autogen.sh
index f15dd91a..6894a8e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -135,6 +135,22 @@ if ($src_path ne $build_path)
 {
 system (ln -sf $src_path/configure.ac configure.ac);
 system (ln -sf $src_path/g g);
+my @modules = $src_path/*/Makefile;
+foreach my $module (@modules)
+{
+my $dir = basename (dirname ($module));
+mkdir ($dir);
+system (ln -sf $src_path/$dir/Makefile $dir/Makefile);
+}
+my @external_modules = $src_path/external/*/Makefile;
+mkdir (external);
+system (ln -sf $src_path/external/Module_external.mk external/);
+foreach my $module (@external_modules)
+{
+my $dir = basename (dirname ($module));
+mkdir (external/$dir);
+system (ln -sf $src_path/external/$dir/Makefile 
external/$dir/Makefile);
+}
 }
 system ($aclocal $aclocal_flags)  die Failed to run aclocal;
 unlink (configure);
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 68e807b..4d5e1db 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -22,7 +22,10 @@ gb_Side:=host
 endif
 
 ifeq (,$(BUILDDIR))
-BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST../..
+gb_partial_build__makefile_dir=$(dir $(abspath $(firstword $(MAKEFILE_LIST
+BUILDDIR := $(if $(wildcard 
$(gb_partial_build__makefile_dir)../Module_external.mk), \
+  $(gb_partial_build__makefile_dir)../.., \
+  $(gb_partial_build__makefile_dir)..)
 endif
 
 ifeq ($(BUILD_TYPE),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh solenv/gbuild

2014-04-11 Thread Stephan Bergmann 
 autogen.sh |7 ---
 solenv/gbuild/partial_build.mk |2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 11545b91d539b5c354c1423755be2a3809794bb6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Apr 11 14:24:15 2014 +0200

Revert make it possible to do 'make -C sw/' even with builddir!=srcdir

This reverts commit 11e881a63821ea209bda509d1e502d9ba270782d, which assumed 
that
all the Makefile's using it are in builddir/module/, which is not the 
case
for the external/ sub-modules.

diff --git a/autogen.sh b/autogen.sh
index da967a4..f15dd91a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -135,13 +135,6 @@ if ($src_path ne $build_path)
 {
 system (ln -sf $src_path/configure.ac configure.ac);
 system (ln -sf $src_path/g g);
-my @modules = $src_path/*/Makefile;
-foreach my $module (@modules)
-{
-my $dir = basename (dirname ($module));
-mkdir ($dir);
-system (ln -sf $src_path/$dir/Makefile $dir/Makefile);
-}
 }
 system ($aclocal $aclocal_flags)  die Failed to run aclocal;
 unlink (configure);
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index eb2b5cc..68e807b 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -22,7 +22,7 @@ gb_Side:=host
 endif
 
 ifeq (,$(BUILDDIR))
-BUILDDIR := $(dir $(abspath $(firstword $(MAKEFILE_LIST..
+BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST../..
 endif
 
 ifeq ($(BUILD_TYPE),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2014-03-04 Thread Jan-Marek Glogowski 
 autogen.sh |   38 +++---
 1 file changed, 35 insertions(+), 3 deletions(-)

New commits:
commit 806f4d8e9a5237ee6c70b1f0433bf12601db1260
Author: Jan-Marek Glogowski glo...@fbihome.de
Date:   Tue Mar 4 11:49:46 2014 +

Clarify autogen.sh messages

Actually warn the user, if we ignore provided configuration files.

Also add an extended header to explain the expected behaviour.

Change-Id: I630d858c2d24aa0341d04359b45029c7faa54675
Reviewed-on: https://gerrit.libreoffice.org/8446
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/autogen.sh b/autogen.sh
index a2a9675..f15dd91a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,18 @@
 :
+#
+# This script checks various configure parameters and uses three files:
+#   * autogen.input (ro)
+#   * autogen.lastrun (rw)
+#   * autogen.lastrun.bak (rw)
+#
+# If _no_ parmeters:
+#   Read args from autogen.input or autogen.lastrun
+# Else
+#   Backup autogen.lastrun as autogen.lastrun.bak
+#   Write autogen.lastrun with new commandline args
+#
+# Run configure with checked args
+#
 eval 'exec perl -S $0 ${1+$@}'
 if 0;
 
@@ -65,13 +79,13 @@ sub read_args($)
 chomp();
 # migrate from the old system
 if ( substr($_, 0, 1) eq ' ) {
-print Migrating options from the old autogen.lastrun format, 
using:\n;
+print STDERR Migrating options from the old autogen.lastrun 
format, using:\n;
 my @opts;
 @opts = split(/'/);
 foreach my $opt (@opts) {
 if ( substr($opt, 0, 1) eq - ) {
 push @lst, $opt;
-print   $opt\n;
+print STDERR   $opt\n;
 }
 }
 } elsif ( substr($_, 0, 1) eq # ) {
@@ -142,13 +156,31 @@ my $lastrun = autogen.lastrun;
 
 if (!@ARGV) {
 if (-f $input) {
-warn Ignoring $lastrun, using $input.\n if (-f $lastrun);
+if (-f $lastrun) {
+print STDERR WARNING;
+
+*
+*   Reading $input and ignoring $lastrun!
+*   Consider removing $lastrun to get rid of this warning.
+*
+
+WARNING
+}
 @cmdline_args = read_args ($input);
 } elsif (-f $lastrun) {
 print STDERR Reading $lastrun. Please rename it to $input to avoid 
this message.\n;
 @cmdline_args = read_args ($lastrun);
 }
 } else {
+if (-f $input) {
+print STDERR WARNING;
+
+*
+*   Using commandline arguments and ignoring $input!
+*
+
+WARNING
+}
 @cmdline_args = @ARGV;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2013-11-13 Thread Arnaud Versini 
 autogen.sh |   52 ++--
 1 file changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 6b114c2dbce8bbb5aa9ffd7fac581d942cfc2819
Author: Arnaud Versini arnaud.vers...@libreoffice.org
Date:   Thu Oct 17 15:01:45 2013 +0200

Generate configure before calling ./configure --help

Change-Id: I21a88802b6ca617a44def3bc96789eb97969c918
Reviewed-on: https://gerrit.libreoffice.org/6291
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com

diff --git a/autogen.sh b/autogen.sh
index dc3a58d..a2a9675 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -101,6 +101,32 @@ sub invalid_distro($$)
 closedir ($dirh);
 }
 
+# Alloc $ACLOCAL to specify which aclocal to use
+$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
+
+my $system = `uname -s`;
+chomp $system;
+
+sanity_checks ($system) unless($system eq 'Darwin');
+
+my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
+
+$aclocal_flags .=  -I $src_path/m4;
+$aclocal_flags .=  -I $src_path/m4/mac if ($system eq 'Darwin');
+$aclocal_flags .=  -I /opt/freeware/share/aclocal if ($system eq 'AIX');
+
+$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 
'Darwin'));
+
+if ($src_path ne $build_path)
+{
+system (ln -sf $src_path/configure.ac configure.ac);
+system (ln -sf $src_path/g g);
+}
+system ($aclocal $aclocal_flags)  die Failed to run aclocal;
+unlink (configure);
+system (autoconf -I ${src_path})  die Failed to run autoconf;
+die Failed to generate the configure script if (! -f configure);
+
 # Handle help arguments first, so we don't clobber autogen.lastrun
 for my $arg (@ARGV) {
 if ($arg =~ /^(--help|-h|-\?)$/) {
@@ -152,32 +178,6 @@ for my $arg (@args) {
 }
 }
 
-# Alloc $ACLOCAL to specify which aclocal to use
-$aclocal = $ENV{ACLOCAL} ? $ENV{ACLOCAL} : 'aclocal';
-
-my $system = `uname -s`;
-chomp $system;
-
-sanity_checks ($system) unless($system eq 'Darwin');
-
-my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
-
-$aclocal_flags .=  -I $src_path/m4;
-$aclocal_flags .=  -I $src_path/m4/mac if ($system eq 'Darwin');
-$aclocal_flags .=  -I /opt/freeware/share/aclocal if ($system eq 'AIX');
-
-$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 
'Darwin'));
-
-if ($src_path ne $build_path)
-{
-system (ln -sf $src_path/configure.ac configure.ac);
-system (ln -sf $src_path/g g);
-}
-system ($aclocal $aclocal_flags)  die Failed to run aclocal;
-unlink (configure);
-system (autoconf -I ${src_path})  die Failed to run autoconf;
-die Failed to generate the configure script if (! -f configure);
-
 if (defined $ENV{NOCONFIGURE}) {
 print Skipping configure process.;
 } else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2013-07-26 Thread Isamu Mogi 
 autogen.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 92e484c4b5baffbcc3a24af0d104adde351f77c0
Author: Isamu Mogi saturda...@gmail.com
Date:   Sat Jul 20 09:45:36 2013 +0900

Ignore empty line in autogen.input

Change-Id: I5a640c996779ba548c1b4772820eaa799537c1af
Reviewed-on: https://gerrit.libreoffice.org/4991
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/autogen.sh b/autogen.sh
index 7b1b726..dc3a58d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -76,6 +76,8 @@ sub read_args($)
 }
 } elsif ( substr($_, 0, 1) eq # ) {
 # comment
+} elsif ( length == 0 ) {
+# empty line
 } else {
 push @lst, $_;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2013-05-08 Thread Tor Lillqvist 
 autogen.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit df4fd344b7b5d5dfb7cbf2f7a91ed6e86a2aaef8
Author: Tor Lillqvist t...@iki.fi
Date:   Wed May 8 13:35:04 2013 +0300

Make it a fatal error to pass unrecognized options to the configury

It might hurt a bit in the beginning if you have been careless with keeping
your autogen.input up-to-date, but I think this is a good idea.

Change-Id: I6b89c887c94755ac6ef50f63e0438ecec7157516

diff --git a/autogen.sh b/autogen.sh
index 0e61ee5..7b1b726 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -201,6 +201,7 @@ if (defined $ENV{NOCONFIGURE}) {
 }
 }
 push @args, --srcdir=$src_path;
+push @args, --enable-option-checking=fatal;
 
 print Running ./configure with ' . join (' ', @args), '\n;
 system (./configure, @args)  die Error running configure;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

2013-04-04 Thread Luboš Luňák 
 autogen.sh |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 68c314fc80b5dd5be26a7207b3459a2be9625240
Author: Luboš Luňák l.lu...@suse.cz
Date:   Wed Apr 3 18:01:35 2013 +0200

revert back to usign autogen.sh cmdline arguments if given

This is a partial revert of ca0c54d0fe3812cec64e5c7cc83309d4397f5e0a .
Ignoring cmdline arguments if autogen.* exists is broken for several 
reasons:
- autogen.sh of every other package passes cmdline arguments to configure
- that's because if I was bothered to give them, I want them used
- there's no reason to prefer autogen.input now, given that autogen.input
  cannot be overwritten by autogen.sh, unlike autogen.lastrun , so there's
  no accidental loss of the switches
- running autogen.sh --foo followed by autogen.sh --bar actually runs
  configure with --foo the second time too, because the first one creates
  autogen.lastrun and the second one first complains about the cmdline
  args, then complains about autogen.lastrun, and then uses it

Change-Id: I5868610935d0312915be74602b6435eea069f937
Reviewed-on: https://gerrit.libreoffice.org/3190
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/autogen.sh b/autogen.sh
index f5960e3..2498c5a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -112,14 +112,14 @@ my @cmdline_args = ();
 my $input = autogen.input;
 my $lastrun = autogen.lastrun;
 
-if (-f $input) {
-warn Ignoring command-line arguments, using $input.\n if (@ARGV);
-warn Ignoring $lastrun, using $input.\n if (-f $lastrun);
-@cmdline_args = read_args ($input);
-} elsif (-f $lastrun) {
-warn Ignoring command-line arguments, using $lastrun.\n if (@ARGV);
-print STDERR Reading $lastrun. Please rename it to $input to avoid this 
message.\n;
-@cmdline_args = read_args ($lastrun);
+if (!@ARGV) {
+if (-f $input) {
+warn Ignoring $lastrun, using $input.\n if (-f $lastrun);
+@cmdline_args = read_args ($input);
+} elsif (-f $lastrun) {
+print STDERR Reading $lastrun. Please rename it to $input to avoid 
this message.\n;
+@cmdline_args = read_args ($lastrun);
+}
 } else {
 @cmdline_args = @ARGV;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh Makefile.in

2013-04-03 Thread Tor Lillqvist 
 Makefile.in |9 +
 autogen.sh  |   40 ++--
 2 files changed, 27 insertions(+), 22 deletions(-)

New commits:
commit ca0c54d0fe3812cec64e5c7cc83309d4397f5e0a
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Mar 28 15:26:25 2013 +0200

Make autogen.sh prefer to read an autogen.input file

For backward compatibility, an autogen.lastrun file will still be used if it
exists and autogen.input does not exist. The recommended workflow is now to
keep the configuration parametets in autogen.input which is never written by
autogen.sh.

Most (?) developers used to treat autogen.lastrun as a valuable parameter 
file
to be edited manually anyway, and not as an ad-hoc backup copy of 
command-line
parameters last used. The name autogen.input better reflects this usage.

Change-Id: I7e3c747fa95e9f2f0bc44036419aaab8f4ad01e7
Reviewed-on: https://gerrit.libreoffice.org/3111
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/Makefile.in b/Makefile.in
index f19de69..ecfbc1c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,16 +33,17 @@ $(BUILDDIR)/config_host.mk : \
$(SRCDIR)/Makefile.in \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
-   $(BUILDDIR)/autogen.lastrun
+   $(if $(wildcard 
$(BUILDDIR)/autogen.input),$(BUILDDIR)/autogen.input,$(if $(wildcard 
$(BUILDDIR)/autogen.lastrun),$(BUILDDIR)/autogen.lastrun))
$(SRCDIR)/autogen.sh
 
-# dummy rule in case any of the above prerequisites are removed, so that a 
stale
-# Makefile still triggers autogen.sh, or in case autogen.lastrun does not yet
-# exist
+# dummy rule in case any of the above prerequisites are removed, so
+# that a stale Makefile still triggers autogen.sh, or in case
+# autogen.input does not exist, or autogen.lastrun does not yet exist
 $(SRCDIR)/config_host.mk.in \
 $(SRCDIR)/Makefile.in \
 $(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
 $(SRCDIR)/configure.ac \
+$(BUILDDIR)/autogen.input \
 $(BUILDDIR)/autogen.lastrun:
@true
 
diff --git a/autogen.sh b/autogen.sh
index fa77b73..f5960e3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,7 @@ sub clean()
 {
 system (rm -Rf autom4te.cache);
 system (rm -f missing install-sh mkinstalldirs libtool ltmain.sh);
-print cleaned the build tree\n;
+print Cleaned the build tree\n;
 }
 
 my $aclocal;
@@ -108,9 +108,18 @@ for my $arg (@ARGV) {
 }
 
 my @cmdline_args = ();
-if (!@ARGV) {
-my $lastrun = autogen.lastrun;
-@cmdline_args = read_args ($lastrun) if (-f $lastrun);
+
+my $input = autogen.input;
+my $lastrun = autogen.lastrun;
+
+if (-f $input) {
+warn Ignoring command-line arguments, using $input.\n if (@ARGV);
+warn Ignoring $lastrun, using $input.\n if (-f $lastrun);
+@cmdline_args = read_args ($input);
+} elsif (-f $lastrun) {
+warn Ignoring command-line arguments, using $lastrun.\n if (@ARGV);
+print STDERR Reading $lastrun. Please rename it to $input to avoid this 
message.\n;
+@cmdline_args = read_args ($lastrun);
 } else {
 @cmdline_args = @ARGV;
 }
@@ -118,7 +127,7 @@ if (!@ARGV) {
 my @args;
 my $default_config = $src_path/distro-configs/default.conf;
 if (-f $default_config) {
-print STDERR Reading default config file: $default_config\n;
+print STDERR Reading default config file: $default_config.\n;
 push @args, read_args ($default_config);
 }
 for my $arg (@cmdline_args) {
@@ -164,40 +173,35 @@ if ($src_path ne $build_path)
 system ($aclocal $aclocal_flags)  die Failed to run aclocal;
 unlink (configure);
 system (autoconf -I ${src_path})  die Failed to run autoconf;
-die failed to generate configure if (! -f configure);
+die Failed to generate the configure script if (! -f configure);
 
 if (defined $ENV{NOCONFIGURE}) {
 print Skipping configure process.;
 } else {
 # Save autogen.lastrun only if we did get some arguments on the 
command-line
-if (@ARGV) {
+if (! -f $input  @ARGV) {
 if (scalar(@cmdline_args)  0) {
 # if there's already an autogen.lastrun, make a backup first
-if (-e autogen.lastrun) {
-open (my $fh, autogen.lastrun) || warn can't open 
autogen.lastrun. \n;
-open (BAK, autogen.lastrun.bak) || warn can't create 
backup file. \n;
+if (-e $lastrun) {
+open (my $fh, $lastrun) || warn Can't open $lastrun.\n;
+open (BAK, $lastrun.bak) || warn Can't create backup file 
$lastrun.bak.\n;
 while ($fh) {
 print BAK;
 }
 close (BAK)  close ($fh);
 }
-# print writing args to autogen.lastrun\n;
+# print Saving command-line args to $lastrun\n;
 my $fh;
-open ($fh, autogen.lastrun) || die can't open