strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
libreoffice-online/loolwsd/Makefile.am

56 lines
2.2 KiB
Text
Raw Normal View History

loolwsd: cppunit skeleton
2015-10-21 05:01:47 -05:00
SUBDIRS = test
loolwsd: merged loolmap Change-Id: I43845ce5f45c01a67db32ab136ad96b70bc31217 Reviewed-on: https://gerrit.libreoffice.org/20908 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 08:55:56 -06:00
bin_PROGRAMS = loolwsd loolbroker loolkit loolmap
Autofooize
2015-03-09 04:11:15 -05:00
package and deploy discovery.xml
2016-03-17 09:24:09 -05:00
dist_bin_SCRIPTS = loolwsd-systemplate-setup discovery.xml
Rename the systemplate setup script to better name and install it It was a bit misleading to have "chroot" in the name of the script as it isn't a chroot jail as such that the script is setting up, but a *template* that will be copied (hardlinked) into each chroot jail. The script should be installed, so that a loolwsd package can include it. We don't want to loolwsd use to depend on having the sources available, obviously.
2015-05-19 05:20:16 -05:00
loolwsd: We want to build and link with -pthread.
2015-12-17 11:49:34 -06:00
AM_CPPFLAGS = -pthread
AM_LDFLAGS = -pthread
loolwsd: LOOLBroker process added Change-Id: Ia7332761766026599b8ef415652874371938d311 Reviewed-on: https://gerrit.libreoffice.org/20903 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-19 16:20:04 -06:00
shared_sources = LOOLProtocol.cpp LOOLSession.cpp MessageQueue.cpp Util.cpp
loolwsd: LOOLKit process added Change-Id: I91e8a131b4959a78e43b29faede477d39150c97c Reviewed-on: https://gerrit.libreoffice.org/20902 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-19 14:55:19 -06:00
loolwsd: Move Admin class to separate header As a test, add command to fetch documents from AdminModel. Change-Id: I3cb7097ba7dde049f3b2478fe7b6b6c309da1d92 Reviewed-on: https://gerrit.libreoffice.org/22781 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-02-26 00:25:13 -06:00
loolwsd_SOURCES = LOOLWSD.cpp ChildProcessSession.cpp MasterProcessSession.cpp TileCache.cpp Admin.cpp $(shared_sources)
Use separate child processes for LibreOfficeKit For now, each LOOL client has a separate child process (or none at all, if it has accessed only information found in the cache). This will obviously have to chnage to handle collaboration. Etc. The parent process talks the same Websocket protocol with the child processes. When there is a child process for a client, traffic from the client is forwarded as such to the child process and vice versa.
2015-03-17 18:56:15 -05:00
Add a new minimal non-GUI LOKit test program For easier debugging of the LO code invoked through LibreOfficeKit, with is no GUI stuff complicating debugging.
2015-03-28 06:22:32 -05:00
noinst_PROGRAMS = loadtest connect lokitclient
Start on load testing Add a new program, loadtest, that runs a requested number of client sessions in parallel to a loolwsd server. A client session loads one of a list of test documents, and does some operations on it. Move the getTokenInteger() and getTokenString() functions out from LOOLSession into a new namespace LOOLProtocol, as they are neeeded also in the loadtest program. Add, also in LOOLProtocol, functions to parse some of the messages from the server. (In general that is done in client JavaScript code, of course; only for testing purposes needed in C++ code.)
2015-03-26 09:49:07 -05:00
loadtest_SOURCES = LoadTest.cpp Util.cpp LOOLProtocol.cpp
Intermediate commit of start on transporting sockets to child process Will be needed if we want loolwsd to run on Windows. Then we will have one process receiving the connections from WebSocket clients and sending the accepted connection sockets to child processes thatr might be already running, either because they have been "pre-forked", or because of a collaboration scenario where new clients join a session working on a document. But initially we will write this as if for Unix only, so development of this migratory socket stuff is paused for now. (And it isn't even clear whether the API design so far is a good idea and elegantly implementable.)
2015-03-16 05:25:47 -05:00
Now the chroot etc re-work is getting closer to working Works now for the trivial 'connect' test program. Still need to add pre-spawning of a new child process as soon as an existing one from the pool has been taking into use. And need to test with the actual JS client.
2015-04-14 09:50:38 -05:00
connect_SOURCES = Connect.cpp Util.cpp LOOLProtocol.cpp
Add trivial test program for sending commands to the LOOL server
2015-03-27 09:23:20 -05:00
Add a new minimal non-GUI LOKit test program For easier debugging of the LO code invoked through LibreOfficeKit, with is no GUI stuff complicating debugging.
2015-03-28 06:22:32 -05:00
lokitclient_SOURCES = LOKitClient.cpp Util.cpp
loolwsd: LOOLBroker process added Change-Id: Ia7332761766026599b8ef415652874371938d311 Reviewed-on: https://gerrit.libreoffice.org/20903 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-19 16:20:04 -06:00
broker_shared_sources = ChildProcessSession.cpp $(shared_sources)
loolwsd: LOOLKit process added Change-Id: I91e8a131b4959a78e43b29faede477d39150c97c Reviewed-on: https://gerrit.libreoffice.org/20902 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-19 14:55:19 -06:00
loolkit_SOURCES = LOOLKit.cpp $(broker_shared_sources)
loolwsd: LOOLBroker process added Change-Id: Ia7332761766026599b8ef415652874371938d311 Reviewed-on: https://gerrit.libreoffice.org/20903 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-19 16:20:04 -06:00
loolbroker_SOURCES = LOOLBroker.cpp $(broker_shared_sources)
loolwsd: merged loolmap Change-Id: I43845ce5f45c01a67db32ab136ad96b70bc31217 Reviewed-on: https://gerrit.libreoffice.org/20908 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-23 08:55:56 -06:00
loolmap_SOURCES = loolmap.c
loolwsd: moved config values into common header Change-Id: Ib88379e453f207a6a5e6223045a393c769082be4 Reviewed-on: https://gerrit.libreoffice.org/20978 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-27 16:23:43 -06:00
noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp LOOLSession.hpp MasterProcessSession.hpp ChildProcessSession.hpp \
loolwsd: dropCapability moved to Capabilities.hpp Change-Id: Id84d485b446040df1d5398341af2b0e8f300ed63 Reviewed-on: https://gerrit.libreoffice.org/21060 Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2015-12-29 19:34:53 -06:00
LOOLWSD.hpp LoadTest.hpp MessageQueue.hpp TileCache.hpp Util.hpp Png.hpp Common.hpp Capabilities.hpp \
loolwsd: add DocumentBroker.hpp to dist
2016-03-15 07:24:51 -05:00
Rectangle.hpp QueueHandler.hpp Admin.hpp Auth.hpp Storage.hpp AdminModel.hpp DocumentBroker.hpp \
Don't use TABs for variable assignment lines
2015-06-09 11:29:17 -05:00
bundled/include/LibreOfficeKit/LibreOfficeKit.h bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
bundled/include/LibreOfficeKit/LibreOfficeKitInit.h bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
Include also headers in the tarball
2015-05-15 05:37:48 -05:00
package and deploy discovery.xml
2016-03-17 09:24:09 -05:00
EXTRA_DIST = loolwsd.service sysconfig.loolwsd discovery.xml
Include loolwsd.service and sysconfig.loolwsd in the tarball (Instead of having them as separate SOURCEn in the loolwsd.spec.) Both are related to systemd. The latter probably is relevant only for openSUSE. (And I actually couldn't get what I tried doing in it to work, see 739edf9dcf464f407dfe663fb2f497b866e73333.) (cherry picked from commit f8b29d666d52a3f18b0125aaed309fa3e4d719fb)
2015-06-09 14:33:46 -05:00
Use separate child processes for LibreOfficeKit For now, each LOOL client has a separate child process (or none at all, if it has accessed only information found in the cache). This will obviously have to chnage to handle collaboration. Etc. The parent process talks the same Websocket protocol with the child processes. When there is a child process for a client, traffic from the client is forwarded as such to the child process and vice versa.
2015-03-17 18:56:15 -05:00
clean-cache:
# Intentionally don't use "*" below... Avoid risk of accidentally running rm -rf /*
Do remove also the first level of subdirectories
2015-03-27 07:52:30 -05:00
test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f]
Work in progress: "pre-forking", chroot, etc. Non-working state Lots of changes to the server code, LOOLWSD and LOOLSession mainly. This is an intermediate commit.
2015-04-08 09:22:42 -05:00
Don't call setcap on loolkit before we have built it On the other hand, loolwsd does not need capabilities any more. Also update the comment to match reality, and explain in more detail what is going on.
2016-03-07 05:08:02 -06:00
# After building loolbroker and loolkit, set their capabilities as
# required. Do it already after a plain 'make' to allow for testing
# without installing. When building for packaging, no need for this,
# as the capabilities won't survive packaging anyway. Instead, handle
# it when installing the RPM or Debian package.
all-local: loolbroker loolkit
Don't use sudo to run setcap when building from rpmbuild Not a good idea to run an interactive command during a non-interactive make. We do the setcap in the %post step in the spec file anyway.
2015-05-29 01:56:32 -05:00
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
Don't pretend to support non-Linux here either
2016-03-01 10:30:07 -06:00
sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolbroker; \
sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
We have setcap only on Linux Use setuid root otherwise. (But note that the portablity to other Unixes is a work in progress, and for instance it is known that this doesn't work on OS X yet.)
2015-05-04 12:55:35 -05:00
fi
loolwsd: implement a 'make tags'
2015-09-29 04:15:02 -05:00
tags:
loolwsd: don't try to exclude jails from tags Don't pretend that we know where jails will be, the may be elsewhere. If indexing jails/systemplate is problem, configure them outside the build tree instead.
2015-10-20 07:17:58 -05:00
ctags --c++-kinds=+p --fields=+iaS --extra=+q -R --totals=yes *
Reference in a new issue Copy permalink