Commit graph

113 commits

Author SHA1 Message Date
Jan Holesovsky
13df611403 android: Allow specifying the versionCode from ./configure.
Change-Id: If3f618bd836d236e76bd4698321ec7314ebac1a4
Reviewed-on: https://gerrit.libreoffice.org/82177
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-11-07 09:39:48 +01:00
Tor Lillqvist
2c8350b8a1 Don't require the Python modules unless on Linux
When building the iOS app my way, I do the J bits on a Linux box and
not on the Mac, thus I don't need any Python stuff on the Mac.

Change-Id: Ib8092870598fb3a8f304aefa8fab21fe7e3acc73
Reviewed-on: https://gerrit.libreoffice.org/82018
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-11-04 15:25:38 +01:00
Andras Timar
5a0e357f78 add -lssl and -lcrypto to LIBS, if SSL is enabled
Without this the linking with static poco libs failed on Ubuntu
16.04 and 18.04. Interestingly on other distros, including Debian
8, 9, 10, and CentOS 7, 8, and openSUSE, this patch was not necessary.

Change-Id: I96c90ab5e960e8843db9b835f6e1a0417c7b48f8
Reviewed-on: https://gerrit.libreoffice.org/81836
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2019-10-31 14:28:19 +01:00
Andras Timar
5e4c9db5de fix configure check 'If we need to link with -lpcre'
The test program did not compile because of
error: unused parameter 'argc' [-Werror=unused-parameter]
As result, we always linked with -lpcre.

Change-Id: I7557025cc56fb72fc2a9f8de6142de93cfed2335
2019-10-30 13:51:48 +01:00
Yunusemre Şentürk
3c4f900b45 change linking order of poco libs in order to make static linking possible
Change-Id: I8de3f454f9174d78777303779acdb6c9c1ba2c7c
2019-10-30 10:03:49 +01:00
Michael Weghorn
f75366bc94 configure.ac: Add check for python3 libs
They are needed since commit
c1e04e4069
("scripts/unocommands.py: Switch to python3"),
so add a corresponding check to configure.ac.

Change-Id: If0f1d2b474c3edb3fc63dc54292acd54f096b822
Reviewed-on: https://gerrit.libreoffice.org/81473
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-10-25 09:51:43 +02:00
Tor Lillqvist
9c2fd9ded9 The --with-lo-path is not necessary when building for iOS or Android
Change-Id: Ib245058f1a3e985547e9a44dd4c8ebc613875cb6
Reviewed-on: https://gerrit.libreoffice.org/80444
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-10-08 16:40:33 +02:00
Andras Timar
db176ee45b Remove lo_template_path option
It was not very useful to let this setting configurable by the user.
On the other hand, old path in config file caused issues after
upgrade. It is better to decide the location of LOKit core
during compilation. From now on the --with-lo-path configure
option is compulsory.

Change-Id: Icdcbc21bde5dad329fdb6e30ed17efde6b0e73de
Reviewed-on: https://gerrit.libreoffice.org/79943
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2019-10-08 09:36:44 +02:00
Tor Lillqvist
163f6f5f5e It's ios/Mobile/Branding that we want
Change-Id: I059189b7268b41515d12ef245b52f6eb6117f9b4
(cherry picked from commit 5cd866441db6f1f7f7a3450b63893d4d44256e31)
Reviewed-on: https://gerrit.libreoffice.org/79385
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-23 10:44:44 +02:00
Ashod Nakashian
90188d07c1 configure: support sanitizers
It is now possible to run ./configure --with-sanitizer=address
(or any least of valid sanitizers) to build with sanitizers.

When --with-sanitizer is specified, we build with -O1 and
don't omit frame-pointer. We also enable RTTI (which should
be enabled anyway, but just in case).

UBSan (undefined) sanitizer can cause 'typeinfo' errors.
Fixing the source is best, but as a workaround, disabling
vptr sanitizer works. Just pass -fno-sanitize=vptr to CFLAGS
and CXXFLAGS.

Change-Id: I4031aa872b1b1ef779703135394f3733952e5cd1
Reviewed-on: https://gerrit.libreoffice.org/79329
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2019-09-22 20:26:25 +02:00
Ashod Nakashian
226c2fe71c wsd: unify anonymization flags under one
This simplifies the anonymization configuration
as virtually always they are all either enabled
together, or not at all.

Change-Id: I6fe60f5287fc5d71cd7a6ac3268eac67e5e6e9fb
Reviewed-on: https://gerrit.libreoffice.org/70033
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/71090
2019-08-17 03:42:19 +02:00
Jan Holesovsky
2b13c69d75 android: Split the actual editing Activity into an own library.
This way, it is more naturally visible what is the actuall app (with the
initial recent documents / file picker) and the editing part.

Change-Id: Ia764f2900939e980f703e3da9f9abd6c0aee7cbb
2019-07-12 11:52:56 +02:00
Samuel Mehrbrodt
16fcd37201 configure: Add support for custom icons
Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9
Reviewed-on: https://gerrit.libreoffice.org/74491
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-06-28 12:32:43 +02:00
Jan Holesovsky
f77c8cd967 android: make clean should clean the assets too.
Change-Id: I1cb2ddb1a7ed71234a5ffc9bdf3631d701df6e5c
2019-06-20 14:14:00 +02:00
Jan Holesovsky
f485b2ea97 android/ios: Turn the --with-iosapp-branding into --with-app-branding.
This is needed for the Android app too, so generalize the switch.

Kill copying of the example documents into the APK when at that...

Change-Id: I5b575ade3e40cc0becd5c739077acff5299d3312
2019-06-20 14:13:09 +02:00
Jan Holesovsky
61f6189a99 android: Allow providing the package name via --with-android-package-name.
And when at that, tweak some settings for the release configuration.

Change-Id: Ib8dab481fb7734637076603347f8fde453455fda
2019-06-20 14:12:55 +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
Samuel Mehrbrodt
cbbe43fcff Revert "Change package name to "libreoffice-online" instead of "loolwsd""
As discussed on IRC: This leads to incompatible changes (config directory changed) and instead we will use loolwsd on master branch too from now on.

This reverts commit 1dbbc5acc7.

Change-Id: Ifa38144f830578c12cda7454354b60d09426e704
Reviewed-on: https://gerrit.libreoffice.org/72734
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-22 12:07:07 +02:00
Samuel Mehrbrodt
1dbbc5acc7 Change package name to "libreoffice-online" instead of "loolwsd"
The name on master is "loolwsd" while the official relase branches
(libreoffice-6-2 e.g.) have "libreoffice-online".

This leads to various issues, e.g. some scripts expect the config files
to be in /etc/loolwsd while changing the name also changes that folder name
to /etc/libreoffice-online.
So at least docker builds from the release branches don't work.

The package name should be consistent, either we use "libreoffice-online"
on master also, or we change the release branches to also use "loolwsd".

My preference is to have "libreoffice-online" as the name. "loolwsd" is an
internal term and hard to associate with LibreOffice online for "outsiders".

Change-Id: I1b1efda2fa6083f1a0d211fd73f1fa062f3286cc
Reviewed-on: https://gerrit.libreoffice.org/72590
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-05-21 17:29:15 +02:00
Tor Lillqvist
60581962af Add branding to the iOS app
A configure argument, --with-iosapp-branding, should point to a
directory containing a branding.css file and possibly other files that
branding.css references, to be bundled and used by the iOS app. The
directory structure ends upp in the app bundle as Branding. The
generated loleaflet.html for the iOS app references
Branding/branding.css unconditionally.
2019-04-22 17:23:20 +03:00
Jan Holesovsky
2c174e3c30 android: Introduce --with-vendor and --with-info-url.
For the Android's 'shell' About dialog box; includes also some fixes to
that dialog.

Change-Id: I0c9f660da981b653608bf11e1eaccb283feb513f
2019-04-16 12:59:43 +02:00
Jan Holesovsky
ea659b3d99 Use the app name more generally, not only on iOS.
Preparation for using it on Android too.

Change-Id: Iee7778b2625a02a98daff5df87c39f4ab1d18144
Reviewed-on: https://gerrit.libreoffice.org/70651
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2019-04-12 13:44:40 +02:00
Samuel Mehrbrodt
f46d5e9845 NPM: require at least v5.0.0
This is necessary after 338563ab45

Change-Id: I026dba613349931a95fd71b126e72605d1546140
Reviewed-on: https://gerrit.libreoffice.org/70054
Reviewed-by: Alexandru Vlăduţu <alexandru.vladutu@1and1.ro>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-04-01 13:37:35 +02:00
Henry Castro
da2bdd62da configure: update links for directory "archived-packages"
Change-Id: Iea7d5f867b5a7a2f987b0513d33ffb675729de97
2019-03-30 16:35:40 -04:00
Jan Holesovsky
081da013b5 Revert "configure: add Boost.Locale library"
This reverts commit b1bec2f500.
2019-03-15 17:28:14 +01:00
Jan Holesovsky
95f4d70ea7 Revert "configure: check "msgfmt" installation"
This reverts commit a6b2708ef5.
2019-03-15 17:27:51 +01:00
Henry Castro
a6b2708ef5 configure: check "msgfmt" installation
Change-Id: Ib6661e3e79e4ceba6379097875d5d1e7998838e6
2019-03-05 17:31:57 -04: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
ce53efd880 Keep the iOS app bundle version in a file in the build folder, not in git
When you want to build a new version for distribution, bump the
build number in the BUNDLE-VERSION file.

Change-Id: I1e7e55528aef6d3526ce14d070ae96abc5931f38
2019-02-25 09:14:14 +02:00
Szymon Kłos
8a61a53027 Integrate browser-sync
Tool to automatically reload used .css and .js files.
To make it work symlinks are created instead of a copy
if browsersync is enabled.

1. install:
npm install -g browser-sync

2. use configure option: --enable-browsersync

3. remove loleaflet/dist directory

4. run server:
LOOL_SERVE_FROM_FS=1 make run -j10

5. run browsersync:
browser-sync start --config browsersync-config.js

or

make sync-writer

Change-Id: Iebee1cc0b9a03bc866954ff33e3cb8a10b48e0af
2019-02-21 09:23:47 +01:00
Tor Lillqvist
8f71365f0f Remove unnecessary leftovers after Michael's removal of the on-disk tile cache
Change-Id: I435679b48f90d2580bb9c5c86a26c9a1d43c5b59
Reviewed-on: https://gerrit.libreoffice.org/67885
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2019-02-15 21:36:16 +01:00
Jan Holesovsky
427c5ea219 android: Settings for the build.gradle.
Change-Id: I457a7fb8a80106c0474ee03229e712a557cf799b
2019-02-15 16:53:35 +01:00
Jan Holesovsky
7a0209c7aa android: Link against the debug POCO libraries if --enable-debug.
Change-Id: Ic7dc3076a12fe9a0faf4dec5c0f5b0b3a5a171c3
2019-02-13 17:28:01 +01:00
Jan Holesovsky
e79f5f7ec6 android: Create the html, js and css and copy it to the right place.
Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-02-13 13:22:25 +01:00
Jan Holesovsky
6d8d40a267 android: Use configure for the rest of the hardcoded stuff in CMakeLists.txt.
Change-Id: I61ae98c87f439dffe6df4b9c61da7e7c5f968786
2019-02-13 12:09:36 +01:00
Jan Holesovsky
3af9580489 android: Generate the CMakeLists.txt from configure.
Change-Id: I9012e78adda55640c6fe74829fcb7f7a2fb25ce6
2019-02-13 11:32:49 +01:00
Jan Holesovsky
f76b36193d android: #if(n)def MOBILEAPP -> #if (!)MOBILEAPP for better reliability.
Change-Id: I5f9c9420b6c83601db1c8fdba4ae5a10b17b2107
2019-02-12 12:20:11 +01:00
Jan Holesovsky
d15fc93f31 android: Define MOBILEAPP via config.h. 2019-02-12 10:50:40 +01:00
Jan Holesovsky
e780a02171 android: Make it to ./configure.
Make of course immediately fails.
2019-02-12 10:50:40 +01:00
Tor Lillqvist
0a5a711231 Create the ios/Mobile/Fonts directory even if we won't copy any fonts there
It is referenced unconditionally in the Xcode project file.

Change-Id: I1f6713b5327740f76e90ea88dfb19a4933d0bce3
2019-01-22 23:50:19 +02:00
Samuel Mehrbrodt
4691d2b18a Add some messages whether we are building with support key
Change-Id: If41767c549e9e46b7f0a6f23fa5d819a946f9bdb
2019-01-08 18:49:12 +01:00
Andras Timar
279301e51d New configure switch --enable-vereign to set the default document signing url
Change-Id: I65225fc5f94a8ad49b75d31ef3535e8479484e69
2018-12-11 12:55:16 +01:00
Tor Lillqvist
3c046b0548 Add --with-iosapp-fonts option to bundle some 3rd-party fonts in the app
Propagate the font files found in that folder to Info.plist and to the
app bundle.

Change-Id: I2c38b0d7d21dbdf3b7ffd3b4ae98e47b9ad74758
2018-11-27 17:06:22 +02:00
Tor Lillqvist
8dee781542 Use the right version name and git hash for the iOS app
Propagate the information to the otherwise pre-canned iOS version of
config.h, too.

Change-Id: Ia459a20b529e2ea02b4e00894521a085a8806d57
2018-11-27 01:05:04 +02:00
Tor Lillqvist
a9f6d57222 Correct a few leftover mentions of "Mobile/Mobile" to "ios/Mobile"
Change-Id: Ie2e44bda495f3a08fc91c8d9fe40f9d1d9607283
2018-11-23 11:26:57 +02:00
Tor Lillqvist
a6eadf4e81 Move the iOS app to the ios folder
Change-Id: I46e0722b027e93f90b5cd6a74cd7dc46f6c8cea2
2018-11-22 16:50:57 +02:00
Michael Meeks
4618b6c9c3 mobile: use more generic names to share with Android.
Change-Id: I747c6d384071d3a43d43c3c3f801efdfac0a1825
2018-11-22 14:11:59 +00:00
Andras Timar
51fdcdb424 configure: undefined option is "" not "no"
Change-Id: I39cba79aa98b7e0d13a53b37cba0833c5a5267a8
2018-11-07 12:39:47 +01:00
Tor Lillqvist
2c5893edfa Revert the addition of the --with-lo-srcdir option
Sadly, it did not work as expected. Even if the LibreOffice core
source that are mentioned in project.pbxproh, and referred to using
the losrcdir-symlink, did show up in Xcode, setting breakpoints in
them did not work. A pathname to such a source file would include
"losrcdir-symlink" which woul not match the pathname actually compiled
in the corresponding binary. Or something like that. So we are back at
requiring manual editing of the LO core source directory path in
project.pbxproj.

This commit reverts part of 5f2a6f6aa3.

Change-Id: I15fb7363e287fdf4942ac9d362a7151202d0ee9d
2018-11-04 12:58:30 +02:00