Commit Graph

17 Commits (master)

Author SHA1 Message Date
Miklos Vajna 458c23e5aa autogen: conditionally invoke configure at the end
This is backwards-compatible and core.git autogen.sh executes
configure, so it eliminates a pointless difference.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I897bd2f6464201a19e26e55006cd52727abdfc41
2023-12-19 15:00:34 +01:00
Tor Lillqvist c8d176ead9 No need to cd back before exiting a shell script that is run as a command
The autogen.sh script is not supposed to be sourced ("source
autogen.sh"), but run as a command ("./autogen.sh"). After all, it has
the executable bit set. Also, the function called "failed" in it does
an "exit" at the end. That would be a rather rude thing to do as soon
as something goes wrong if the script is sourced.

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: Ia0e4bbb2b9bed93fb4dba5c0f46a1760ec6e50d7
2022-12-07 15:06:16 +02:00
Gleb Popov fed8ed59a4 Use portable `/usr/bin/env bash` shebang, instead of `/bin/bash` one.
Signed-off-by: Gleb Popov <6yearold@gmail.com>
Change-Id: I196c8747d9c88991bd0352849113748f8ea1294d
2020-12-17 11:52:18 +00:00
Gleb Popov 8aaebf9e17 Add FreeBSD case to autogen.sh
Change-Id: Ib0e1cb3f34099a46e34e17a23e38d1c4bdb7dec9
2020-10-24 17:51:15 +01:00
Miklos Vajna 9619517a10 git hooks: enable them automatically during 'make'
So one can't forget enabling them.

Change-Id: Icb595e9d0711227eaa6f11c1a9ff87f2c361e0bb
2020-10-07 12:54:47 +02:00
Andras Timar c5eae88743 typo
Change-Id: Iaaf095e80a7bcff597825438ce54f8039a7e6bfc
2020-05-20 22:31:19 +02:00
Tor Lillqvist d921cb6053 Look also for libtoolize on macOS, not just glibtoolize
When build in lode, it gets installed only as "libtoolize".

(Note that when bulding the iOS app, it is needed only by online's
configure script. Not at all at build or run time, of course.)

Change-Id: I7c96672b2660354aecd17db7004f5b79d707e245
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94560
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-20 11:11:49 +02:00
Tor Lillqvist 199c6e2918 Revert "Get rid of use of GNU libtool" and its follow-up
The change causes problems for people on various sad distros. Oh well,
whatever.

This reverts commit bd00d9fd05.
This reverts commit 054a9cdb04.

Change-Id: Ie439e4c655d02b6f34bdd1a9c1c5b6db6048b653
2019-05-27 10:25:51 +03:00
Tor Lillqvist bd00d9fd05 Get rid of use of GNU libtool
It is is complicated enough to build the iOS app. Requiring GNU
libtool brings with it the risk of polluting the command environment
as there already is a completely different command in macOS with the
same name, /usr/bin/libtool. And as GNU libtool was used only to build
the unit tests for the "normal" server-based Online that are built and
run only on Linux anyway, we don't really need any of the
"portability" that GNU libtool brings.

Without GNU libtool, we compile all the $(wsd_sources) (see
test/Makefile.am) that the unit-* tests use into a single object file,
WsdSources.o. (Because they need to be compiled as PIC we can't use
the already compiled object files for the Online server programs.)
This required some additional minor changes to a few source files.

Change-Id: I20a2c523170376fa4c1a0d9d8d6b693a9779376f
Reviewed-on: https://gerrit.libreoffice.org/72840
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-05-24 09:50:16 +02:00
Jan Holesovsky 081da013b5 Revert "configure: add Boost.Locale library"
This reverts commit b1bec2f500.
2019-03-15 17:28:14 +01:00
Henry Castro b1bec2f500 configure: add Boost.Locale library
use --with-boost-libdir=LIB_DIR

Change-Id: I7c01fa33ce1dafcfc636ddcdeae46111b2ccab8e
2019-03-05 16:58:22 -04:00
Tor Lillqvist 673a7b505e Revert "Make glibtoolize optional, as presumably was the thought"
I was wrong. I didn't remember that I had had to run glibtoolize
myself once back in the days when initially setting up my iOS build
tree on macOS, in order to get the m4 directory with its symlinks to
the libtool-related m4 files in (for me) /opt/gnu/share/aclocal. Even
if libtool is not used in any way when building the iOS app.

This reverts commit 14e998723f.

Change-Id: I474b0f47a2156a30b22be8c39864ebcd09010e21
2019-02-26 12:20:29 +02:00
Tor Lillqvist 14e998723f Make glibtoolize optional, as presumably was the thought
Change-Id: I85b7247451d74182906e96a8a9aa0d7cdcbe1970
2019-02-19 16:30:43 +02:00
Michael Meeks b46f027101 iOS: add some alternative brew / pip instructions for local building.
Change-Id: Icefeb848537cefc618170d730d3c0b32e3898de6
2019-02-18 16:44:51 +01:00
Tor Lillqvist 0b49485383 Require running configure also in tree where you will build the iOS app
Take the user-visible name of the iOS app as a configure parameter
--with-iosapp-name. The only purpose of running the configure script
in this case is to get that expanded into the Info.plist file.

You need autofoo to build LibreOffice core for iOS anyway, so this
doesn't really add any new hurdles for a potential developer who wants
to build the iOS app

Bypass some checks that aren't relevant (and would fail) in this case.
Could bypass a lot more of configure.ac in the ENABLE_IOSAPP case.

Change-Id: Ia0cb82ad552da1bb597411748f0cd74f825774fa
2018-10-30 12:10:31 +02:00
Henry Castro c254cc333b execute autogen.sh from a build directory
Change-Id: Ibd394549366d0059fe27696343870645e1e11947
2018-04-12 15:46:40 -04:00
Michael Meeks cca657c8f2 Apply the pre-branch rename script to re-organize the source. 2016-11-25 09:58:48 +00:00