Commit graph

49 commits

Author SHA1 Message Date
Tor Lillqvist
fc9f722a46 Revert "Look for libpng16, too, and link with -lz (in case static build)"
Nah. Let's not pretend. The configure script approach is for Linux
only.

This reverts commit db5a57308b.
2018-08-20 17:59:31 +03:00
Tor Lillqvist
a035120095 Revert "Hopefully just 'readlink' (without the -f option) is enough"
Nah. Let's not pretend. The configure script approach is for Linux
only.

This reverts commit 574f769317.
2018-08-20 17:59:06 +03:00
Tor Lillqvist
db5a57308b Look for libpng16, too, and link with -lz (in case static build) 2018-08-20 13:15:00 +03:00
Tor Lillqvist
574f769317 Hopefully just 'readlink' (without the -f option) is enough 2018-08-20 13:15:00 +03:00
Tor Lillqvist
b811f70492 Revert "When asked to convert to PNG, look for an embedded ODF thumbnail first"
The embedded ODF thumbnail in documents produced by OOo or LO is too
small (max 256 pixels) to be useful in general, so let's not bother.

This reverts commit 3a9e536dfa.

Change-Id: I503b61f85264b9be658064632ffd1f94518b2a3c
2018-08-15 11:36:20 +03:00
Tor Lillqvist
3a9e536dfa When asked to convert to PNG, look for an embedded ODF thumbnail first
Change-Id: Ib777572fe5f79b1cfdd95ec3a7f84484a13ae145
2018-07-12 19:27:54 +03:00
Jan Holesovsky
06c978f0ef Don't confuse git wwhen the npm-shrinkwrap.json auto-updates.
Change-Id: I84e4d2b57b2b8db76935e33c28b2e99129b281c6
2018-05-18 15:49:07 +02:00
Henry Castro
8618885b31 use Makefile to build loleaflet
Concatenate and minify all javascript files in the release build but not
in the debug build. Also, it is enabled to use a build directory

Change-Id: Ia120447a827cfe236241ddf188bf43a088f877a7
Reviewed-on: https://gerrit.libreoffice.org/52802
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2018-05-10 20:30:16 +02:00
Andras Timar
04feab241f use local tile cache directory for tests
Change-Id: I4c66a45df93bee22131c5950029cffa863d397b0
Reviewed-on: https://gerrit.libreoffice.org/54028
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-09 15:29:28 +02:00
Andras Timar
04539cc00c Revert "enable make parallelism"
Bad idea, 'make check' does not tolerate parallelism.

This reverts commit 2e4ecfaf44.
2018-03-09 12:49:02 +01:00
Miklos Vajna
c54790def5 configure: require nodejs 6
Build will fail for nodejs 4 anyway, so fail early in configure.

Change-Id: I0be746454cd21401195f8bf72a4eb107a3433fd7
Reviewed-on: https://gerrit.libreoffice.org/50889
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-03-07 16:23:08 +01:00
Rene Engelhard
593c3b15f8 actually check for pam header and lib
Change-Id: Iaed84c3b72c2540176c8a0ed8e1f13d7c5cadc44
Reviewed-on: https://gerrit.libreoffice.org/50674
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-03-04 19:14:06 +01:00
Andras Timar
2e4ecfaf44 enable make parallelism
Change-Id: Ie16a450bee6d718d8daf58194fbbd7dfd1ac2f38
Reviewed-on: https://gerrit.libreoffice.org/50470
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-02-28 09:35:04 +01:00
Samuel Mehrbrodt
591a0b5fed Improve explanation for support key in configure
Change-Id: Ifd2fef9ff6b15e04e75bfecc478c3ac63efc84f5
Reviewed-on: https://gerrit.libreoffice.org/49672
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-02-15 09:16:18 +01:00
Miklos Vajna
b8926baa18 configure: allow disable werror with --disable-werror
Change-Id: Ie614ce2143669008c38ecf4b267d6fec78337be6
Reviewed-on: https://gerrit.libreoffice.org/49434
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
2018-02-08 15:48:01 +01:00
Christian Glombek
51993b8990 Adds ENABLE_SETCAP build variable to avoid using env in build system.
Change-Id: Id38d2225238f8b3a48481a08e62cfa7544958cc9
Reviewed-on: https://gerrit.libreoffice.org/49097
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-02-04 22:27:09 +01:00
Pranav Kant
000e8a352c compilerplugins: pass absolute path to online dir
This makes plugin.so in core.git to enter in LOOL mode.

Change-Id: I99513b5a5b4e1ee2c26d16afa127b7a5da730ee3
2017-12-21 20:08:19 +05:30
Fabian Jucker
3b82f62084 correct help message for with-max-connections, with-max-documents
Change-Id: Ib7244a6ee55284b36d874a101505e2fe04377c9c
Reviewed-on: https://gerrit.libreoffice.org/43121
Reviewed-by: Fabian Jucker <jucker@gyselroth.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2017-11-20 10:14:45 +01:00
Tor Lillqvist
396c1488b4 Avoid test: : integer expression expected
Change-Id: I87f087a29ab4dc5cf94b0eee2a115b77c8283552
2017-10-26 16:56:25 +03:00
Jan Holesovsky
92aca7f2dd Compile the support key in (when configured to use one).
Change-Id: Iffff0b95b245b91d9732a774a6026a3cec2b2222
Reviewed-on: https://gerrit.libreoffice.org/43185
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2017-10-06 11:39:29 +02:00
Jan Holesovsky
783e3552c0 Support key logic in loolws + improvements in loolconfig.
To be able to set the support key directly from the command line, and to show
the option, etc.

Change-Id: Iac93bc47a6f4b9d5a5ad0ac8b06bda978e01b760
Reviewed-on: https://gerrit.libreoffice.org/43098
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-10-06 11:37:18 +02:00
Michael Meeks
79053911fc Support key logic and verification.
Change-Id: Ie55150b99df3e80239236571af185502196ad3e9
Reviewed-on: https://gerrit.libreoffice.org/43097
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 56385cb8ac2a57af4eb70bc8bc7313a9299533c3)
Reviewed-on: https://gerrit.libreoffice.org/43099
2017-10-03 21:52:45 +02:00
Aron Budea
7455705517 Add dlopen check again to fix build
That unneeded dlopen check isn't unneeded.
Regression from 4be7a6cb16

Change-Id: I8fc451d16c3fa95696995d884743af675d42804d
Reviewed-on: https://gerrit.libreoffice.org/41077
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
2017-08-12 07:10:51 +02:00
Jan Holesovsky
4be7a6cb16 We don't need that new autoconf.
Also check for C++11 support, and remove an unneeded dlopen check (we check for
dlopen earlier in the configure.ac).

Change-Id: I76c25a25d22987ad6a1de309c3edd6ef2ea2b64d
Reviewed-on: https://gerrit.libreoffice.org/40952
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-08-10 10:37:57 +02:00
Andras Timar
945d74c237 wsd: fix compilation with old OpenSSL that does not have PKCS5_PBKDF2_HMAC()
Change-Id: If48641f6cbcc4d4ded78ea5cc9c9f66063a2ac0a
Reviewed-on: https://gerrit.libreoffice.org/39779
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-07-31 19:40:37 +02:00
Andras Timar
ad8bffa04a configure option to disable SECCOMP
Change-Id: I8120674b60d388a3f85190631469a112c4af9266
Reviewed-on: https://gerrit.libreoffice.org/39408
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-07-03 11:43:01 +02:00
Jan Holesovsky
21192c4306 Generate the l10n json files only when the appropriate po's change.
Change-Id: I17c0f022775ec631e6493ba81fa41752f6841188
2017-05-05 11:28:26 +02:00
Michael Meeks
7f4f752667 Initial seccomp work.
Add a list of unhelpful looking system calls to improve containment.

Change-Id: I2e4bf3e0a6a752d427299728663d17120586bb10
2017-04-28 14:26:21 +01:00
Jan Holesovsky
848145503b Distribute the git hash for easier identification.
Change-Id: I57084231d0878de15b4b0478122f49e94af563bf
2017-04-28 11:54:38 +02:00
Katarina Behrens
6416fe9d1b Check if npm is installed and detect buggy version
shrinkpack won't work with npm versions between <3.9.0, 3.10.3>,
for details, see https://github.com/JamieMason/shrinkpack/issues/45

Change-Id: I65e1413f2ba24cc81736c12924afb20ca50004be
Reviewed-on: https://gerrit.libreoffice.org/36640
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-04-19 16:19:58 +02:00
Katarina Behrens
8927eaf057 Strip trailing '/' from LO_PATH, if there's any
symlink() with path/with/trailing/slash/ and thus creating chroot
fails with ENOENT in totally opaque way

Change-Id: I5cd5213d8b6bfc50ea11cf8586b2a7b7f334631d
Reviewed-on: https://gerrit.libreoffice.org/36536
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-04-17 02:05:58 +02:00
Jan Holesovsky
37387518f4 Suppress assert()'s in the production builds.
Change-Id: I2074ed335b7201337e6519440ff6bed1809be915
2017-04-05 12:03:33 +02:00
Michael Meeks
a4ac00d854 Add zlib cflags and libs to configuration. 2017-03-30 12:09:12 +01:00
Andras Timar
11fc3a0d02 package debian/ files and make them generic
Change-Id: Ia060b7d83c659db0354a5a1438b12bebaee45e03
2017-03-20 23:29:16 +01:00
Andras Timar
2828fc1684 no need for maketarballfordeb.sh any more
Change-Id: I18dd9e8fbd28431d49c67d40db521e0fdb6d3f27
2017-03-20 23:29:16 +01:00
Andras Timar
2cf1f22439 Use LO_PATH instead of hardcoded path as config default
Change-Id: I0d6ce9e7938e2521e764978526fe2d9ce632c992
2017-03-20 23:29:14 +01:00
Samuel Mehrbrodt
1f2d04a5e4 Online, not on-line
Change-Id: I93a8322dceca7c1ed95449c6aeb4ae854b982957
Reviewed-on: https://gerrit.libreoffice.org/33886
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2017-02-03 13:47:30 +00:00
Ashod Nakashian
78fdcb903a wsd: correct configuring MAX_DOCUMENTS
Change-Id: I14ffd990cdfb0206d93de01f42fc99efda4e6e8f
Reviewed-on: https://gerrit.libreoffice.org/33671
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-01-30 02:05:35 +00:00
Andras Timar
f25f434be3 change version to 'master'
Change-Id: Ic842f811e86d3d910226fcd07ec44981917b8303
2017-01-09 21:17:25 +01:00
Pranav Kant
907b391f43 dist-hook and install-data-hook for loleaflet
Also tell automake to use tar-pax instead to allow bigger file
names (> 99).

Change-Id: I1d910a08684e780c958c7edc9852432705d51b18
2017-01-04 19:46:48 +05:30
Ashod Nakashian
3a79e13214 wsd: use MAX_CONNECTION from configure instead of hard-coded MAX_SESSIONS
Since we always need to set the thread-pool size
anyway, we cannot have 'unlimited' connections.

Actually, we never did, so that was misleading
in configure.ac anyway.

The current defaults are 20 connections and
10 documents, instead of the previous 1024
connections.
The reason for this "low" limit is to
enable unittesting these limits automatically
for the default configure.

There is also a lower-limit (needed by unittests
and internal technical requirements) of 3 connections
and 2 documents.

Change-Id: I6ccf3a607c50bb2a86bf1c0a16ebb6326ee34c7d
Reviewed-on: https://gerrit.libreoffice.org/32712
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-01-04 04:29:18 +00:00
Noel Grandin
4ed820d3d5 add a configure option for using clang compiler plugins
and apply the nullptr plugin.

Lots of hacking in my LO tree required to make this work, will probably
end up needing to add an extra parameter to the LO side.

Change-Id: I02ae1dcdece9d9ddf05f7757f6696e3a5d7d1f14
Reviewed-on: https://gerrit.libreoffice.org/32339
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2016-12-22 14:23:42 +00:00
Pranav Kant
39dd5018e2 browser console logging depending on loleaflet_logging prop.
loleaflet_logging defaults to true with compiled with
--enable-debug otherwise false.

Browser will print additional debug info when this property is
set to true.

Change-Id: Id9fabf134bd8d19fa1a09ca8c0987df46d4f1a4c
2016-12-15 16:52:07 +05:30
Andras Timar
9ee4062935 Bump version to 2.0.1+
Change-Id: I1a670d3b9a3a5d3711f1a83b2a8978e032ded774
2016-12-14 11:34:11 +01:00
Pranav Kant
b3db321e85 Unify loleaflet's make with top level make
Top level make would now build loleaflet too if necessary.

Respect value of ENABLE_DEBUG and if present add debug-info to
generated js bundles too.

Add new rule, clean-local in loleaflet.

Change-Id: I3a9b727824f2877fc72719a8bfdeebed5448cb7d
2016-12-12 17:56:58 +05:30
Andras Timar
740a28bfae Bump version to 2.0.0+ 2016-11-28 19:13:59 +01:00
Andras Timar
7a5fbd7f3c Bump version to 2.0.0 2016-11-28 19:10:27 +01:00
Michael Meeks
c1a398977f Adapt makefiles, includes etc. to new locations. 2016-11-25 09:58:57 +00:00
Michael Meeks
cca657c8f2 Apply the pre-branch rename script to re-organize the source. 2016-11-25 09:58:48 +00:00
Renamed from loolwsd/configure.ac (Browse further)