[Libreoffice-commits] online.git: configure.ac
configure.ac |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e9e6d981e3727eec013e259fc9170eaf69f94614
Author: Andras Timar
AuthorDate: Mon Sep 21 13:04:22 2020 +0200
Commit: Andras Timar
CommitDate: Mon Sep 21 16:27:31 2020 +0200
nodejs >= 10.0.0 is required to build loleaflet
Change-Id: I4541044e090e85514004b941b6e57986479095cd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103095
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/configure.ac b/configure.ac
index cdfd3aa65..6fe6e7967 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1044,8 +1044,8 @@ AS_IF([test `uname -s` = "Linux"],
AC_MSG_ERROR([node required to build loleaflet, but not installed])
else
NODE_VER=`node --version | sed 's/^v//' | awk -F. '{ print (($1 *
100) + $2) * 100 + $3;}'`
- if test "$NODE_VER" -lt 6; then
- AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0])
+ if test "$NODE_VER" -lt 10; then
+ AC_MSG_ERROR([This node version is old, upgrade to >= 10.0.0])
fi
fi
if test "$enable_cypress" = "yes"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/config.h.in
configure.ac|4
ios/config.h.in |3 ---
2 files changed, 7 deletions(-)
New commits:
commit f0350a6fa18d560381431b8ca3393a3373313d65
Author: Tor Lillqvist
AuthorDate: Thu Jul 23 15:45:32 2020 +0300
Commit: Tor Lillqvist
CommitDate: Thu Jul 23 16:42:36 2020 +0200
We don't check ENABLE_SETCAP in any source so no need to AC_DEFINE it
AC_DEFINE causes it to be in config.h, but there is no code that would
use its definition from there.
It is enough to have AM_CONDITIONAL for it (to enable having 'if
ENABLE_SETCAP' in Makefile.am files) and AC_SUBST it (to enable having
'@ENABLE_SETCAP@' in Makefile.am and *.in files).
Change-Id: Ia00b624114c8139d81bb173c92800ae0a62fec35
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99287
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index c678540db..dfc3da14c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1070,10 +1070,6 @@ AC_SUBST(LOOLWSD_CONFIGDIR)
LOOLWSD_DATADIR=${datadir}/${PACKAGE}
AC_SUBST(LOOLWSD_DATADIR)
-AS_IF([test "$enable_setcap" != "no"],
- [AC_DEFINE([ENABLE_SETCAP],1,[Whether to enable setting of
capabilities])],
- [AC_DEFINE([ENABLE_SETCAP],0,[Whether to enable setting of
capabilities])])
-
AM_CONDITIONAL([ENABLE_SETCAP], [test "$enable_setcap" != "no"])
ENABLE_SETCAP=
diff --git a/ios/config.h.in b/ios/config.h.in
index 3224d2090..9cc7565eb 100644
--- a/ios/config.h.in
+++ b/ios/config.h.in
@@ -13,9 +13,6 @@
security pieces */
#define ENABLE_DEBUG 0
-/* Whether to enable setting of capabilities */
-#define ENABLE_SETCAP 0
-
/* Whether to enable SSL */
#define ENABLE_SSL 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit c45d8197a6fbaee4aa7de19d336916a451e74b6c Author: Jan-Marek Glogowski AuthorDate: Sat Jul 11 02:57:25 2020 +0200 Commit: Michael Meeks CommitDate: Sat Jul 11 11:59:14 2020 +0200 Report better SSL state for mobile apps I tried to enable SSL, because I didn't want to be insecure, as stated by the message "insecure: ssl disabled". But for mobile apps the whole communication is actually local and SSL no any support option, so this is hopefully a better message. Change-Id: I35c50772ed49910997b80e6f449483da21775120 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98552 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks diff --git a/configure.ac b/configure.ac index 7d2f0a4f0..c678540db 100644 --- a/configure.ac +++ b/configure.ac @@ -915,7 +915,7 @@ mobile_app= ENABLE_MOBILEAPP= MOBILEAPP=0 AC_MSG_CHECKING([Is this a mobile app]) -if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes" -o "$enable_androidapp"; then +if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes" -o "$enable_androidapp" = "yes"; then AC_MSG_RESULT([Yes]) mobile_app=true; MOBILEAPP=1 @@ -933,7 +933,11 @@ if test "$enable_ssl" != "no" -a "$mobile_app" != "true"; then ENABLE_SSL=true AC_DEFINE([ENABLE_SSL],1,[Whether to enable SSL]) else - ssl_msg="insecure: ssl disabled" + if test "$mobile_app" != "true"; then + ssl_msg="insecure: ssl disabled" + else + ssl_msg="invalid for mobile apps (disabled)" + fi ENABLE_SSL=false AC_DEFINE([ENABLE_SSL],0,[Whether to enable SSL]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/admin loleaflet/html loleaflet/src
configure.ac |2 +-
loleaflet/admin/admin.strings.js |2 +-
loleaflet/html/loleaflet.html.m4 |1 +
loleaflet/src/control/Toolbar.js |7 +--
loleaflet/src/core/Socket.js |4 ++--
loleaflet/src/layer/marker/ProgressOverlay.js |2 +-
loleaflet/src/map/Clipboard.js|2 +-
7 files changed, 12 insertions(+), 8 deletions(-)
New commits:
commit bab4380e6db2fcce5c8da8279a2cfdcdb4597fde
Author: Andras Timar
AuthorDate: Fri Jul 3 12:53:55 2020 +0200
Commit: Andras Timar
CommitDate: Sun Jul 5 13:29:38 2020 +0200
default product name: LibreOffice Online Personal
Can be changed:
* configure --with-app-name
* brandProductName in loleaflet/dist/branding.js
When there is no brandProductName defined, this message will
appear in About box:
"The Personal edition is supported by volunteers and
intended for individual use."
Change-Id: Iec5aa2df7e734bdbc1dd8037656334f0016a7a82
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97837
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/configure.ac b/configure.ac
index 2fd403c52..7d2f0a4f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -595,7 +595,7 @@ AC_SUBST(ENABLE_ANDROIDAPP)
AM_CONDITIONAL([ENABLE_ANDROIDAPP], [test "$ENABLE_ANDROIDAPP" = "true"])
AC_SUBST(ANDROID_PACKAGE_NAME)
-APP_NAME="LibreOffice Online"
+APP_NAME="LibreOffice Online Personal"
if test -n "$with_app_name"; then
APP_NAME="$with_app_name"
fi
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index 492245421..2490a82ae 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -2,7 +2,7 @@
/* Stringtable for Admin Console User Interface */
var l10nstrings = {};
-l10nstrings.strProductName = 'LibreOffice Online';
+l10nstrings.strProductName = 'LibreOffice Online Personal';
l10nstrings.strAdminConsole = _('Admin console');
l10nstrings.strSettings = _('Settings');
l10nstrings.strOverview = _('Overview');
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index a596ca476..79c4ce2e7 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -225,6 +225,7 @@ m4_ifelse(MOBILEAPP,[true],
m4_ifelse(MOBILEAPP,[],[])
+
Copyright © _YEAR_, VENDOR.
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 354175074..640fe00dc 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -225,7 +225,7 @@ L.Map.include({
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
} else {
- productName = (typeof brandProductName !==
'undefined') ? brandProductName : 'LibreOffice Online';
+ productName = (typeof brandProductName !==
'undefined') ? brandProductName : 'LibreOffice Online Personal';
}
vex.open({
unsafeContent: data,
@@ -489,7 +489,7 @@ L.Map.include({
if (window.ThisIsAMobileApp) {
productName = window.MobileAppName;
} else {
- productName = (typeof brandProductName !== 'undefined')
? brandProductName : 'LibreOffice Online';
+ productName = (typeof brandProductName !== 'undefined')
? brandProductName : 'LibreOffice Online Personal';
}
var productURL = (typeof brandProductURL !== 'undefined') ?
brandProductURL : 'https://libreoffice.org';
content.find('#product-name').text(productName);
@@ -505,6 +505,9 @@ L.Map.include({
if (window.socketProxy)
content.find('#slow-proxy').text(_('"Slow Proxy"'));
+ if (typeof brandProductName === 'undefined')
+ content.find('#personal').text(_('The Personal edition
is supported by volunteers and intended for individual use.'));
+
var w;
var iw = window.innerWidth;
if (iw < 768) {
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index c3798a774..35c7ceb15 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -58,7 +58,7 @@ L.Socket = L.Class.extend({
if (isIE11)
msgHint = _('IE11 has reached its
maximum number of connections. Please see this document to increase this limit
if needed:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections');
-
[Libreoffice-commits] online.git: configure.ac
configure.ac | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit 8da992df355cab1732d08419f6bf4585ff005120 Author: Jan Holesovsky AuthorDate: Thu Jul 2 09:28:31 2020 +0200 Commit: Jan Holesovsky CommitDate: Thu Jul 2 12:04:44 2020 +0200 android: Default to building just the simple case: armeabi-v7a... ... unless more builddirs are provided in --with-lo-builddir, separated by colons. Change-Id: I49946cd932ec22804ecb51aba86f3dae2aba05f5 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97672 Tested-by: Jenkins Reviewed-by: Jan Holesovsky diff --git a/configure.ac b/configure.ac index ff78941ef..2fd403c52 100644 --- a/configure.ac +++ b/configure.ac @@ -368,7 +368,7 @@ fi # to the Mac. # Android: We need these to setup the CMakeLists.txt properly. LOBUILDDIR= -ANDROID_ABI= +ANDROID_ABI="armeabi-v7a" LOBUILDDIR_ARM64_V8A= LOBUILDDIR_X86= LOBUILDDIR_X86_64= @@ -385,10 +385,12 @@ CORE_VERSION_HASH="" if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_androidapp" = "yes" \); then if test "$enable_androidapp" = "yes" ; then AC_MSG_CHECKING([for Android ABI to build for]) - if test -z "$with_android_abi" ; then - ANDROID_ABI="armeabi-v7a arm64-v8a x86 x86_64" - else + if test -n "$with_android_abi" ; then ANDROID_ABI=`echo $with_android_abi | sed 's/:/ /g'` + else + if echo "$with_lo_builddir" | grep -qs ':' ; then +ANDROID_ABI="armeabi-v7a arm64-v8a x86 x86_64" + fi fi AC_MSG_RESULT([$ANDROID_ABI]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac Makefile.am test/Makefile.am test/run_unit.sh.in wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp
Makefile.am | 11 -
configure.ac|2
test/Makefile.am| 109 +++-
test/run_unit.sh.in |2
wsd/LOOLWSD.cpp | 16 +++
wsd/LOOLWSD.hpp |1
6 files changed, 76 insertions(+), 65 deletions(-)
New commits:
commit 9a427524d11908e2b8c475e7c6328563f300f076
Author: Ashod Nakashian
AuthorDate: Sun Jun 28 11:30:22 2020 -0400
Commit: Ashod Nakashian
CommitDate: Wed Jul 1 06:14:39 2020 +0200
wsd: support --cleanup in loolwsd
Leaving behind jails with bind-mount
entries makes build-workspace removal
complicated, and jenkins builds start failing.
The cleanup stage is integrated in Makefiles
and should be transparent.
In the event that manual cleanup is necessary,
'loolwsd --cleanup' can be invoked.
Change-Id: Ia4b99b0c66e56dfa2d50e79b0ba98f714cf32886
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97470
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/Makefile.am b/Makefile.am
index d3f18e6a3..0eba81cf5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -321,6 +321,8 @@ EXTRA_DIST = discovery.xml \
scripts/unocommands.py \
$(man_MANS)
+CLEANUP_COMMAND=if test -s ./loolwsd; then echo "Cleaning up..." && ./loolwsd
--cleanup --o:logging.level=trace; fi
+
if HAVE_LO_PATH
SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -328,13 +330,16 @@ CAPABILITIES = $(if @ENABLE_SETCAP@,true,false)
RUN_GDB = $(if $(GDB_FRONTEND),$(GDB_FRONTEND),gdb --tui --args)
$(SYSTEM_STAMP) : ${top_srcdir}/loolwsd-systemplate-setup
+ if test -s ./loolwsd; then ./loolwsd --cleanup; fi
if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@";
fi
${top_srcdir}/loolwsd-systemplate-setup "@SYSTEMPLATE_PATH@"
"@LO_PATH@" && touch $@
@JAILS_PATH@ :
mkdir -p $@
+ $(CLEANUP_COMMAND)
clean-local:
+ $(CLEANUP_COMMAND)
if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@"; fi
if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@";
fi
rm -f $(abs_srcdir)/compile_commands.json
@@ -457,8 +462,9 @@ endif
# 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.
+.PHONY: caps_bins
-all-local: loolforkit loolmount @JAILS_PATH@ $(SYSTEM_STAMP)
+caps_bins: loolforkit loolmount
if ENABLE_SETCAP
sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit
sudo @SETCAP@ cap_sys_admin=ep loolmount
@@ -466,6 +472,9 @@ else
echo "Skipping capability setting"
endif
+all-local: loolwsd caps_bins @JAILS_PATH@ $(SYSTEM_STAMP)
+ $(CLEANUP_COMMAND)
+
# just run the build without any tests
build-nocheck: all-am
diff --git a/configure.ac b/configure.ac
index 740dc2e3c..7a8177e91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1140,7 +1140,7 @@ if test "$enable_androidapp" = "yes"; then
$srcdir/android/lib/src/main/cpp/CMakeLists.txt:android/lib/src/main/cpp/CMakeLists.txt.in])
fi
-AC_CONFIG_FILES([test/run_unit.sh:test/run_unit.sh.in],[chmod +x
test/run_unit.sh])
+AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
AC_OUTPUT
diff --git a/test/Makefile.am b/test/Makefile.am
index 275a214c2..ad48899a1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -189,8 +189,11 @@ else
SYSTEM_STAMP =
endif
+CLEANUP_COMMAND=if test -s ../loolwsd; then echo "Cleaning up..." &&
../loolwsd --cleanup --o:logging.level=trace; fi
+
if HAVE_LO_PATH
check-local:
+ $(CLEANUP_COMMAND)
./fakesockettest
@fc-cache "@LO_PATH@"/share/fonts/truetype
@@ -228,71 +231,57 @@ TESTS = \
# Start forced grouping of tests using stamp files
-# unit-base.log
-unit-tiletest.log : unit-base.log
-unit-integration.log : unit-base.log
-unit-httpws.log : unit-base.log
-unit-crash.log : unit-base.log
-
-group1.log: unit-httpws.log unit-crash.log unit-tiletest.log
unit-integration.log
- touch $@
-
-unit-typing.log : group1.log
-unit-convert.log: group1.log
-unit-tilecache.log : group1.log
-unit-timeout.log: group1.log
-
-group1a.log: unit-typing.log unit-convert.log unit-tilecache.log
unit-timeout.log
- touch $@
-
# isolate this one - it's not a happy test.
-unit-copy-paste.log : group1a.log
-
-group2.log: unit-copy-paste.log
- touch $@
-
-unit-prefork.log : group2.log
-unit-oauth.log : group2.log
-unit-wopi.log : group2.log
-unit-wopi-saveas.log : group2.log
-unit-wopi-ownertermination.log : group2.log
-unit-wopi-versionrestore.log : group2.log
-unit-wopi-documentconflict.log : group2.log
-unit_wopi_renamefile.log : group2.log
-unit_wopi_watermark.log : group2.log
-
-group3.log: unit-oauth.log unit-wopi.log unit-wopi-saveas.log
unit-wopi-ownertermination.log uni
[Libreoffice-commits] online.git: configure.ac loleaflet/html loleaflet/src loolwsd.xml.in wsd/FileServer.cpp wsd/LOOLWSD.cpp
configure.ac |4
loleaflet/html/loleaflet.html.m4 |1 +
loleaflet/src/control/Control.UIManager.js |9 ++---
loolwsd.xml.in |4
wsd/FileServer.cpp |3 +++
wsd/LOOLWSD.cpp|3 ++-
6 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 3141bf777508852bf9b23f1707c7b2f62715dc15
Author: Szymon Kłos
AuthorDate: Tue Apr 21 13:20:41 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jun 30 08:16:25 2020 +0200
notebookbar: Introduce switch in loolwsd.xml
Change-Id: I94546a899fde1cecc2c35dc527e41e8a36061750
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93050
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/configure.ac b/configure.ac
index ace92e589..7a8177e91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,6 +659,10 @@ AS_IF([test "$enable_welcome_message_button" = "yes"],
AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE_BUTTON],["$ENABLE_WELCOME_MESSAGE_BUTTON"],[Should
the Release notes message on startup should have a dismiss button instead of
an x button to close by default?])
AC_SUBST(ENABLE_WELCOME_MESSAGE_BUTTON)
+USER_INTERFACE_MODE='classic'
+AC_DEFINE_UNQUOTED([USER_INTERFACE_MODE],["$USER_INTERFACE_MODE"],[Which user
interface mode should be activated])
+AC_SUBST(USER_INTERFACE_MODE)
+
VEREIGN_URL=
if test "$enable_vereign" = "yes"; then
VEREIGN_URL="https://app.vereign.com";
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index f84271e62..a596ca476 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -255,6 +255,7 @@ m4_ifelse(MOBILEAPP,[true],
window.loleafletLogging = '%LOLEAFLET_LOGGING%';
window.enableWelcomeMessage = %ENABLE_WELCOME_MSG%;
window.enableWelcomeMessageButton = %ENABLE_WELCOME_MSG_BTN%;
+ window.userInterfaceMode = '%USER_INTERFACE_MODE%';
window.outOfFocusTimeoutSecs = %OUT_OF_FOCUS_TIMEOUT_SECS%;
window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;
window.reuseCookies = '%REUSE_COOKIES%';
diff --git a/loleaflet/src/control/Control.UIManager.js
b/loleaflet/src/control/Control.UIManager.js
index 5cb657a25..e8ae9ea4a 100644
--- a/loleaflet/src/control/Control.UIManager.js
+++ b/loleaflet/src/control/Control.UIManager.js
@@ -15,7 +15,9 @@ L.Control.UIManager = L.Control.extend({
// UI initialization
initializeBasicUI: function() {
- if (window.mode.isMobile() || !window.enableNotebookbar) {
+ var enableNotebookbar = window.userInterfaceMode ===
'notebookbar';
+
+ if (window.mode.isMobile() || !enableNotebookbar) {
var menubar = L.control.menubar();
this.map.menubar = menubar;
this.map.addControl(menubar);
@@ -24,7 +26,7 @@ L.Control.UIManager = L.Control.extend({
if (window.mode.isMobile()) {
$('#mobile-edit-button').show();
} else {
- if (!window.enableNotebookbar) {
+ if (!enableNotebookbar) {
this.map.addControl(L.control.topToolbar());
}
@@ -60,12 +62,13 @@ L.Control.UIManager = L.Control.extend({
initializeSpecializedUI: function(docType) {
var isDesktop = window.mode.isDesktop();
+ var enableNotebookbar = window.userInterfaceMode ===
'notebookbar';
if (window.mode.isMobile()) {
this.map.addControl(L.control.mobileBottomBar(docType));
this.map.addControl(L.control.mobileTopBar(docType));
this.map.addControl(L.control.searchBar());
- } else if (window.enableNotebookbar) {
+ } else if (enableNotebookbar) {
if (docType === 'spreadsheet') {
this.map.addControl(L.control.notebookbarCalc());
} else if (docType === 'presentation') {
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 951b96079..e6886b084 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -132,6 +132,10 @@
+
+ @USER_INTERFACE_MODE@
+
+
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 61280901f..3ee9e4142 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -768,6 +768,9 @@ void FileServerRequestHandler::preprocessFile(const
HTTPRequest& request,
enableWelcomeMessageButton = "true";
Poco::replaceInPlace(preprocess, std::string("%ENABLE_WELCOME_MSG_BTN%"),
enableWelcomeMessageButton);
+std::string userInterfaceMode = config.getString("user_interface.mode",
"classic");
+Poco::replaceInPlace(preprocess, std::string("%USER_INTERFA
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am loleaflet/npm-shrinkwrap.json loleaflet/npm-shrinkwrap.json.in
configure.ac | 26 +++---
loleaflet/Makefile.am |7 ++-
2 files changed, 9 insertions(+), 24 deletions(-)
New commits:
commit 8e1cf47112b5aa238deacb2975b1141dbaa4c782
Author: Henry Castro
AuthorDate: Thu May 28 08:17:16 2020 -0400
Commit: Henry Castro
CommitDate: Thu May 28 14:30:22 2020 +0200
loleaflet: remove install node_module in configure phase
Fair enough, let's not get in conflict with IOS platform,
It is restored and get another solution
Change-Id: I1cde236595479bdf41e29d8a30bb9d71aa196e54
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95036
Tested-by: Henry Castro
Reviewed-by: Henry Castro
diff --git a/configure.ac b/configure.ac
index 124bfe983..3b2edb7c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -992,31 +992,13 @@ fi
AC_SUBST(ENABLE_SETCAP)
-
-tryLinkFile () {
-if test ! -r "$1"; then
-AC_MSG_ERROR(["$1: file not found"])
-fi
-
-rm -f $2
-ln -s "$1" "$2" 2>/dev/null ||
-ln "$1" "$2" 2>/dev/null ||
-cp -p "$1" "$2" ||
-AC_MSG_ERROR(["cannot link or copy $1 to $2"])
-}
-
-if test "$srcdir" != '.'; then
-mkdir -p loleaflet
-tryLinkFile $srcdir/loleaflet/package.json loleaflet/package.json
-tryLinkFile $srcdir/loleaflet/archived-packages loleaflet/archived-packages
-cp -p $srcdir/loleaflet/npm-shrinkwrap.json loleaflet/npm-shrinkwrap.json
-fi
-
AC_CONFIG_LINKS([discovery.xml:discovery.xml])
AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu])
+AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json])
AC_CONFIG_LINKS([cypress_test/package.json:cypress_test/package.json])
AC_CONFIG_LINKS([cypress_test/cypress.json:cypress_test/cypress.json])
AC_LINK_FILES([cypress_test/plugins], [cypress_test/plugins])
+AC_LINK_FILES([loleaflet/archived-packages], [loleaflet/archived-packages])
AC_LINK_FILES([cypress_test/eslint_plugin], [cypress_test/eslint_plugin])
APP_BRANDING_DIR=
@@ -1087,6 +1069,7 @@ AC_CONFIG_FILES([Makefile
gtk/Makefile
test/Makefile
loleaflet/Makefile
+ loleaflet/npm-shrinkwrap.json
loolwsd.spec
loolwsd.xml
debian/loolwsd.postinst])
@@ -1106,9 +1089,6 @@ fi
AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
-AC_CONFIG_COMMANDS_PRE([AS_IF([test `uname -s` = "Linux"],
- [echo Installing node modules packages... && (cd
loleaflet && npm install)])])
-
AC_OUTPUT
AC_LANG_POP
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 8addfff8c..1959b1204 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,6 +1,5 @@
MAKEFLAGS = --no-builtin-rules
CTAGS = ctags
-CONFIG_STATUS_DEPENDENCIES=$(builddir)/node_modules
L10N_PO = $(wildcard $(srcdir)/po/*.po)
@@ -438,6 +437,12 @@ node_modules: package.json archived-packages
@npm install
@touch node_modules
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status node_modules
+ @case '$?' in \
+*node_modules*) \
+ touch Makefile;; \
+ esac;
+
$(DIST_FOLDER)/device-%.css: $(srcdir)/css/device-%.css
@mkdir -p $(dir $@)
@if test -z '$(ENABLE_BROWSERSYNC)'; then \
diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json.in
similarity index 100%
rename from loleaflet/npm-shrinkwrap.json
rename to loleaflet/npm-shrinkwrap.json.in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/README
configure.ac |3 ++- ios/README | 27 ++- 2 files changed, 4 insertions(+), 26 deletions(-) New commits: commit 48a5397ff414fbda982ecb60166b691676e4eadf Author: Tor Lillqvist AuthorDate: Tue May 26 09:41:09 2020 +0300 Commit: Tor Lillqvist CommitDate: Tue May 26 09:02:14 2020 +0200 Run the 'npm install' at configure time only on Linux I don't want to make it necessary to have npm on macOS (in the case of building the iOS app, otherwise Online is Linux-only). I still want to use the method where the JS bits are built on a Linux machine and loleaflet/dist is copied over to the Mac where you build the iOS app. Remove the apparently never seriously used instructions for the other way from ios/README. If somebody actually *uses* that way for real, for a longer time, then please reinstate them, and modify configure.ac, etc. Change-Id: I22a8ca4746907bb11aad11d7c995b0de2fdbc157 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94815 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index f634ff697..124bfe983 100644 --- a/configure.ac +++ b/configure.ac @@ -1106,7 +1106,8 @@ fi AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh]) -AC_CONFIG_COMMANDS_PRE([echo Installing node modules packages... && (cd loleaflet && npm install)]) +AC_CONFIG_COMMANDS_PRE([AS_IF([test `uname -s` = "Linux"], + [echo Installing node modules packages... && (cd loleaflet && npm install)])]) AC_OUTPUT diff --git a/ios/README b/ios/README index cc213758d..29c86cdbb 100644 --- a/ios/README +++ b/ios/README @@ -54,12 +54,7 @@ open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10 autogen.sh, configure, or make, or open the Mobile Xcode project there yet. We call this the app folder. -4) Here the instructions split. tml uses the first way, mmeeks tried -to use the second way. The paths will join again at step 4. - -EITHER: - -4a) On a Linux machine: Do a separate clone of the online repo, run +4) On a Linux machine: Do a separate clone of the online repo, run autogen.sh, and configure it with the --enable-iosapp option: ./configure --enable-iosapp --with-app-name="My Own Mobile LibreOffice" @@ -88,28 +83,10 @@ safest to install it somewhere that is not in your $PATH. Let's say in $PATH, is less risky.) Run the autogen.sh script in the app folder, with GNU libtool -available: +available, for instance: PATH=/opt/libtool/bin:$PATH ./autogen.sh -OR: - -4b) Install brew: https://brew.sh/ - - Then: - -brew install libtool npm -./autogen.sh -sudo python -m ensurepip --default-pip -sudo pip install polib lxml -make ; make - -Then run: - -./autogen.sh - -Now the instructions join again: - 5) In the app folder from step 2, edit the ios/Mobile.xcodeproj/project.pbxproj file in your favourite text editor. Change LOSRCDIR and all instances of "../ios-device" to refer ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am loleaflet/npm-shrinkwrap.json loleaflet/npm-shrinkwrap.json.in
configure.ac | 25 ++---
loleaflet/Makefile.am |8 +++-
2 files changed, 25 insertions(+), 8 deletions(-)
New commits:
commit 40dffc408c6680d844c9ff6b873946deea7f9168
Author: Henry Castro
AuthorDate: Tue Apr 28 17:25:49 2020 -0400
Commit: Henry Castro
CommitDate: Mon May 25 20:13:24 2020 +0200
loleaflet: install node modules in configure phase
It is not necessary to clean these files since
they do not change frequently
Change-Id: I092013c02ee6c45bccbf81369e583cffe806
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93111
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/configure.ac b/configure.ac
index 3b2edb7c1..f634ff697 100644
--- a/configure.ac
+++ b/configure.ac
@@ -992,13 +992,31 @@ fi
AC_SUBST(ENABLE_SETCAP)
+
+tryLinkFile () {
+if test ! -r "$1"; then
+AC_MSG_ERROR(["$1: file not found"])
+fi
+
+rm -f $2
+ln -s "$1" "$2" 2>/dev/null ||
+ln "$1" "$2" 2>/dev/null ||
+cp -p "$1" "$2" ||
+AC_MSG_ERROR(["cannot link or copy $1 to $2"])
+}
+
+if test "$srcdir" != '.'; then
+mkdir -p loleaflet
+tryLinkFile $srcdir/loleaflet/package.json loleaflet/package.json
+tryLinkFile $srcdir/loleaflet/archived-packages loleaflet/archived-packages
+cp -p $srcdir/loleaflet/npm-shrinkwrap.json loleaflet/npm-shrinkwrap.json
+fi
+
AC_CONFIG_LINKS([discovery.xml:discovery.xml])
AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu])
-AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json])
AC_CONFIG_LINKS([cypress_test/package.json:cypress_test/package.json])
AC_CONFIG_LINKS([cypress_test/cypress.json:cypress_test/cypress.json])
AC_LINK_FILES([cypress_test/plugins], [cypress_test/plugins])
-AC_LINK_FILES([loleaflet/archived-packages], [loleaflet/archived-packages])
AC_LINK_FILES([cypress_test/eslint_plugin], [cypress_test/eslint_plugin])
APP_BRANDING_DIR=
@@ -1069,7 +1087,6 @@ AC_CONFIG_FILES([Makefile
gtk/Makefile
test/Makefile
loleaflet/Makefile
- loleaflet/npm-shrinkwrap.json
loolwsd.spec
loolwsd.xml
debian/loolwsd.postinst])
@@ -1089,6 +1106,8 @@ fi
AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
+AC_CONFIG_COMMANDS_PRE([echo Installing node modules packages... && (cd
loleaflet && npm install)])
+
AC_OUTPUT
AC_LANG_POP
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 5d1ddf893..b23ab1a10 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,5 +1,6 @@
MAKEFLAGS = --no-builtin-rules
CTAGS = ctags
+CONFIG_STATUS_DEPENDENCIES=$(builddir)/node_modules
L10N_PO = $(wildcard $(srcdir)/po/*.po)
@@ -320,10 +321,8 @@ LOLEAFLET_PREFIX := $(if $(filter
true,$(ENABLE_DEBUG)),$(abs_builddir),$(abs_bu
EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///')
-all-local:
+all-local: build-loleaflet
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
- @$(MAKE) node_modules
- @$(MAKE) build-loleaflet
if !ENABLE_MOBILEAPP
ADMIN_BUNDLE = $(DIST_FOLDER)/admin-bundle.js
@@ -432,7 +431,7 @@ $(DIST_FOLDER)/loleaflet.html:
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HTML
-DVENDOR="$(VENDOR)" \
$(srcdir)/html/loleaflet.html.m4 > $@
-node_modules: npm-shrinkwrap.json
+node_modules: package.json archived-packages
@npm install
@touch node_modules
@@ -593,7 +592,6 @@ l10n: pot
# done
clean-local:
- rm -rf node_modules
@rm -rf $(DIST_FOLDER)
@rm -rf $(builddir)/build/dist
@rm -f $(abs_srcdir)/jsconfig.json
diff --git a/loleaflet/npm-shrinkwrap.json.in b/loleaflet/npm-shrinkwrap.json
similarity index 100%
rename from loleaflet/npm-shrinkwrap.json.in
rename to loleaflet/npm-shrinkwrap.json
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac cypress_test/Makefile.am
configure.ac |2 ++ cypress_test/Makefile.am |4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit e6f5917812ea078bb8a2e279057648175e631b70 Author: Henry Castro AuthorDate: Tue May 12 15:29:08 2020 -0400 Commit: Henry Castro CommitDate: Wed May 13 16:51:29 2020 +0200 cypress: fix error running single unit test builddir != srcdir Change-Id: I2521c3e11f05f0c91bf0e8f5667a5466493acac0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94080 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/configure.ac b/configure.ac index ae72b9d13..f3a13a3ab 100644 --- a/configure.ac +++ b/configure.ac @@ -999,6 +999,8 @@ AC_CONFIG_LINKS([cypress_test/package.json:cypress_test/package.json]) AC_CONFIG_LINKS([cypress_test/cypress.json:cypress_test/cypress.json]) AC_LINK_FILES([cypress_test/plugins], [cypress_test/plugins]) AC_LINK_FILES([loleaflet/archived-packages], [loleaflet/archived-packages]) +AC_LINK_FILES([cypress_test/eslint_plugin], [cypress_test/eslint_plugin]) +AC_LINK_FILES([cypress_test/support], [cypress_test/support]) APP_BRANDING_DIR= APP_IC_LAUNCHER="ic_launcher" diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 50b2ae4c3..158016d5f 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -1,5 +1,7 @@ if ENABLE_CYPRESS +export NODE_PATH=$(abs_builddir)/node_modules + abs_dir = $(if $(filter $(abs_builddir),$(abs_srcdir)),.,$(abs_srcdir)) CYPRESS_BINARY = $(abs_builddir)/node_modules/cypress/bin/cypress ESLINT_BINARY = $(abs_builddir)/node_modules/eslint/bin/eslint.js @@ -116,7 +118,7 @@ run-mobile: @JAILS_PATH@ $(NODE_BINS) define run_JS_error_check @echo "Checking for JS errors in test code..." @echo - @NODE_PATH=$(abs_dir)/node_modules $(NODE) $(ESLINT_BINARY) $(abs_srcdir) \ + @$(NODE) $(ESLINT_BINARY) $(abs_srcdir) \ --ignore-path $(abs_srcdir)/.eslintignore --config $(abs_srcdir)/.eslintrc @echo endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 53a27a1ec4543afdf098ca14caa1c67a1544bce6 Author: Henry Castro AuthorDate: Sun Apr 19 16:25:37 2020 -0400 Commit: Henry Castro CommitDate: Tue Apr 21 16:28:13 2020 +0200 android: set specific DEST:SOURCE config files The *.in files in android should be generated explicitly in source dir. With this setting it is enabled to configure builddir != srcdir Change-Id: I529f8021d4407b2f87ae265b93fb3d764bb1a1bf Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92595 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/configure.ac b/configure.ac index 939f407e8..013a2c492 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,10 +1081,10 @@ fi if test "$enable_androidapp" = "yes"; then AC_CONFIG_FILES([android/Makefile - android/build.gradle - android/app/appSettings.gradle - android/lib/libSettings.gradle - android/lib/src/main/cpp/CMakeLists.txt]) + $srcdir/android/build.gradle:android/build.gradle.in + $srcdir/android/app/appSettings.gradle:android/app/appSettings.gradle.in + $srcdir/android/lib/libSettings.gradle:android/lib/libSettings.gradle.in + $srcdir/android/lib/src/main/cpp/CMakeLists.txt:android/lib/src/main/cpp/CMakeLists.txt.in]) fi AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) New commits: commit bc4885b64ae6fbff17d870270c73a8d622276dd3 Author: Henry Castro AuthorDate: Mon Apr 13 19:47:14 2020 -0400 Commit: Henry Castro CommitDate: Mon Apr 20 23:58:50 2020 +0200 android: generate only the necessary config files Avoid generates files that are not needed to develop android Change-Id: Ica882e3faeaa800e03e8bf811c81c328a7dff6a3 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92138 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/configure.ac b/configure.ac index a7bd6a57c..b4bf69e97 100644 --- a/configure.ac +++ b/configure.ac @@ -1064,21 +1064,28 @@ AM_CONDITIONAL([ENABLE_CYPRESS], [$ENABLE_CYPRESS]) AC_SUBST(ENABLE_CYPRESS) AC_CONFIG_FILES([Makefile - android/app/appSettings.gradle - android/lib/libSettings.gradle - android/lib/src/main/cpp/CMakeLists.txt - android/Makefile cypress_test/Makefile gtk/Makefile - ios/config.h - ios/Mobile/Info.plist - ios/Mobile/Resources/Settings.bundle/Root.plist test/Makefile loleaflet/Makefile loleaflet/npm-shrinkwrap.json loolwsd.spec loolwsd.xml debian/loolwsd.postinst]) + +if test "$enable_iosapp" = "yes"; then +AC_CONFIG_FILES([ios/config.h + ios/Mobile/Info.plist + ios/Mobile/Resources/Settings.bundle/Root.plist]) +fi + +if test "$enable_androidapp" = "yes"; then +AC_CONFIG_FILES([android/Makefile + android/app/appSettings.gradle + android/lib/libSettings.gradle + android/lib/src/main/cpp/CMakeLists.txt]) +fi + AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh]) AC_OUTPUT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/config.h.in loleaflet/html loolwsd.xml.in wsd/FileServer.cpp wsd/LOOLWSD.cpp
configure.ac |8 +++-
ios/config.h.in |4
loleaflet/html/loleaflet.html.m4 |2 ++
loolwsd.xml.in |1 +
wsd/FileServer.cpp |5 +
wsd/LOOLWSD.cpp |1 +
6 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit f507302993b67e251a0d040c5d96770a6b8b6a98
Author: Muhammet Kara
AuthorDate: Mon Apr 20 21:02:57 2020 +0300
Commit: Muhammet Kara
CommitDate: Mon Apr 20 20:35:08 2020 +0200
Welcome: Add config for enabling the dismiss button
Change-Id: Ia2fbf066493d91a2b10866e66d11332b5cfc10fa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92593
Reviewed-by: Tor Lillqvist
Reviewed-by: Muhammet Kara
Tested-by: Jenkins CollaboraOffice
diff --git a/configure.ac b/configure.ac
index 725f13725..a7bd6a57c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -601,9 +601,15 @@ AC_SUBST(MAX_DOCUMENTS)
ENABLE_WELCOME_MESSAGE=false
AS_IF([test "$enable_welcome_message" = "yes"],
[ENABLE_WELCOME_MESSAGE="true"])
-AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE],["$ENABLE_WELCOME_MESSAGE"],[Should
the Release notes message on startup should be enabled be default?])
+AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE],["$ENABLE_WELCOME_MESSAGE"],[Should
the Release notes message on startup be enabled by default?])
AC_SUBST(ENABLE_WELCOME_MESSAGE)
+ENABLE_WELCOME_MESSAGE_BUTTON=false
+AS_IF([test "$enable_welcome_message_button" = "yes"],
+ [ENABLE_WELCOME_MESSAGE_BUTTON="true"])
+AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE_BUTTON],["$ENABLE_WELCOME_MESSAGE_BUTTON"],[Should
the Release notes message on startup should have a dismiss button instead of
an x button to close by default?])
+AC_SUBST(ENABLE_WELCOME_MESSAGE_BUTTON)
+
VEREIGN_URL=
if test "$enable_vereign" = "yes"; then
VEREIGN_URL="https://app.vereign.com";
diff --git a/ios/config.h.in b/ios/config.h.in
index f80b2ae5f..18ec2613d 100644
--- a/ios/config.h.in
+++ b/ios/config.h.in
@@ -23,6 +23,10 @@
*/
#define ENABLE_WELCOME_MESSAGE "false"
+/* Should the Release notes message on startup have a dismiss button instead
of an x button to close by default?
+ */
+#define ENABLE_WELCOME_MESSAGE_BUTTON "false"
+
/* Define to 1 if you have the header file. */
#define HAVE_DLFCN_H 0
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index c8d51f0f0..945449d9f 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -235,6 +235,7 @@ m4_ifelse(MOBILEAPP,[true],
window.accessHeader = '';
window.loleafletLogging = 'true';
window.enableWelcomeMessage = false;
+ window.enableWelcomeMessageButton = false;
window.outOfFocusTimeoutSecs = 100;
window.idleTimeoutSecs = 100;
window.reuseCookies = '';
@@ -248,6 +249,7 @@ m4_ifelse(MOBILEAPP,[true],
window.accessHeader = '%ACCESS_HEADER%';
window.loleafletLogging = '%LOLEAFLET_LOGGING%';
window.enableWelcomeMessage = %ENABLE_WELCOME_MSG%;
+ window.enableWelcomeMessageButton = %ENABLE_WELCOME_MSG_BTN%;
window.outOfFocusTimeoutSecs = %OUT_OF_FOCUS_TIMEOUT_SECS%;
window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;
window.reuseCookies = '%REUSE_COOKIES%';
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index d22ec7e98..087ea3bdc 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -116,6 +116,7 @@
@ENABLE_WELCOME_MESSAGE@
+ @ENABLE_WELCOME_MESSAGE_BUTTON@
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 5a973bc01..432a09b1c 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -741,6 +741,11 @@ void FileServerRequestHandler::preprocessFile(const
HTTPRequest& request, Poco::
enableWelcomeMessage = "true";
Poco::replaceInPlace(preprocess, std::string("%ENABLE_WELCOME_MSG%"),
enableWelcomeMessage);
+std::string enableWelcomeMessageButton = "false";
+if (config.getBool("welcome.enable_button", false))
+enableWelcomeMessageButton = "true";
+Poco::replaceInPlace(preprocess, std::string("%ENABLE_WELCOME_MSG_BTN%"),
enableWelcomeMessageButton);
+
// Capture cookies so we can optionally reuse them for the storage
requests.
{
NameValueCollection cookies;
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index d54788d49..379e960fe 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -942,6 +942,7 @@ void LOOLWSD::initialize(Application& self)
{ "trace.path[@snapshot]", "false" },
{ "trace[@enable]", "false" },
{ "welcome.enable", ENABLE_WELCOME_MESSAGE },
+{ "welcome.enable_button", ENABLE_WELCOME_MESSAGE_BUTTON },
{ "welcome.path", "loleaflet/welcome" }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/
[Libreoffice-commits] online.git: configure.ac wsd/LOOLWSD.cpp
configure.ac|1 +
wsd/LOOLWSD.cpp |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit cf1cd4dd1d25651978dfc6c278e8f9923bba171a
Author: Jan Holesovsky
AuthorDate: Thu Apr 16 11:28:32 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 16 12:43:37 2020 +0200
Welcome: Better default when the welcome.enabled is not present in config.
Change-Id: Ia528f1cdf16af9b9724c31f9b1df8b51efb664fb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92341
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/configure.ac b/configure.ac
index c29f10e08..725f13725 100644
--- a/configure.ac
+++ b/configure.ac
@@ -601,6 +601,7 @@ AC_SUBST(MAX_DOCUMENTS)
ENABLE_WELCOME_MESSAGE=false
AS_IF([test "$enable_welcome_message" = "yes"],
[ENABLE_WELCOME_MESSAGE="true"])
+AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE],["$ENABLE_WELCOME_MESSAGE"],[Should
the Release notes message on startup should be enabled be default?])
AC_SUBST(ENABLE_WELCOME_MESSAGE)
VEREIGN_URL=
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index a8bfd4ad1..e40ec7a47 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -937,7 +937,7 @@ void LOOLWSD::initialize(Application& self)
{ "trace.path[@compress]", "true" },
{ "trace.path[@snapshot]", "false" },
{ "trace[@enable]", "false" },
-{ "welcome.enable", "true" },
+{ "welcome.enable", ENABLE_WELCOME_MESSAGE },
{ "welcome.path", "loleaflet/welcome" }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loolwsd.xml.in
configure.ac | 10 ++ loolwsd.xml.in |2 +- 2 files changed, 11 insertions(+), 1 deletion(-) New commits: commit 0ec796dbee3516800d4600e5b64afe06942e9e2f Author: Jan Holesovsky AuthorDate: Wed Apr 15 16:17:31 2020 +0200 Commit: Jan Holesovsky CommitDate: Thu Apr 16 11:36:00 2020 +0200 Welcome: Add ./configure of the welcome message default. Change-Id: I090c7d657d2b0a696117f64f25c11ffb249fb272 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92277 Tested-by: Jenkins CollaboraOffice Reviewed-by: Jan Holesovsky diff --git a/configure.ac b/configure.ac index c605c87a4..c29f10e08 100644 --- a/configure.ac +++ b/configure.ac @@ -258,6 +258,11 @@ AC_ARG_WITH([max-documents], AS_HELP_STRING([--with-max-documents], [Set the limit on the total number of documents. Def: 10, Min: 2.])) +AC_ARG_ENABLE(welcome-message, +AS_HELP_STRING([--enable-welcome-message], +[Enables welcome message on version update. Can be changed later in loolwsd.xml.]) +) + AC_ARG_WITH([sanitizer], AS_HELP_STRING([--with-sanitizer], [Enable one or more compatible sanitizers. E.g. --with-sanitizer=address,undefined,leak])) @@ -593,6 +598,11 @@ AS_IF([test "$MAX_DOCUMENTS" -lt "2"], AC_DEFINE_UNQUOTED([MAX_DOCUMENTS],[$MAX_DOCUMENTS],[Limit the maximum number of open documents]) AC_SUBST(MAX_DOCUMENTS) +ENABLE_WELCOME_MESSAGE=false +AS_IF([test "$enable_welcome_message" = "yes"], + [ENABLE_WELCOME_MESSAGE="true"]) +AC_SUBST(ENABLE_WELCOME_MESSAGE) + VEREIGN_URL= if test "$enable_vereign" = "yes"; then VEREIGN_URL="https://app.vereign.com"; diff --git a/loolwsd.xml.in b/loolwsd.xml.in index 1739a661f..d22ec7e98 100644 --- a/loolwsd.xml.in +++ b/loolwsd.xml.in @@ -115,7 +115,7 @@ - true + @ENABLE_WELCOME_MESSAGE@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/src loolwsd.xml.in
configure.ac | 12
loleaflet/src/core/Socket.js | 18 --
loolwsd.xml.in |2 +-
3 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit fa14102b3bd3ad3f9a305cc12fefe44dd2ec4e19
Author: Michael Meeks
AuthorDate: Thu Mar 26 11:38:00 2020 +
Commit: Michael Meeks
CommitDate: Thu Mar 26 19:35:04 2020 +0100
Restore Javascript protocol logging.
If you don't want protocol logging by default in debugging builds
then either poke loolwsd.xml:
false
Or - configure with --disable-debug and --disable-debug-protocol.
Also remove redundant and unused co-ordinate parameters to the
message queue, and logging.
Change-Id: I489e32ef4758a6f0ef35c8d8d322a402a3e268e6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91096
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/configure.ac b/configure.ac
index d6f4316ef..1edd5408f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,11 @@ AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug],
[Enable debugging, link with debugging version of
Poco libraries]))
+AC_ARG_ENABLE([debug-protocol],
+AS_HELP_STRING([--disable-debug-protocol],
+[Disables JS protocol logging by default, otherwise it is slaved to
enable-debug.])
+)
+
AC_ARG_ENABLE([browsersync],
AS_HELP_STRING([--enable-browsersync],
[Don't copy files to the target directory but
create the symlink to allow browsersync usage]))
@@ -283,6 +288,7 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
[POCO_DEBUG_SUFFIX=])
ENABLE_DEBUG=false
+ENABLE_DEBUG_PROTOCOL=false
LOOLWSD_LOGLEVEL="warning"
LOOLWSD_LOG_TO_FILE="false"
LOOLWSD_LOGFILE="/var/log/loolwsd.log"
@@ -293,6 +299,7 @@ anonym_msg=""
if test "$enable_debug" = "yes"; then
AC_DEFINE([ENABLE_DEBUG],1,[Whether to compile in some extra debugging
support code and disable some security pieces])
ENABLE_DEBUG=true
+ ENABLE_DEBUG_PROTOCOL=true
LOOLWSD_LOGLEVEL="trace"
LOOLWSD_LOG_TO_FILE="true"
LOOLWSD_LOGFILE="/tmp/loolwsd.log"
@@ -307,6 +314,11 @@ AC_SUBST(LOOLWSD_LOGLEVEL)
AC_SUBST(LOOLWSD_LOG_TO_FILE)
AC_SUBST(LOLEAFLET_LOGGING)
+if test "$enable_debug_protocol" = no; then
+ ENABLE_DEBUG_PROTOCOL=false
+fi
+AC_SUBST(ENABLE_DEBUG_PROTOCOL)
+
ENABLE_BROWSERSYNC=
browsersync_msg="disabled: copy files to the target directory"
if test "$enable_browsersync" = "yes"; then
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index d744f4b46..d4e76d4e4 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -120,7 +120,7 @@ L.Socket = L.Class.extend({
return this.socket && this.socket.readyState === 1;
},
- sendMessage: function (msg, coords) {
+ sendMessage: function (msg) {
if (this._map._fatal) {
// Avoid communicating when we're in fatal state
return;
@@ -145,16 +145,14 @@ L.Socket = L.Class.extend({
}
else {
// push message while trying to connect socket again.
- this._msgQueue.push({msg: msg, coords: coords});
+ this._msgQueue.push(msg);
}
},
- _doSend: function(msg, coords) {
+ _doSend: function(msg) {
// Only attempt to log text frames, not binary ones.
- if (typeof msg === 'string') {
- L.Log.log(msg, 'OUTGOING', coords);
- // this._logSocket('OUTGOING', msg);
- }
+ if (typeof msg === 'string')
+ this._logSocket('OUTGOING', msg);
this.socket.send(msg);
},
@@ -197,7 +195,7 @@ L.Socket = L.Class.extend({
}
this._doSend(msg);
for (var i = 0; i < this._msgQueue.length; i++) {
- this._doSend(this._msgQueue[i].msg,
this._msgQueue[i].coords);
+ this._doSend(this._msgQueue[i]);
}
this._msgQueue = [];
@@ -268,7 +266,7 @@ L.Socket = L.Class.extend({
textMsg = String.fromCharCode.apply(null,
imgBytes.subarray(0, index));
}
- // this._logSocket('INCOMING', textMsg);
+ this._logSocket('INCOMING', textMsg);
var command = this.parseServerCmd(textMsg);
if (textMsg.startsWith('loolserver ')) {
@@ -759,7 +757,7 @@ L.Socket = L.Class.extend({
}
else if (!textMsg.startsWith('tile:') &&
!textMsg.startsWith('renderfont:') && !textMsg.startsWith('windowpaint:')) {
// log the tile msg separately as we need the tile
coordinates
-
[Libreoffice-commits] online.git: configure.ac
configure.ac | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit dbaf32c627a5c48b36c91bcee6fb5d94994c91da
Author: Corentin Noël
AuthorDate: Thu Mar 26 14:47:21 2020 +0100
Commit: Michael Meeks
CommitDate: Thu Mar 26 15:32:30 2020 +0100
autotools: Add support for atomic helper library
On some platforms like Raspbian Buster, loolwsd need to be linked to the
atomic helper library.
Change-Id: I0a8b921d85d499040b2e65d480116cbcb14b5089
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91102
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/configure.ac b/configure.ac
index a90ee2d62..d6f4316ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,20 @@ for MODULE in lxml polib; do
fi
done
+# On some platforms, std::atomic needs a helper library
+AC_MSG_CHECKING([for the need of -latomic])
+AC_LINK_IFELSE([AC_LANG_SOURCE([
+#include
+#include
+std::atomic v;
+int main() {
+ return v;
+}
+])],
+ [AC_MSG_RESULT([No])],
+ [AC_MSG_RESULT([Yes])
+LIBS="$LIBS -latomic"])
+
# Declare options
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/Mobile
configure.ac |8 + ios/Mobile/Resources/Settings.bundle/Root.plist.in | 18 ++--- ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings |5 ++- ios/Mobile/Resources/Settings.bundle/fi.lproj/Root.strings |6 4 files changed, 26 insertions(+), 11 deletions(-) New commits: commit 4dd95f833de4d559d69735bffcc70bee5625ff80 Author: Tor Lillqvist AuthorDate: Wed Mar 25 22:49:42 2020 +0200 Commit: Tor Lillqvist CommitDate: Thu Mar 26 00:26:58 2020 +0100 Propagate core and online git hashes to the Settings for the iOS app The git hashes now show up in the Settings app, without having to run the Collabora Office app, open a document, and check the About dialog. The core git hash is taken from the core build directory's instdir/program/setuprc. Also, drop the fairly pointless lone Finnish localisation of the Settings strings. Change-Id: I56631f8facde017ed99038209c55f516386eab99 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91073 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index efd54b872..a90ee2d62 100644 --- a/configure.ac +++ b/configure.ac @@ -332,6 +332,7 @@ POCOINCLUDE_ARM64_V8A= POCOLIB= POCOLIB_ARM64_V8A= POCODEBUG= +CORE_VERSION_HASH="" if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_androidapp" = "yes" \); then AC_MSG_CHECKING([for LibreOffice build tree to build against]) if test -z "$with_lo_builddir"; then @@ -356,6 +357,9 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` = "Darwin" \) -o \( "$enable_a fi fi + # Get the git hash of the core build + CORE_VERSION_HASH=`cd $LOBUILDDIR && grep buildid instdir/program/setuprc | sed -e 's/buildid=//' -e 's/$//'` + # Sanity check, just a random object file in the LibreOffice build tree if test \( "$enable_iosapp" = "yes" -a -f "$LOBUILDDIR/workdir/CxxObject/vcl/ios/iosinst.o" \) -o \( "$enable_androidapp" = "yes" -a -f "$LOBUILDDIR/workdir/LinkTarget/StaticLibrary/liblibpng.a" \); then AC_MSG_RESULT([$LOBUILDDIR]) @@ -433,6 +437,9 @@ AC_SUBST(POCOINCLUDE_ARM64_V8A) AC_SUBST(POCOLIB) AC_SUBST(POCOLIB_ARM64_V8A) AC_SUBST(POCODEBUG) +AC_SUBST([CORE_VERSION_HASH]) + +AC_DEFINE_UNQUOTED([CORE_VERSION_HASH],[["$CORE_VERSION_HASH"]],[LibreOffice core git hash if present]) LIBPNG_INCLUDES="$with_libpng_includes" LIBPNG_LIBS="$with_libpng_libs" @@ -1020,6 +1027,7 @@ AC_CONFIG_FILES([Makefile gtk/Makefile ios/config.h ios/Mobile/Info.plist + ios/Mobile/Resources/Settings.bundle/Root.plist test/Makefile loleaflet/Makefile loleaflet/npm-shrinkwrap.json diff --git a/ios/Mobile/Resources/Settings.bundle/Root.plist b/ios/Mobile/Resources/Settings.bundle/Root.plist.in similarity index 65% rename from ios/Mobile/Resources/Settings.bundle/Root.plist rename to ios/Mobile/Resources/Settings.bundle/Root.plist.in index f7e9d7653..0d7966f1e 100644 --- a/ios/Mobile/Resources/Settings.bundle/Root.plist +++ b/ios/Mobile/Resources/Settings.bundle/Root.plist.in @@ -10,15 +10,27 @@ Type PSGroupSpecifier Title - App info + Version information Type PSTitleValueSpecifier Title - Version + Online git hash Key - version + onlineVersion + DefaultValue + @LOOLWSD_VERSION_HASH@ + + + Type + PSTitleValueSpecifier + Title + Core git hash + Key + coreVersion + DefaultValue + @CORE_VERSION_HASH@ Type diff --git a/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings b/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings index 08caa0eba..9459fe693 100644 --- a/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings +++ b/ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings @@ -1,6 +1,7 @@ /* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */ -"App info" = "App info"; -"Version" = "Version"; +"Version information" = "Version information"; +"Online git hash" = "Online git hash"; +"Core git hash" = "Core git hash"; "Settings" = "Settings"; "Templat
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7193699742a48c347b8b6a694c8f4aa0218735c9
Author: Miklos Vajna
AuthorDate: Fri Feb 28 16:02:38 2020 +0100
Commit: Miklos Vajna
CommitDate: Fri Feb 28 18:31:53 2020 +0100
libfuzzer: don't require a core.git installation set
The fuzzer focuses on catching protocol parsing problems, it's not an
end-to-end test.
Change-Id: I1edc308134f365749339790f242614332b54dce4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89720
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/configure.ac b/configure.ac
index 1a038efaf..3c34c153d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -679,7 +679,7 @@ AS_IF([test -n "$LOKIT_PATH"],
[CPPFLAGS="$CPPFLAGS -I${LOKIT_PATH}"])
lokit_msg="$LOKIT_PATH"
-AS_IF([test "$ENABLE_IOSAPP" != "true" -a "$ENABLE_ANDROIDAPP" != "true"],
+AS_IF([test "$ENABLE_IOSAPP" != "true" -a "$ENABLE_ANDROIDAPP" != "true" -a
"$enable_fuzzers" != "yes"],
[AC_MSG_CHECKING([for LibreOffice path])
if test -n "$with_lo_path"; then
# strip trailing '/' from LO_PATH, 'ln -s' with such path will
otherwise fail
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/Mobile.xcodeproj
configure.ac |1 +
ios/Mobile.xcodeproj/project.pbxproj |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3de577d2c20d83be0079be4066196b476c46fa8d
Author: Tor Lillqvist
AuthorDate: Tue Feb 25 17:29:09 2020 +0200
Commit: Tor Lillqvist
CommitDate: Tue Feb 25 21:40:03 2020 +0100
Use the loolkitconfig-mobile.xcu on iOS, too
We can't rename a file in the Xcode project, so copy it to
ios/Mobile/loolkitconfig.xcu in the configure script, and use from
there.
Change-Id: I1e50235c06f528dd24d0d968aaccc994418b57d8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89466
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index 398d303e3..1a038efaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -983,6 +983,7 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
# iOS app.
touch ios/Mobile/Branding/branding.css
fi
+ cp loolkitconfig-mobile.xcu ios/Mobile/loolkitconfig.xcu
fi
])
AC_SUBST(IOSAPP_FONTS)
diff --git a/ios/Mobile.xcodeproj/project.pbxproj
b/ios/Mobile.xcodeproj/project.pbxproj
index 9fab320d2..e20f49084 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -598,7 +598,7 @@
BE7D6A6523FA9C2700C2E605 /* defaultprovider.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name =
defaultprovider.hxx; path =
"../../ios-device/configmgr/source/defaultprovider.hxx"; sourceTree =
""; };
BE7D6A6623FA9C2700C2E605 /* parser.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = parser.hxx; path
= "../../ios-device/configmgr/source/parser.hxx"; sourceTree = ""; };
BE7D6A6723FA9C2700C2E605 /* rootnode.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rootnode.cxx;
path = "../../ios-device/configmgr/source/rootnode.cxx"; sourceTree =
""; };
- BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name =
loolkitconfig.xcu; path = ../../../loolkitconfig.xcu; sourceTree = ""; };
+ BE7D6A6A23FAA8B500C2E605 /* loolkitconfig.xcu */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name =
loolkitconfig.xcu; path = ../loolkitconfig.xcu; sourceTree = ""; };
BE7E5B7623AD07BE00F9462A /* SvxPresetListBox.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
SvxPresetListBox.cxx; path =
"../../ios-device/svx/source/tbxctrls/SvxPresetListBox.cxx"; sourceTree =
""; };
BE7E5B7723AD07BE00F9462A /* tbxcolor.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxcolor.cxx;
path = "../../ios-device/svx/source/tbxctrls/tbxcolor.cxx"; sourceTree =
""; };
BE7E5B7823AD07BE00F9462A /* tbxdrctl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxdrctl.cxx;
path = "../../ios-device/svx/source/tbxctrls/tbxdrctl.cxx"; sourceTree =
""; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |3 +++ 1 file changed, 3 insertions(+) New commits: commit 0c7955612895c691363c78b942766fed2df2fadb Author: Henry Castro AuthorDate: Wed Feb 12 14:39:18 2020 -0400 Commit: Henry Castro CommitDate: Thu Feb 13 15:29:16 2020 +0100 cypress: configure: fix symbolic links to files and folders builddir != srcdir Change-Id: I7baaba5f173d209cfb6cbbc5a61cf07a66a51eaf Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88560 Tested-by: Henry Castro Reviewed-by: Henry Castro diff --git a/configure.ac b/configure.ac index e6448cdc5..9ae4584d7 100644 --- a/configure.ac +++ b/configure.ac @@ -922,6 +922,9 @@ AC_SUBST(ENABLE_SETCAP) AC_CONFIG_LINKS([discovery.xml:discovery.xml]) AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu]) AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json]) +AC_CONFIG_LINKS([cypress_test/package.json:cypress_test/package.json]) +AC_CONFIG_LINKS([cypress_test/cypress.json:cypress_test/cypress.json]) +AC_LINK_FILES([cypress_test/plugins], [cypress_test/plugins]) AC_LINK_FILES([loleaflet/archived-packages], [loleaflet/archived-packages]) APP_BRANDING_DIR= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f54afcbebcfeffc8bd6b845f4df17295ab9fa0b8 Author: Yunusemre Şentürk AuthorDate: Thu Feb 6 13:14:20 2020 +0300 Commit: Andras Timar CommitDate: Thu Feb 6 12:19:52 2020 +0100 Add chromium-browser to binary search pool Change-Id: If82be88891f9d506c2791e993c580eaef459f937 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88087 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/configure.ac b/configure.ac index 8e769ff35..e6448cdc5 100644 --- a/configure.ac +++ b/configure.ac @@ -886,7 +886,7 @@ AS_IF([test `uname -s` = "Linux"], fi fi if test "$enable_cypress" = "yes"; then - AC_PATH_PROGS(CHROME, chrome google-chrome chromium, no) + AC_PATH_PROGS(CHROME, chrome google-chrome chromium chromium-browser, no) if test "$CHROME" = "no"; then AC_MSG_ERROR([chrome or chromium is required to run the JS tests, but not installed]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 2afebbeb672af1f94384b0bd7120107fde251fbd Author: Miklos Vajna AuthorDate: Mon Jan 27 09:07:19 2020 +0100 Commit: Miklos Vajna CommitDate: Mon Jan 27 09:44:29 2020 +0100 configure: make lack of Chrome an error in the enable-cypress case Change-Id: I1e2d4c884fc58334b3fdd5d43b1821eceeb08987 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87487 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/configure.ac b/configure.ac index f56bcab1b..8e769ff35 100644 --- a/configure.ac +++ b/configure.ac @@ -888,8 +888,7 @@ AS_IF([test `uname -s` = "Linux"], if test "$enable_cypress" = "yes"; then AC_PATH_PROGS(CHROME, chrome google-chrome chromium, no) if test "$CHROME" = "no"; then - # Only a warning till these tests are not part of toplevel 'make check'. - AC_MSG_WARN([chrome or chromium is required to run the JS tests, but not installed]) + AC_MSG_ERROR([chrome or chromium is required to run the JS tests, but not installed]) fi fi ]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit aaab96fd122c24bde3eed6460e25453fa3d02171 Author: Tamás Zolnai AuthorDate: Thu Jan 23 17:14:09 2020 +0100 Commit: Tamás Zolnai CommitDate: Thu Jan 23 21:02:46 2020 +0100 cypress: make chrome check depend on enable_cypress flag. Change-Id: I0e61ef55be68991ae6d55247d93beb0cd6913084 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87292 Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai diff --git a/configure.ac b/configure.ac index 6cd517112..f56bcab1b 100644 --- a/configure.ac +++ b/configure.ac @@ -885,10 +885,12 @@ AS_IF([test `uname -s` = "Linux"], AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0]) fi fi - AC_PATH_PROGS(CHROME, chrome google-chrome chromium, no) - if test "$CHROME" = "no"; then - # Only a warning till these tests are not part of toplevel 'make check'. - AC_MSG_WARN([chrome or chromium is required to run the JS tests, but not installed]) + if test "$enable_cypress" = "yes"; then + AC_PATH_PROGS(CHROME, chrome google-chrome chromium, no) + if test "$CHROME" = "no"; then + # Only a warning till these tests are not part of toplevel 'make check'. + AC_MSG_WARN([chrome or chromium is required to run the JS tests, but not installed]) + fi fi ]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbb87bab34e2f5e19030363aa54e6f73cd8062cc Author: Tamás Zolnai AuthorDate: Wed Jan 22 20:40:10 2020 +0100 Commit: Tamás Zolnai CommitDate: Wed Jan 22 21:21:37 2020 +0100 cypress: Fix CHROME program detection. For checking more binaries, we need AC_PATH_PROGS and a blank separated list. Change-Id: Ie1f5660b912970b70ba1aa51885989fbd0563914 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87213 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tamás Zolnai diff --git a/configure.ac b/configure.ac index 4e0087071..9f9deba55 100644 --- a/configure.ac +++ b/configure.ac @@ -881,7 +881,7 @@ AS_IF([test `uname -s` = "Linux"], AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0]) fi fi - AC_PATH_PROG(CHROME, chrome, google-chrome, chromium, no) + AC_PATH_PROGS(CHROME, chrome google-chrome chromium, no) if test "$CHROME" = "no"; then # Only a warning till these tests are not part of toplevel 'make check'. AC_MSG_WARN([chrome or chromium is required to run the JS tests, but not installed]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac cypress_test/Makefile.am
configure.ac |5 + cypress_test/Makefile.am |4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit ed586d96011740b87e812a54632bd16ac954a7d1 Author: Miklos Vajna AuthorDate: Wed Jan 22 14:57:31 2020 +0100 Commit: Miklos Vajna CommitDate: Wed Jan 22 18:59:46 2020 +0100 cypress: accept chromium next to chrome Change-Id: Id2a577b1413227840e2af29abe4cc96e5a81dd82 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87191 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/configure.ac b/configure.ac index f502934ae..4e0087071 100644 --- a/configure.ac +++ b/configure.ac @@ -881,6 +881,11 @@ AS_IF([test `uname -s` = "Linux"], AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0]) fi fi + AC_PATH_PROG(CHROME, chrome, google-chrome, chromium, no) + if test "$CHROME" = "no"; then + # Only a warning till these tests are not part of toplevel 'make check'. + AC_MSG_WARN([chrome or chromium is required to run the JS tests, but not installed]) + fi ]) # need this after the other stuff that uses the compiler because we don't want to run configure-tests with the plugins enabled diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 26fb9a0bd..73c282305 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -75,7 +75,7 @@ define run_desktop_tests @echo @echo "Running cypress desktop tests..." @echo - $(CYPRESS_BINARY) run --browser chrome \ + $(CYPRESS_BINARY) run --browser $(CHROME) \ --config integrationFolder=$(DESKTOP_TEST_FOLDER) \ --headless \ --env DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH) \ @@ -87,7 +87,7 @@ define run_mobile_tests @echo @echo "Running cypress mobile tests..." @echo - $(CYPRESS_BINARY) run --browser chrome \ + $(CYPRESS_BINARY) run --browser $(CHROME) \ --config integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \ --headless \ --env DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac | 31 +++
1 file changed, 19 insertions(+), 12 deletions(-)
New commits:
commit 814a0c49ef0d1a5b64b1dcda42578a479170a6d2
Author: Jan Holesovsky
AuthorDate: Tue Dec 3 12:48:32 2019 +0100
Commit: Jan Holesovsky
CommitDate: Tue Dec 3 14:52:00 2019 +0100
android: Allow full version specification.
Change-Id: I2da4a7d1fc63cfd0df10a7e32f123af82e8be461
Reviewed-on: https://gerrit.libreoffice.org/84329
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/configure.ac b/configure.ac
index 2aaf5c96f..04c2e1816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,24 @@ m4_if(m4_esyscmd_s([uname
-s]),Linux,[],[m4_define([PKG_CHECK_MODULES],[])])
LOOLWSD_VERSION_MAJOR=`echo $VERSION | awk -F. '{print $1}'`
LOOLWSD_VERSION_MINOR=`echo $VERSION | awk -F. '{print $2}'`
LOOLWSD_VERSION_MICRO=`echo $VERSION | awk -F. '{print $3}'`
+
+ANDROID_PACKAGE_VERSIONCODE=
+if test "$enable_androidapp" = "yes"; then
+AC_MSG_CHECKING([for Android package versionCode])
+if test -z "$with_android_package_versioncode" -o
"$with_android_package_versioncode" = "no"; then
+ANDROID_PACKAGE_VERSIONCODE="1"
+AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_VERSIONCODE])
+else
+LOOLWSD_VERSION_MAJOR=`echo $with_android_package_versioncode | awk
-F. '{print $1}'`
+LOOLWSD_VERSION_MINOR=`echo $with_android_package_versioncode | awk
-F. '{print $2}'`
+LOOLWSD_VERSION_MICRO=`echo $with_android_package_versioncode | awk
-F. '{print $3}' | awk -F- '{print $1}'`
+
+ANDROID_PACKAGE_VERSIONCODE=`echo $with_android_package_versioncode |
awk -F- '{print $2}'`
+AC_MSG_RESULT([$ANDROID_PACKAGE_VERSIONCODE])
+fi
+fi
+AC_SUBST(ANDROID_PACKAGE_VERSIONCODE)
+
LOOLWSD_VERSION="$LOOLWSD_VERSION_MAJOR.$LOOLWSD_VERSION_MINOR.$LOOLWSD_VERSION_MICRO"
AC_SUBST([LOOLWSD_VERSION_MAJOR])
@@ -116,7 +134,7 @@ AC_ARG_WITH(android-package-name,
,)
AC_ARG_WITH(android-package-versioncode,
-AS_HELP_STRING([--with-android-package-versioncode=20],
+AS_HELP_STRING([--with-android-package-versioncode=6.7.8-23],
[Set the versionCode for the Android package.]),
,)
@@ -357,7 +375,6 @@ AC_SUBST(LOKIT_PATH)
ENABLE_ANDROIDAPP=
ANDROID_PACKAGE_NAME=
-ANDROID_PACKAGE_VERSIONCODE=
if test "$enable_androidapp" = "yes"; then
ENABLE_ANDROIDAPP=true
@@ -369,20 +386,10 @@ if test "$enable_androidapp" = "yes"; then
ANDROID_PACKAGE_NAME="$with_android_package_name"
AC_MSG_RESULT([$ANDROID_PACKAGE_NAME])
fi
-
-AC_MSG_CHECKING([for Android package versionCode])
-if test -z "$with_android_package_versioncode" -o
"$with_android_package_versioncode" = "no"; then
-ANDROID_PACKAGE_VERSIONCODE="1"
-AC_MSG_RESULT([not set, using $ANDROID_PACKAGE_VERSIONCODE])
-else
-ANDROID_PACKAGE_VERSIONCODE="$with_android_package_versioncode"
-AC_MSG_RESULT([$ANDROID_PACKAGE_VERSIONCODE])
-fi
fi
AC_SUBST(ENABLE_ANDROIDAPP)
AM_CONDITIONAL([ENABLE_ANDROIDAPP], [test "$ENABLE_ANDROIDAPP" = "true"])
AC_SUBST(ANDROID_PACKAGE_NAME)
-AC_SUBST(ANDROID_PACKAGE_VERSIONCODE)
APP_NAME="LibreOffice Online"
if test -n "$with_app_name"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac debian/loolwsd.postinst.in loolwsd.xml.in
configure.ac |2 +-
debian/loolwsd.postinst.in |2 +-
loolwsd.xml.in |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8d5d9e427f3bf9fce791e1a0fb2beca0206d54fd
Author: Andras Timar
AuthorDate: Wed Nov 27 12:15:52 2019 +0100
Commit: Andras Timar
CommitDate: Wed Nov 27 12:16:07 2019 +0100
APP_NAME tweaks
Change-Id: I16016cfc575620f98c0124fdb85e39cf56e0453a
diff --git a/configure.ac b/configure.ac
index 3aabde485..9f4ca7af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,7 +384,7 @@ AM_CONDITIONAL([ENABLE_ANDROIDAPP], [test
"$ENABLE_ANDROIDAPP" = "true"])
AC_SUBST(ANDROID_PACKAGE_NAME)
AC_SUBST(ANDROID_PACKAGE_VERSIONCODE)
-APP_NAME="LOOL"
+APP_NAME="LibreOffice Online"
if test -n "$with_app_name"; then
APP_NAME="$with_app_name"
fi
diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in
index bbbfcfeda..afd2cde2a 100644
--- a/debian/loolwsd.postinst.in
+++ b/debian/loolwsd.postinst.in
@@ -25,7 +25,7 @@ case "$1" in
loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null
2>&1
cat << EOF > /etc/apt/apt.conf.d/25loolwsd
-// Rebuild systemplate of LibreOffice Online
+// Rebuild systemplate of @APP_NAME@
DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh
-c 'loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null
2>&1'"; };
EOF
;;
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 0ebe62e79..416dd9b2a 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -11,7 +11,7 @@
-
+
1
4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c59bf4ed3a95e742f1610277ec8b0906070ed2bf Author: Andras Timar AuthorDate: Sun Nov 24 17:36:24 2019 +0100 Commit: Andras Timar CommitDate: Sun Nov 24 17:36:24 2019 +0100 ENABLE_DEBUG default value should be false and not empty When the default value was empty, @ENABLE_DEBUG@ in loolwsd.xml.in was substituted to empty string, not to "false" as intended in release builds. As a consequence, in new installations, the loading of the loleaflet.html gave 400 Bad request error with a not very helpful error message: wsd-00922-00928 2019-11-24 16:05:55.384859 [ websrv_poll ] INF #23 Exception while processing incoming request: [POST /loleaflet/08aa7d914/loleaflet.html?WOPISrc=http%3A%2F%2F172.22.64.173%2Findex.php%2Fapps%2F...]: Syntax error| wsd/LOOLWSD.cpp:2244euex4o&title=About.odt&lang=en&closebutton=1&revisionhistory=1 HTTP/1.1 Change-Id: Ia8bb18914bb49af057c4618f99124b0f22737f20 diff --git a/configure.ac b/configure.ac index e737bcc2b..3aabde485 100644 --- a/configure.ac +++ b/configure.ac @@ -228,7 +228,7 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"], [POCO_DEBUG_SUFFIX=d], [POCO_DEBUG_SUFFIX=]) -ENABLE_DEBUG= +ENABLE_DEBUG=false LOOLWSD_LOGLEVEL="warning" LOOLWSD_LOG_TO_FILE="false" LOOLWSD_LOGFILE="/var/log/loolwsd.log" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |3 +++ 1 file changed, 3 insertions(+) New commits: commit bdc2987459c54a1d488c014e987d330aa19d Author: Tor Lillqvist AuthorDate: Thu Nov 21 11:30:18 2019 +0200 Commit: Tor Lillqvist CommitDate: Thu Nov 21 11:30:18 2019 +0200 Require use of --with-vendor when configuring for the iOS app You want something meaningful to show up in Help > About, not just your account's login name. Change-Id: I1f30516200552f2bbe70091efa3b7029954a681a diff --git a/configure.ac b/configure.ac index 5d1a63689..e737bcc2b 100644 --- a/configure.ac +++ b/configure.ac @@ -393,6 +393,9 @@ AC_SUBST(APP_NAME) VENDOR= AC_MSG_CHECKING([for vendor]) +if test "$enable_iosapp" = yes -a -z "$with_vendor"; then +AC_MSG_ERROR([You must use --with-vendor when configuring for the iOS app]) +fi if test -z "$with_vendor" -o "$with_vendor" = "no"; then VENDOR="$USERNAME" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 2c8350b8a1b8303f1cb4b78e9c5db04e1441a9af
Author: Tor Lillqvist
AuthorDate: Mon Nov 4 15:36:06 2019 +0200
Commit: Tor Lillqvist
CommitDate: Mon Nov 4 15:25:38 2019 +0100
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
Tested-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index bab2578fa..7980cb0f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,10 @@ for MODULE in lxml polib; do
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-AC_MSG_ERROR([${MODULE} for python3 is needed. It might be in a
package called python3-${MODULE}.])
+AS_IF([test `uname -s` = Linux],
+ [AC_MSG_ERROR([${MODULE} for python3 is needed. It might be in a
package called python3-${MODULE}.])],
+ [AC_MSG_WARN([${MODULE} for python3 is needed. It might be in a
package called python3-${MODULE}. But
+ if you are building the JS bits on another (Linux) machine,
that doesn't matter])])
fi
done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 5a0e357f78759be09ab21e06156f1a749244c2c1
Author: Andras Timar
AuthorDate: Thu Oct 31 12:14:58 2019 +0100
Commit: Andras Timar
CommitDate: Thu Oct 31 14:28:19 2019 +0100
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
Tested-by: Andras Timar
diff --git a/configure.ac b/configure.ac
index af9d0aa87..bab2578fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,6 +658,9 @@ AC_SUBST(ENABLE_SUPPORT_KEY)
LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX}
-lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX}
-lPocoXML${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX}
-lPocoCrypto${POCO_DEBUG_SUFFIX}"
+AS_IF([test "$ENABLE_SSL" = "true"],
+ [LIBS="$LIBS -lssl -lcrypto"])
+
AS_IF([test "$ENABLE_IOSAPP" != "true"],
[AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h],
[],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |1 +
1 file changed, 1 insertion(+)
New commits:
commit 5e4c9db5de916fad88ca286e45d79c5a672313ba
Author: Andras Timar
AuthorDate: Wed Oct 30 13:51:48 2019 +0100
Commit: Andras Timar
CommitDate: Wed Oct 30 13:51:48 2019 +0100
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
diff --git a/configure.ac b/configure.ac
index c6e5f54fa..af9d0aa87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -704,6 +704,7 @@ AS_IF([test "$ENABLE_IOSAPP" != "true"],
#include
int main(int argc, char **argv)
{
+ (void)argc;
Poco::RegularExpression e("abc.[def]");
Poco::RegularExpression::Match m;
return e.match(argv[[1]], m);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c4f900b45f6e6a60526809c7d86e71d5b2779a7
Author: Yunusemre Şentürk
AuthorDate: Wed Oct 30 10:03:49 2019 +0100
Commit: Andras Timar
CommitDate: Wed Oct 30 10:03:49 2019 +0100
change linking order of poco libs in order to make static linking possible
Change-Id: I8de3f454f9174d78777303779acdb6c9c1ba2c7c
diff --git a/configure.ac b/configure.ac
index 676a77171..c6e5f54fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -656,7 +656,7 @@ else
fi
AC_SUBST(ENABLE_SUPPORT_KEY)
-LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX}
-lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX}
-lPocoXML${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX}
-lPocoCrypto${POCO_DEBUG_SUFFIX}"
+LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX}
-lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX}
-lPocoXML${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX}
-lPocoCrypto${POCO_DEBUG_SUFFIX}"
AS_IF([test "$ENABLE_IOSAPP" != "true"],
[AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit f75366bc947ae34bcd76c801f813efb29e665685
Author: Michael Weghorn
AuthorDate: Thu Oct 24 18:35:30 2019 +0200
Commit: Michael Weghorn
CommitDate: Fri Oct 25 09:51:43 2019 +0200
configure.ac: Add check for python3 libs
They are needed since commit
c1e04e406955c6f3bf186019ffee459c93f03330
("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
Tested-by: Michael Weghorn
diff --git a/configure.ac b/configure.ac
index fb54564c9..676a77171 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,17 @@ AS_IF([test `uname -s` = Linux],
AS_IF([test -z "$SETCAP"],
[AC_MSG_ERROR([The setcap command is needed. It might be in a package
called libcap-progs.])]))
+# check for python modules
+for MODULE in lxml polib; do
+AC_MSG_CHECKING([for ${MODULE} for python3])
+if /usr/bin/env python3 -c "import ${MODULE}" 2> /dev/null ; then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+AC_MSG_ERROR([${MODULE} for python3 is needed. It might be in a
package called python3-${MODULE}.])
+fi
+done
+
# Declare options
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 9c2fd9ded993c4cae9c01da9d7060c9a4385cfba
Author: Tor Lillqvist
AuthorDate: Tue Oct 8 14:46:19 2019 +0300
Commit: Tor Lillqvist
CommitDate: Tue Oct 8 16:40:33 2019 +0200
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
Tested-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index dd71eda5e..fb54564c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,15 +506,17 @@ AS_IF([test -n "$LOKIT_PATH"],
[CPPFLAGS="$CPPFLAGS -I${LOKIT_PATH}"])
lokit_msg="$LOKIT_PATH"
-AC_MSG_CHECKING([for LibreOffice path])
-if test -n "$with_lo_path"; then
-# strip trailing '/' from LO_PATH, 'ln -s' with such path will otherwise
fail
-LO_PATH="${with_lo_path%/}"
-AC_MSG_RESULT([found])
-else
-AC_MSG_RESULT([not found])
-AC_MSG_ERROR([LibreOffice path must be configured: --with-lo-path])
-fi
+AS_IF([test "$ENABLE_IOSAPP" != "true" -a "$ENABLE_ANDROIDAPP" != "true"],
+ [AC_MSG_CHECKING([for LibreOffice path])
+ if test -n "$with_lo_path"; then
+ # strip trailing '/' from LO_PATH, 'ln -s' with such path will
otherwise fail
+ LO_PATH="${with_lo_path%/}"
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_ERROR([LibreOffice path must be configured: --with-lo-path])
+ fi
+ ])
JAIL_PATH=not-set
SYSTEMPLATE_PATH=not-set
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac docker/l10n-docker-nightly.sh docker/scripts loleaflet/README loolwsd.xml.in Makefile.am test/run_unit.sh.in wsd/LOOLWSD.cpp wsd/README
Makefile.am | 10 +- configure.ac | 37 - docker/l10n-docker-nightly.sh |2 +- docker/scripts/run-lool.sh|2 +- loleaflet/README |2 +- loolwsd.xml.in|1 - test/run_unit.sh.in |3 --- wsd/LOOLWSD.cpp |3 +-- wsd/README|2 +- 9 files changed, 30 insertions(+), 32 deletions(-) New commits: commit db176ee45baae93ab4411c23d32ae1d0f608352b Author: Andras Timar AuthorDate: Tue Oct 1 10:35:38 2019 +0200 Commit: Andras Timar CommitDate: Tue Oct 8 09:36:44 2019 +0200 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 Tested-by: Andras Timar diff --git a/Makefile.am b/Makefile.am index b30e6bfe9..01e2dd120 100644 --- a/Makefile.am +++ b/Makefile.am @@ -287,7 +287,7 @@ run: all @JAILS_PATH@ @cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods @cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp @echo - ./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \ + ./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \ --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \ --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \ --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \ @@ -311,7 +311,7 @@ run-valgrind: all @JAILS_PATH@ @cp $(abs_top_srcdir)/test/data/hello.ods $(abs_top_srcdir)/test/data/hello-world.ods @cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \ - ./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \ + ./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \ --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \ --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \ --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \ @@ -327,7 +327,7 @@ run-gdb: all @JAILS_PATH@ @cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp gdb --tui --args \ ./loolwsd --o:security.capabilities="false" \ - --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \ + --o:sys_template_path="@SYSTEMPLATE_PATH@" \ --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \ --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \ --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \ @@ -343,7 +343,7 @@ run-callgrind: all @JAILS_PATH@ @cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp valgrind --tool=callgrind --simulate-cache=yes --dump-instr=yes --num-callers=50 --error-limit=no --trace-children=yes \ ./loolwsd --o:security.capabilities="false" \ - --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \ + --o:sys_template_path="@SYSTEMPLATE_PATH@" \ --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \ --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \ --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \ @@ -359,7 +359,7 @@ run-strace: all @JAILS_PATH@ @cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp strace -o strace.log -f -tt -s 256 \ ./loolwsd --o:security.capabilities="false" \ - --o:sys_template_path="@SYSTEMPLATE_PATH@" --o:lo_template_path="@LO_PATH@" \ + --o:sys_template_path="@SYSTEMPLATE_PATH@" \ --o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \ --o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \ --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \ diff --git a/configure.ac b/configure.ac index b14ac3745..dd71eda5e 100644 --- a/configure.ac +++ b/configure.ac @@ -506,29
[Libreoffice-commits] online.git: configure.ac
configure.ac | 14 ++ 1 file changed, 14 insertions(+) New commits: commit 90188d07c17048291b6a64d461a982129a3f8837 Author: Ashod Nakashian AuthorDate: Sat Sep 21 16:29:56 2019 -0400 Commit: Ashod Nakashian CommitDate: Sun Sep 22 20:26:25 2019 +0200 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 Tested-by: Ashod Nakashian diff --git a/configure.ac b/configure.ac index 711de7d01..c3ab7c195 100644 --- a/configure.ac +++ b/configure.ac @@ -184,6 +184,10 @@ AC_ARG_WITH([max-documents], AS_HELP_STRING([--with-max-documents], [Set the limit on the total number of documents. Def: 10, Min: 2.])) +AC_ARG_WITH([sanitizer], + AS_HELP_STRING([--with-sanitizer], + [Enable one or more compatible sanitizers. E.g. --with-sanitizer=address,undefined,leak])) + AC_ARG_WITH([compiler-plugins], AS_HELP_STRING([--with-compiler-plugins=], [Experimental! Unlikely to work for anyone except Noel! Enable compiler plugins that will perform additional checks during @@ -460,6 +464,16 @@ else AC_MSG_RESULT([no]) fi +AC_MSG_CHECKING([whether to turn sanitizers on]) +if test "x$with_sanitizer" != "x"; then +AC_MSG_RESULT([yes ($with_sanitizer)]) +SANITIZER_FLAGS="-O1 -fno-omit-frame-pointer -fsanitize=$with_sanitizer -frtti -static-libasan" +CXXFLAGS="$CXXFLAGS $SANITIZER_FLAGS" +CFLAGS="$CFLAGS $SANITIZER_FLAGS" +else +AC_MSG_RESULT([no]) +fi + # check for C++11 support HAVE_CXX11= AC_MSG_CHECKING([whether $CXX supports C++14 or C++11]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac kit/Kit.cpp loolwsd.xml.in wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp wsd/Storage.cpp
configure.ac | 35 +-
kit/Kit.cpp| 18 ++-
loolwsd.xml.in |3 --
wsd/ClientSession.cpp |2 -
wsd/DocumentBroker.cpp |2 -
wsd/LOOLWSD.cpp| 57 +
wsd/LOOLWSD.hpp|7 ++
wsd/Storage.cpp| 20 ++---
8 files changed, 66 insertions(+), 78 deletions(-)
New commits:
commit 226c2fe71c53f4c8e460bf13a30870aaa0ea7581
Author: Ashod Nakashian
AuthorDate: Sun Apr 14 12:24:45 2019 -0400
Commit: Ashod Nakashian
CommitDate: Sat Aug 17 03:42:19 2019 +0200
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
Tested-by: Ashod Nakashian
Reviewed-on: https://gerrit.libreoffice.org/71090
diff --git a/configure.ac b/configure.ac
index 681d5bdde..711de7d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,13 +59,9 @@ AC_ARG_ENABLE([browsersync],
AS_HELP_STRING([--enable-browsersync],
[Don't copy files to the target directory but
create the symlink to allow browsersync usage]))
-AC_ARG_ENABLE([anonymize-usernames],
- AS_HELP_STRING([--enable-anonymize-usernames],
- [Enable anonymization/obfuscation of usernames in
logs]))
-
-AC_ARG_ENABLE([anonymize-filenames],
- AS_HELP_STRING([--enable-anonymize-filenames],
- [Enable anonymization/obfuscation of filenames in
logs]))
+AC_ARG_ENABLE([anonymization],
+ AS_HELP_STRING([--enable-anonymization],
+ [Enable anonymization/obfuscation of user-data in
logs]))
AC_ARG_ENABLE([iosapp],
AS_HELP_STRING([--enable-iosapp],
@@ -213,8 +209,7 @@ ENABLE_DEBUG=
LOOLWSD_LOGLEVEL="warning"
LOOLWSD_LOG_TO_FILE="false"
LOOLWSD_LOGFILE="/var/log/loolwsd.log"
-LOOLWSD_ANONYMIZE_FILENAMES=false
-LOOLWSD_ANONYMIZE_USERNAMES=false
+LOOLWSD_ANONYMIZE_USER_DATA=false
LOLEAFLET_LOGGING="false"
debug_msg="secure mode: product build"
anonym_msg=""
@@ -224,8 +219,7 @@ if test "$enable_debug" = "yes"; then
LOOLWSD_LOGLEVEL="trace"
LOOLWSD_LOG_TO_FILE="true"
LOOLWSD_LOGFILE="/tmp/loolwsd.log"
- LOOLWSD_ANONYMIZE_FILENAMES=false
- LOOLWSD_ANONYMIZE_USERNAMES=false
+ LOOLWSD_ANONYMIZE_USER_DATA=false
LOLEAFLET_LOGGING="true"
debug_msg="low security debugging mode"
else
@@ -252,22 +246,15 @@ if test -n "$with_logfile" ; then
fi
AC_SUBST(LOOLWSD_LOGFILE)
-if test "$enable_anonymize_filenames" = "yes" ; then
- LOOLWSD_ANONYMIZE_FILENAMES=true
- anonym_msg="filenames anonymized; "
-fi
-AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_FILENAMES],[$LOOLWSD_ANONYMIZE_FILENAMES],[Enable
permanent filenames anonymization in logs])
-AC_SUBST(LOOLWSD_ANONYMIZE_FILENAMES)
-
-if test "$enable_anonymize_usernames" = "yes" ; then
- LOOLWSD_ANONYMIZE_USERNAMES=true
- anonym_msg="${anonym_msg}usernames anonymized; "
+if test "$enable_anonymization" = "yes" ; then
+ LOOLWSD_ANONYMIZE_USER_DATA=true
+ anonym_msg="anonymization of user-data is enabled"
fi
-AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_USERNAMES],[$LOOLWSD_ANONYMIZE_USERNAMES],[Enable
permanent usernames anonymization in logs])
-AC_SUBST(LOOLWSD_ANONYMIZE_USERNAMES)
+AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_USER_DATA],[$LOOLWSD_ANONYMIZE_USER_DATA],[Enable
permanent anonymization in logs])
+AC_SUBST(LOOLWSD_ANONYMIZE_USER_DATA)
if test -z "$anonym_msg"; then
- anonym_msg="no anonymization of usernames or filenames"
+ anonym_msg="anonymization of user-data is disabled"
fi
# macOS: When configuring for building the app itself, on macOS, we need these.
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index c76e4cf50..425c0b5fb 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -112,8 +112,7 @@ using std::size_t;
class Document;
static std::shared_ptr document;
#ifndef BUILDING_TESTS
-static bool AnonymizeFilenames = false;
-static bool AnonymizeUsernames = false;
+static bool AnonymizeUserData = false;
static std::string ObfuscatedFileId;
#endif
@@ -2236,7 +2235,7 @@ protected:
logger << _socketName << ": recv [";
for (const std::string& token : tokens)
{
-// Don't log PII, there are anonymized versions that get
logged instead.
+// Don't log user-data, there are anonymized versions that get
logged instead.
if (Util::startsWith(token, "jail") ||
Util::startsWith(token, "author") ||
Util::startsWith(token, "name") ||
@@ -2468,10 +2467,8 @@ void lokit_main(
LOG_INF("Setting log-level to [trace] and delaying setting to
configured [" << LogLevel
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am
configure.ac | 14 ++ loleaflet/Makefile.am |7 +++ 2 files changed, 21 insertions(+) New commits: commit 16fcd372015b3bc9a3f5d8b5abf7b76aec5c7c1f Author: Samuel Mehrbrodt AuthorDate: Fri Jun 21 10:43:53 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Fri Jun 28 12:32:43 2019 +0200 configure: Add support for custom icons Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9 Reviewed-on: https://gerrit.libreoffice.org/74491 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/configure.ac b/configure.ac index 7d1928b2e..c9446f35a 100644 --- a/configure.ac +++ b/configure.ac @@ -109,6 +109,10 @@ AC_ARG_WITH([app-name], AS_HELP_STRING([--with-app-name=], [Set the user-visible name of the app you build.])) +AC_ARG_WITH([icon-theme], + AS_HELP_STRING([--with-icon-theme=], + [Path to custom icon theme (similiar to loleflet/images).])) + AC_ARG_WITH(vendor, AS_HELP_STRING([--with-vendor="John the Builder"], [Set vendor of the build.]), @@ -410,6 +414,16 @@ AC_SUBST(ENABLE_IOSAPP) AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"]) AC_SUBST(IOSAPP_BUNDLE_VERSION) +AC_MSG_CHECKING([for custom icon theme]) +CUSTOM_ICONS_DIRECTORY= +if test -d "$with_icon_theme"; then +CUSTOM_ICONS_DIRECTORY=`readlink -f $with_icon_theme` +AC_MSG_RESULT([$CUSTOM_ICONS_DIRECTORY]) +else +AC_MSG_RESULT([no]) +fi +AC_SUBST(CUSTOM_ICONS_DIRECTORY) + ENABLE_GTKAPP= if test "$enable_gtkapp" = "yes"; then ENABLE_GTKAPP=true diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 1df4350aa..456400f64 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -30,6 +30,8 @@ JQUERY_MINIFIED_DIST_IMAGES = $(patsubst $(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(b LOLEAFLET_IMAGES_SRC = $(shell find $(srcdir)/images -name '*.*') LOLEAFLET_IMAGES_DST = $(patsubst $(srcdir)/%,$(builddir)/dist/%,$(LOLEAFLET_IMAGES_SRC)) +LOLEAFLET_IMAGES_CUSTOM_SRC = $(shell find $(CUSTOM_ICONS_DIRECTORY) -name '*.*') +LOLEAFLET_IMAGES_CUSTOM_DST = $(patsubst $(CUSTOM_ICONS_DIRECTORY)/%,$(builddir)/dist/images/%,$(LOLEAFLET_IMAGES_CUSTOM_SRC)) LOLEAFLET_L10N_SRC = $(shell find $(srcdir)/l10n -name '*.*') if !ENABLE_IOSAPP @@ -140,6 +142,7 @@ endif build-loleaflet: | $(LOLEAFLET_L10N_DST) \ $(L10N_JSON) \ $(LOLEAFLET_IMAGES_DST) \ + $(LOLEAFLET_IMAGES_CUSTOM_DST) \ $(JQUERY_LIGHTNESS_DIST_IMAGES) \ $(JQUERY_MINIFIED_DIST_IMAGES) \ $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \ @@ -245,6 +248,10 @@ $(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js `ln -sf $(abs_srcdir)/$< $@`; \ fi +$(builddir)/dist/images/%: $(CUSTOM_ICONS_DIRECTORY)/% + @mkdir -p $(dir $@) + @cp $< $@ + $(builddir)/dist/images/%: $(srcdir)/images/% @mkdir -p $(dir $@) @cp $< $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cbbe43fcff2f16b46befc2ebd572b1c8cc67b1be Author: Samuel Mehrbrodt AuthorDate: Wed May 22 12:06:59 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Wed May 22 12:07:07 2019 +0200 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 1dbbc5acc7d51adc363c2b43a24afae4b17971a6. Change-Id: Ifa38144f830578c12cda7454354b60d09426e704 Reviewed-on: https://gerrit.libreoffice.org/72734 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/configure.ac b/configure.ac index 2a2f3e231..9fd6bfaee 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) -AC_INIT([libreoffice-online], [master], [libreoffice@lists.freedesktop.org]) +AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org]) LT_INIT([shared, disable-static, dlopen]) AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1dbbc5acc7d51adc363c2b43a24afae4b17971a6 Author: Samuel Mehrbrodt AuthorDate: Mon May 20 13:31:39 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Tue May 21 17:29:15 2019 +0200 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 Tested-by: Samuel Mehrbrodt diff --git a/configure.ac b/configure.ac index 9fd6bfaee..2a2f3e231 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) -AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org]) +AC_INIT([libreoffice-online], [master], [libreoffice@lists.freedesktop.org]) LT_INIT([shared, disable-static, dlopen]) AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/Mobile.xcodeproj loleaflet/html
configure.ac | 18 ++
ios/Mobile.xcodeproj/project.pbxproj |4
loleaflet/html/loleaflet.html.m4 |2 ++
3 files changed, 24 insertions(+)
New commits:
commit 60581962af6daecc5d18c2c26f372ad28c0f8e94
Author: Tor Lillqvist
AuthorDate: Mon Apr 22 15:22:04 2019 +0300
Commit: Tor Lillqvist
CommitDate: Mon Apr 22 17:23:20 2019 +0300
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.
diff --git a/configure.ac b/configure.ac
index 988c36a62..9fd6bfaee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,12 @@ AC_ARG_WITH([iosapp-fonts],
[Point to a directory containing .ttf or .otf
files to be bundled in the iOS app (and
thus installed on the device for use of the LO
core code).]))
+AC_ARG_WITH([iosapp-branding],
+ AS_HELP_STRING([--with-iosapp-branding=],
+ [Point to a directory containing a branding.css
file and possibly other files it references,
+ to be bundled and used by the iOS app. The
directory structure is copied to
+ "loleaflet/dist/branding" and that directory
ends upp in the app bundle as "branding".]))
+
AC_ARG_ENABLE([gtkapp],
AS_HELP_STRING([--enable-gtkapp],
[Use in a tree where the only purpose is to build
the gtk+ "app" that is supposed
@@ -731,6 +737,18 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
echo 'Fonts/'$(basename
$fname)''
done`
fi
+ rm -rf ios/Mobile/Branding
+ mkdir ios/Mobile/Branding
+ if test "$with_iosapp_branding" != no -a -d "$with_iosapp_branding";
then
+ AC_MSG_NOTICE([copying branding files])
+ mkdir -p loleaflet/dist/branding
+ (cd "$with_iosapp_branding" && tar cf - .) | (cd
ios/Mobile/Branding && tar xf -)
+ else
+ # A Branding/branding.css file must exist, it is
+ # referenced unconditionally in loleaflet.html in the
+ # iOS app.
+ touch ios/Mobile/Branding/branding.css
+ fi
fi
])
AC_SUBST(IOSAPP_FONTS)
diff --git a/ios/Mobile.xcodeproj/project.pbxproj
b/ios/Mobile.xcodeproj/project.pbxproj
index 119e90303..c4ec1ae61 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
BE00F8A821396585001CE2D4 /* images in Resources */ = {isa =
PBXBuildFile; fileRef = BE00F89E21396585001CE2D4 /* images */; };
BE00F8B5213ED543001CE2D4 /* libiconv.tbd in Frameworks */ =
{isa = PBXBuildFile; fileRef = BE00F8B4213ED543001CE2D4 /* libiconv.tbd */; };
BE00F8B7213ED573001CE2D4 /* libz.tbd in Frameworks */ = {isa =
PBXBuildFile; fileRef = BE00F8B6213ED573001CE2D4 /* libz.tbd */; };
+ BE18C7DE226DE09A001AD27E /* Branding in Resources */ = {isa =
PBXBuildFile; fileRef = BE18C7DD226DE09A001AD27E /* Branding */; };
BE5EB5C1213FE29900E0826C /* Log.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = BE5EB5B9213FE29900E0826C /* Log.cpp */; };
BE5EB5C2213FE29900E0826C /* SpookyV2.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = BE5EB5BA213FE29900E0826C /* SpookyV2.cpp */; };
BE5EB5C3213FE29900E0826C /* Session.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = BE5EB5BB213FE29900E0826C /* Session.cpp */; };
@@ -75,6 +76,7 @@
BE00F89E21396585001CE2D4 /* images */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = images; path =
../../../loleaflet/dist/images; sourceTree = ""; };
BE00F8B4213ED543001CE2D4 /* libiconv.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
BE00F8B6213ED573001CE2D4 /* libz.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+ BE18C7DD226DE09A001AD27E /* Branding */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = Branding; path =
Mobile/Branding; sourceTree = SOURCE_ROOT; };
BE34D10F218B66B600815297 /* docsh.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docsh.cxx;
path = "../../ios-device/sw/source/uibase/app/docsh.cxx"; sourceTree =
""; };
BE34D110218B6
[Libreoffice-commits] online.git: configure.ac ios/config.h.in ios/Mobile loleaflet/Makefile.am wsd/LOOLWSD.cpp
configure.ac | 20 +++-
ios/Mobile/Info.plist.in |2 +-
ios/config.h.in |2 ++
loleaflet/Makefile.am|2 +-
wsd/LOOLWSD.cpp |3 +++
5 files changed, 18 insertions(+), 11 deletions(-)
New commits:
commit ea659b3d99e848f7c066162ef9450d14ff737f54
Author: Jan Holesovsky
AuthorDate: Sat Mar 30 19:12:19 2019 +0100
Commit: Jan Holesovsky
CommitDate: Fri Apr 12 13:44:40 2019 +0200
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
Tested-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index bb583b2d8..944a7d624 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,10 +73,6 @@ AC_ARG_ENABLE([iosapp],
to be copied to a Mac where the iOS app is being
built, *or* in a tree where
you will build the iOS app.]))
-AC_ARG_WITH([iosapp-name],
- AS_HELP_STRING([--with-iosapp-name=],
- [Set the user-visible name of the iOS app you
build. Default "Mobile".]))
-
AC_ARG_WITH([iosapp-appicon],
AS_HELP_STRING([--with-iosapp-appicon=],
[Point to a directory containing an icon set to
use instead of the default empty one.]))
@@ -98,6 +94,10 @@ AC_ARG_ENABLE([androidapp],
to work similarly to the iOS app, from the
JavaScript and the pseudo WebSocket
message plumbing point of view.]))
+AC_ARG_WITH([app-name],
+ AS_HELP_STRING([--with-app-name=],
+ [Set the user-visible name of the app you
build.]))
+
AC_ARG_ENABLE([seccomp],
AS_HELP_STRING([--disable-seccomp],
[Disable use of linux/seccomp.h header when
kernel on target system does not support it.
@@ -320,15 +320,18 @@ AC_SUBST(LIBPNG_INCLUDES)
AC_SUBST(LIBPNG_LIBS)
AC_SUBST(LOKIT_PATH)
+APP_NAME="LOOL"
+if test -n "$with_app_name"; then
+ APP_NAME="$with_app_name"
+fi
+AC_DEFINE_UNQUOTED([APP_NAME],["$APP_NAME"],[The user-visible name of the app
you build.])
+AC_SUBST(APP_NAME)
+
ENABLE_IOSAPP=
-MOBILE_APP_NAME="Mobile"
IOSAPP_BUNDLE_VERSION=
if test "$enable_iosapp" = "yes"; then
ENABLE_IOSAPP=true
- if test -n "$with_iosapp_name"; then
- MOBILE_APP_NAME="$with_iosapp_name"
- fi
if test -f BUNDLE-VERSION; then
IOSAPP_BUNDLE_VERSION=$(cat BUNDLE-VERSION)
@@ -340,7 +343,6 @@ fi
AC_SUBST(ENABLE_IOSAPP)
AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
-AC_SUBST(MOBILE_APP_NAME)
AC_SUBST(IOSAPP_BUNDLE_VERSION)
ENABLE_GTKAPP=
diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index d9423c112..a6d431808 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -210,7 +210,7 @@
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
-@MOBILE_APP_NAME@
+@APP_NAME@
CFBundleDocumentTypes
diff --git a/ios/config.h.in b/ios/config.h.in
index 59bc7a5f4..58854944e 100644
--- a/ios/config.h.in
+++ b/ios/config.h.in
@@ -1,6 +1,8 @@
/* config.h. Manually edited from config.h.in. */
/* config.h.in. Generated from configure.ac by autoheader. */
+#define APP_NAME "@APP_NAME@"
+
/* Whether to disable SECCOMP */
#define DISABLE_SECCOMP 1
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index d6cff247e..2f3132365 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -222,7 +222,7 @@ $(builddir)/dist/loleaflet.html:
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
-DIOSAPP=$(ENABLE_IOSAPP) \
-DGTKAPP=$(ENABLE_GTKAPP) \
-DANDROIDAPP=$(ENABLE_ANDROIDAPP) \
- -DMOBILEAPPNAME="$(MOBILE_APP_NAME)" \
+ -DMOBILEAPPNAME="$(APP_NAME)" \
-DLOLEAFLET_CSS="$(subst
$(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \
-DBUNDLE_CSS="$(abs_builddir)/dist/bundle.css" \
-DGLOBAL_JS="$(abs_builddir)/dist/global.js" \
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e7365eef2..57ddfd705 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2780,6 +2780,9 @@ private:
// Hint to encourage use on mobile devices
capabilities->set("hasMobileSupport", true);
+// Set the product name
+capabilities->set("productName", APP_NAME);
+
std::ostringstream ostrJSON;
capabilities->stringify(ostrJSON);
return ostrJSON.str();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f46d5e98451b03ff9fe7bc4eb29de92c7a24c75e
Author: Samuel Mehrbrodt
AuthorDate: Mon Apr 1 13:13:44 2019 +0200
Commit: Michael Meeks
CommitDate: Mon Apr 1 13:37:35 2019 +0200
NPM: require at least v5.0.0
This is necessary after 338563ab451fcb02eaf70b1bbc460d299371f2b4
Change-Id: I026dba613349931a95fd71b126e72605d1546140
Reviewed-on: https://gerrit.libreoffice.org/70054
Reviewed-by: Alexandru Vlăduţu
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/configure.ac b/configure.ac
index 91a90e984..bb583b2d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,8 +633,8 @@ AS_IF([test `uname -s` = "Linux"],
AC_MSG_ERROR([npm required to build loleaflet, but not installed])
else
NPM_VER=`npm -v | awk -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
- if test "$NPM_VER" -ge 30900 -a "$NPM_VER" -lt 31004; then
- AC_MSG_ERROR([This npm version is buggy, either upgrade to >=
3.10.4 or downgrade to < 3.9.0])
+ if test "$NPM_VER" -lt 5; then
+ AC_MSG_ERROR([This npm version is too old, upgrade to >= 5.0.0])
fi
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit da2bdd62dac469d6ae06f6be2b197efff316cb18 Author: Henry Castro AuthorDate: Sat Mar 30 16:32:49 2019 -0400 Commit: Henry Castro CommitDate: Sat Mar 30 16:35:40 2019 -0400 configure: update links for directory "archived-packages" Change-Id: Iea7d5f867b5a7a2f987b0513d33ffb675729de97 diff --git a/configure.ac b/configure.ac index b99020a7a..91a90e984 100644 --- a/configure.ac +++ b/configure.ac @@ -678,7 +678,7 @@ AC_SUBST(ENABLE_SETCAP) AC_CONFIG_LINKS([discovery.xml:discovery.xml]) AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu]) AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json]) -AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap]) +AC_LINK_FILES([loleaflet/archived-packages], [loleaflet/archived-packages]) AS_IF([test "$ENABLE_IOSAPP" = "true"], [ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |6 ++ 1 file changed, 6 insertions(+) New commits: commit a6b2708ef58fd23dd536606ec8fe4778c285952f Author: Henry Castro AuthorDate: Sun Feb 10 11:38:03 2019 -0400 Commit: Henry Castro CommitDate: Tue Mar 5 17:31:57 2019 -0400 configure: check "msgfmt" installation Change-Id: Ib6661e3e79e4ceba6379097875d5d1e7998838e6 diff --git a/configure.ac b/configure.ac index dc4a51977..651a0660e 100644 --- a/configure.ac +++ b/configure.ac @@ -225,6 +225,12 @@ else fi AC_SUBST(ENABLE_BROWSERSYNC) +AC_CHECK_PROGS(MSGFMT, [msgfmt]) +AC_CHECK_PROGS(MSGCAT, [msgcat]) +if test -z "$MSGFMT"; then +AC_MSG_ERROR([msgfmt not found. Install GNU gettext]) +fi + if test -n "$with_logfile" ; then LOOLWSD_LOGFILE="$with_logfile" fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/config.h.in ios/ios.mm ios/Mobile loolwsd.xml.in Makefile.am test/run_unit.sh.in wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp wsd/LO
Makefile.am | 26 +---
configure.ac| 15 -
ios/Mobile/Document.mm |6 -
ios/Mobile/Resources/Settings.bundle/Root.plist | 10 -
ios/config.h.in |3 --
ios/ios.mm |8 ---
loolwsd.xml.in |1
test/run_unit.sh.in |4 ---
wsd/DocumentBroker.cpp | 11 --
wsd/DocumentBroker.hpp |1
wsd/LOOLWSD.cpp | 17 ---
wsd/LOOLWSD.hpp |2 -
12 files changed, 6 insertions(+), 98 deletions(-)
New commits:
commit 8f71365f0f51c6f2b4144fd7c5674d23363a83bf
Author: Tor Lillqvist
AuthorDate: Fri Feb 15 21:22:41 2019 +0200
Commit: Michael Meeks
CommitDate: Fri Feb 15 21:36:16 2019 +0100
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
Tested-by: Michael Meeks
diff --git a/Makefile.am b/Makefile.am
index 401ad72e6..2a6a1ef5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -270,15 +270,11 @@ $(SYSTEM_STAMP) : ${top_srcdir}/loolwsd-systemplate-setup
@JAILS_PATH@ :
mkdir -p $@
-@TILECACHE_PATH@ :
- mkdir -p $@
-
clean-local:
if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@"; fi
if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@";
fi
- if test "z@TILECACHE_PATH@" != "z"; then rm -rf "@TILECACHE_PATH@"; fi
-run: all @TILECACHE_PATH@ @JAILS_PATH@
+run: all @JAILS_PATH@
@echo "Launching loolwsd"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -287,14 +283,13 @@ run: all @TILECACHE_PATH@ @JAILS_PATH@
@echo
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=true --o:logging.level=trace
-run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@
+run-valgrind: all @JAILS_PATH@
@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -303,14 +298,13 @@ run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@
valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=false
--o:logging.level=trace
-run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@
+run-gdb: all @JAILS_PATH@
@echo "Launching loolwsd under valgrind's callgrind"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -320,14 +314,13 @@ run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@
./loolwsd --o:security.capabilities="false" \
--o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:ad
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a5a7112310a622eea65fc04045b65181f7b9c1c Author: Tor Lillqvist AuthorDate: Tue Jan 22 23:49:47 2019 +0200 Commit: Tor Lillqvist CommitDate: Tue Jan 22 23:50:19 2019 +0200 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 diff --git a/configure.ac b/configure.ac index d5e3c1726..9f446a6f3 100644 --- a/configure.ac +++ b/configure.ac @@ -622,9 +622,9 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"], [ if test `uname -s` = "Darwin"; then IOSAPP_FONTS='' + mkdir -p ios/Mobile/Fonts if test "$with_iosapp_fonts" != no -a -d "$with_iosapp_fonts"; then AC_MSG_NOTICE([copying fonts to be bundled]) - mkdir -p ios/Mobile/Fonts IOSAPP_FONTS=`find "$with_iosapp_fonts" -type f | while read fname; do cp "$fname" ios/Mobile/Fonts ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 4691d2b18a1e20e286672083eb9a57443c6f8ce3
Author: Samuel Mehrbrodt
AuthorDate: Tue Jan 8 18:49:12 2019 +0100
Commit: Samuel Mehrbrodt
CommitDate: Tue Jan 8 18:49:12 2019 +0100
Add some messages whether we are building with support key
Change-Id: If41767c549e9e46b7f0a6f23fa5d819a946f9bdb
diff --git a/configure.ac b/configure.ac
index f8b12322d..d5e3c1726 100644
--- a/configure.ac
+++ b/configure.ac
@@ -474,6 +474,7 @@ AC_CHECK_HEADERS([security/pam_appl.h],
[AC_MSG_ERROR([header security/pam_appl.h not found, install
PAM development package])])
AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([No. Install PAM development
package])])
+AC_MSG_CHECKING([whether to build with support public key])
if test "x$with_support_public_key" != "x"; then
AC_DEFINE([ENABLE_SUPPORT_KEY],1,[Whether to enable support key])
@@ -481,9 +482,11 @@ if test "x$with_support_public_key" != "x"; then
echo -e "#ifndef INCLUDED_SUPPORT_PUBLIC_KEY_HPP\n#define
INCLUDED_SUPPORT_PUBLIC_KEY_HPP\n#include \nconst static std::string
SUPPORT_PUBLIC_KEY(" > "${srcdir}/common/support-public-key.hpp"
sed 's/\(.*\)/"\1\\n"/' "$with_support_public_key" >>
"${srcdir}/common/support-public-key.hpp"
echo -e ");\n#endif" >> "${srcdir}/common/support-public-key.hpp"
+AC_MSG_RESULT([yes])
else
AC_DEFINE([ENABLE_SUPPORT_KEY],0,[Whether to enable support key])
rm -f "${srcdir}/common/support-public-key.hpp"
+AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_SUPPORT_KEY)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loolwsd.xml.in wsd/LOOLWSD.cpp
configure.ac| 10 ++
loolwsd.xml.in |2 +-
wsd/LOOLWSD.cpp |1 +
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 279301e51d8975074177c36c33d4b432c0247c98
Author: Andras Timar
AuthorDate: Tue Dec 11 12:55:16 2018 +0100
Commit: Andras Timar
CommitDate: Tue Dec 11 12:55:16 2018 +0100
New configure switch --enable-vereign to set the default document signing
url
Change-Id: I65225fc5f94a8ad49b75d31ef3535e8479484e69
diff --git a/configure.ac b/configure.ac
index fbde02a02..f8b12322d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,9 @@ AC_ARG_ENABLE([werror],
AS_HELP_STRING([--disable-werror],
[Do not turn warnings into errors.]))
+AC_ARG_ENABLE([vereign],
+AS_HELP_STRING([--enable-vereign],
+ [Set Vereign document_signing_url configuration key
to the default app.vereign.com.]))
# Handle options
AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
[POCO_DEBUG_SUFFIX=d],
@@ -303,6 +306,13 @@ AS_IF([test "$MAX_DOCUMENTS" -lt "2"],
AC_DEFINE_UNQUOTED([MAX_DOCUMENTS],[$MAX_DOCUMENTS],[Limit the maximum number
of open documents])
AC_SUBST(MAX_DOCUMENTS)
+VEREIGN_URL=
+if test "$enable_vereign" = "yes"; then
+VEREIGN_URL="https://app.vereign.com";
+fi
+AC_DEFINE_UNQUOTED([VEREIGN_URL],["$VEREIGN_URL"],[Default value of
per_documents.document_signing_url])
+AC_SUBST(VEREIGN_URL)
+
# Test for build environment
AS_IF([test "$ENABLE_GTKAPP" != true],
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 0ce943bbd..81831e43b 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -17,7 +17,7 @@
1
4
-
+@VEREIGN_URL@
true
3600
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 22d570b53..87cbd070c 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -783,6 +783,7 @@ void LOOLWSD::initialize(Application& self)
{ "net.service_root", "" },
{ "num_prespawn_children", "1" },
{ "per_document.autosave_duration_secs", "300" },
+{ "per_document.document_signing_url", VEREIGN_URL },
{ "per_document.idle_timeout_secs", "3600" },
{ "per_document.idlesave_duration_secs", "30" },
{ "per_document.limit_file_size_mb", "0" },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac .gitignore ios/Mobile ios/Mobile.xcodeproj
.gitignore |1 +
configure.ac | 22 ++
ios/Mobile.xcodeproj/project.pbxproj |4
ios/Mobile/Info.plist.in |1 +
4 files changed, 28 insertions(+)
New commits:
commit 3c046b05487a786dccbd47a8e9cfaf44ff9fc345
Author: Tor Lillqvist
AuthorDate: Tue Nov 27 17:06:22 2018 +0200
Commit: Tor Lillqvist
CommitDate: Tue Nov 27 17:06:22 2018 +0200
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
diff --git a/.gitignore b/.gitignore
index a853fa87f..7e2fcfaee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,7 @@ docker/instdir
docker/builddir
ios/Mobile/Info.plist
+ios/Mobile/Fonts
# symlinks created by configure for the iOS app Xcode project
lobuilddir-symlink
diff --git a/configure.ac b/configure.ac
index bc7353d42..fbde02a02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,11 @@ AC_ARG_WITH([iosapp-appicon],
AS_HELP_STRING([--with-iosapp-appicon=],
[Point to a directory containing an icon set to
use instead of the default empty one.]))
+AC_ARG_WITH([iosapp-fonts],
+ AS_HELP_STRING([--with-iosapp-fonts=],
+ [Point to a directory containing .ttf or .otf
files to be bundled in the iOS app (and
+ thus installed on the device for use of the LO
core code).]))
+
AC_ARG_ENABLE([gtkapp],
AS_HELP_STRING([--enable-gtkapp],
[Use in a tree where the only purpose is to build
the gtk+ "app" that is supposed
@@ -600,6 +605,23 @@ AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu])
AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json])
AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap])
+AS_IF([test "$ENABLE_IOSAPP" = "true"],
+ [
+ if test `uname -s` = "Darwin"; then
+ IOSAPP_FONTS=''
+ if test "$with_iosapp_fonts" != no -a -d "$with_iosapp_fonts"; then
+ AC_MSG_NOTICE([copying fonts to be bundled])
+ mkdir -p ios/Mobile/Fonts
+ IOSAPP_FONTS=`find "$with_iosapp_fonts" -type f |
+while read fname; do
+ cp "$fname" ios/Mobile/Fonts
+ echo 'Fonts/'$(basename
$fname)''
+done`
+ fi
+ fi
+ ])
+AC_SUBST(IOSAPP_FONTS)
+
AC_CONFIG_FILES([Makefile
gtk/Makefile
ios/config.h
diff --git a/ios/Mobile.xcodeproj/project.pbxproj
b/ios/Mobile.xcodeproj/project.pbxproj
index a3adce50a..c5f58c506 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -31,6 +31,7 @@
BE5EB5DA2140363100E0826C /* ios.mm in Sources */ = {isa =
PBXBuildFile; fileRef = BE5EB5D92140363100E0826C /* ios.mm */; };
BE5EB5DC2140480B00E0826C /* ICU.dat in Resources */ = {isa =
PBXBuildFile; fileRef = BE5EB5DB2140480B00E0826C /* ICU.dat */; };
BE6362C22153B5B500F4237E /* MobileCoreServices.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = BE6362C12153B5B500F4237E /*
MobileCoreServices.framework */; };
+ BE80E43221AD92F700859C97 /* Fonts in Resources */ = {isa =
PBXBuildFile; fileRef = BE80E43121AD92F600859C97 /* Fonts */; };
BE8D772C2136762500AC58EA /* AppDelegate.mm in Sources */ = {isa
= PBXBuildFile; fileRef = BE8D772B2136762500AC58EA /* AppDelegate.mm */; };
BE8D772F2136762500AC58EA /* DocumentBrowserViewController.mm in
Sources */ = {isa = PBXBuildFile; fileRef = BE8D772E2136762500AC58EA /*
DocumentBrowserViewController.mm */; };
BE8D77322136762500AC58EA /* DocumentViewController.mm in
Sources */ = {isa = PBXBuildFile; fileRef = BE8D77312136762500AC58EA /*
DocumentViewController.mm */; };
@@ -334,6 +335,7 @@
BE5EB5DB2140480B00E0826C /* ICU.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = ICU.dat; path =
../../../ICU.dat; sourceTree = ""; };
BE636210215101D000F4237E /* WebSocketHandler.hpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path
= WebSocketHandler.hpp; sourceTree = ""; };
BE6362C12153B5B500F4237E /* MobileCoreServices.framework */ =
{isa = PBXFileReference; lastKnownFileType = wrapper.framework; name =
MobileCoreServices.framework; path =
System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+ BE80E43121AD92F600859C97 /* Fonts */ = {isa = PBXFileReference;
lastKnownFileType = folder; name = Fonts; path = Mobile/Fonts; sourceTree =
SOURCE_ROOT; };
BE8D77272136762500AC58EA /* Mobil
[Libreoffice-commits] online.git: configure.ac ios/config.h ios/config.h.in
configure.ac|1 + ios/config.h.in |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 8dee7815428e5895bb4876901fa58f9afe2231ed Author: Tor Lillqvist AuthorDate: Tue Nov 27 01:03:00 2018 +0200 Commit: Tor Lillqvist CommitDate: Tue Nov 27 01:05:04 2018 +0200 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 diff --git a/configure.ac b/configure.ac index cc23e8c31..bc7353d42 100644 --- a/configure.ac +++ b/configure.ac @@ -602,6 +602,7 @@ AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap]) AC_CONFIG_FILES([Makefile gtk/Makefile + ios/config.h ios/Mobile/Info.plist test/Makefile loleaflet/Makefile diff --git a/ios/config.h b/ios/config.h.in similarity index 96% rename from ios/config.h rename to ios/config.h.in index 9f4751035..0911b21fc 100644 --- a/ios/config.h +++ b/ios/config.h.in @@ -70,10 +70,10 @@ #define LOOLWSD_CACHEDIR lo_ios_app_getCacheDir() /* LibreOffice Online WebSocket server version */ -#define LOOLWSD_VERSION "master" // ??? +#define LOOLWSD_VERSION "@LOOLWSD_VERSION@" /* LibreOffice Online git hash if present */ -#define LOOLWSD_VERSION_HASH "xx" // ??? +#define LOOLWSD_VERSION_HASH "@LOOLWSD_VERSION_HASH@" /* Path to LibreOffice installation */ #define LO_PATH "." ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac ios/README
configure.ac |2 +- ios/README |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit a9f6d57dc831dd245bed01304c2da5d0e0cb Author: Tor Lillqvist AuthorDate: Fri Nov 23 11:26:05 2018 +0200 Commit: Tor Lillqvist CommitDate: Fri Nov 23 11:26:57 2018 +0200 Correct a few leftover mentions of "Mobile/Mobile" to "ios/Mobile" Change-Id: Ie2e44bda495f3a08fc91c8d9fe40f9d1d9607283 diff --git a/configure.ac b/configure.ac index 4446e4b51..cc23e8c31 100644 --- a/configure.ac +++ b/configure.ac @@ -99,7 +99,7 @@ AC_ARG_WITH([lo-builddir], AS_HELP_STRING([--with-lo-builddir=], [Mandatory, and relevant, in a tree where building the iOS app. Path to a the build directory of the LibreOffice core source tree you want to use. -In addition you MUST manually edit the Mobile/Mobile.xcodeproj/project.pbxproj +In addition you MUST manually edit the ios/Mobile.xcodeproj/project.pbxproj file and change the references to "../ios-device" to refer to the corresponding LibreOffice core source directory (which typically would be the same as the build directory you specify with this option).])) diff --git a/ios/README b/ios/README index 923ff08b2..525d8c9b4 100644 --- a/ios/README +++ b/ios/README @@ -36,7 +36,7 @@ where misan.local is the macOS machine where I build the app, in the ~lo/online-ios-device folder. 4) In the online folder form step 2, edit the -Mobile/Mobile.xcodeproj/project.pbxproj file in your favourite text +ios/Mobile.xcodeproj/project.pbxproj file in your favourite text editor. Change LOSRCDIR and all instances of "../ios-device" to refer the the @@ -51,7 +51,7 @@ and ./configure --enable-iosapp --with-iosapp-name="My Own Mobile LibreOffice" --with-lo-builddir=$HOME/lo/ios --with-poco-includes=/opt/ios-poco/include --with-poco-libs=/opt/ios-poco/lib The configure script puts the app name as the CFBundleDisplayName -property into the Mobile/Mobile/Info.plist file, and set up some +property into the ios/Mobile/Info.plist file, and set up some symbolic links that point to the LIbreOffice core source and build directories (which can be the same, of course). ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac .gitignore ios/Mobile ios/Mobile.xcodeproj ios/README ios/TestFakeSocket Mobile/Mobile Mobile/Mobile.xcodeproj Mobile/README Mobile/TestFakeSocket
.gitignore |4 ++-- configure.ac | 10 +- 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit a6eadf4e8137584b4066ea5e316675540c1e4fa2 Author: Tor Lillqvist AuthorDate: Thu Nov 22 16:50:57 2018 +0200 Commit: Tor Lillqvist CommitDate: Thu Nov 22 16:50:57 2018 +0200 Move the iOS app to the ios folder Change-Id: I46e0722b027e93f90b5cd6a74cd7dc46f6c8cea2 diff --git a/.gitignore b/.gitignore index f910a6d82..a853fa87f 100644 --- a/.gitignore +++ b/.gitignore @@ -80,11 +80,11 @@ test/TAGS docker/instdir docker/builddir -Mobile/Mobile/Info.plist +ios/Mobile/Info.plist # symlinks created by configure for the iOS app Xcode project lobuilddir-symlink pocoinclude-symlink pocolib-symlink ICU.dat -Mobile/Mobile/Assets.xcassets/AppIcon.appiconset +ios/Mobile/Assets.xcassets/AppIcon.appiconset diff --git a/configure.ac b/configure.ac index b2480942c..4446e4b51 100644 --- a/configure.ac +++ b/configure.ac @@ -602,7 +602,7 @@ AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap]) AC_CONFIG_FILES([Makefile gtk/Makefile - Mobile/Mobile/Info.plist + ios/Mobile/Info.plist test/Makefile loleaflet/Makefile loleaflet/npm-shrinkwrap.json @@ -657,12 +657,12 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"], # Sadly Xcode doesn't like it if AppIcon.appiconset is a # symlink, so make it a directory of symlinks to the actual png # and json files. - rm -rf Mobile/Mobile/Assets.xcassets/AppIcon.appiconset - mkdir Mobile/Mobile/Assets.xcassets/AppIcon.appiconset + rm -rf ios/Mobile/Assets.xcassets/AppIcon.appiconset + mkdir ios/Mobile/Assets.xcassets/AppIcon.appiconset if test -n "$with_iosapp_appicon"; then - ln -s "$with_iosapp_appicon"/* Mobile/Mobile/Assets.xcassets/AppIcon.appiconset + ln -s "$with_iosapp_appicon"/* ios/Mobile/Assets.xcassets/AppIcon.appiconset else - ln -s Mobile/Mobile/Assets.xcassets/Empty.appiconset/* Mobile/Mobile/Assets.xcassets/AppIcon.appiconset + ln -s ios/Mobile/Assets.xcassets/Empty.appiconset/* ios/Mobile/Assets.xcassets/AppIcon.appiconset fi fi ], diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj b/ios/Mobile.xcodeproj/project.pbxproj similarity index 100% rename from Mobile/Mobile.xcodeproj/project.pbxproj rename to ios/Mobile.xcodeproj/project.pbxproj diff --git a/Mobile/Mobile/AppDelegate.h b/ios/Mobile/AppDelegate.h similarity index 100% rename from Mobile/Mobile/AppDelegate.h rename to ios/Mobile/AppDelegate.h diff --git a/Mobile/Mobile/AppDelegate.mm b/ios/Mobile/AppDelegate.mm similarity index 100% rename from Mobile/Mobile/AppDelegate.mm rename to ios/Mobile/AppDelegate.mm diff --git a/Mobile/Mobile/Assets.xcassets/Contents.json b/ios/Mobile/Assets.xcassets/Contents.json similarity index 100% rename from Mobile/Mobile/Assets.xcassets/Contents.json rename to ios/Mobile/Assets.xcassets/Contents.json diff --git a/Mobile/Mobile/Assets.xcassets/Empty.appiconset/Contents.json b/ios/Mobile/Assets.xcassets/Empty.appiconset/Contents.json similarity index 100% rename from Mobile/Mobile/Assets.xcassets/Empty.appiconset/Contents.json rename to ios/Mobile/Assets.xcassets/Empty.appiconset/Contents.json diff --git a/Mobile/Mobile/Assets.xcassets/Image.imageset/Contents.json b/ios/Mobile/Assets.xcassets/Image.imageset/Contents.json similarity index 100% rename from Mobile/Mobile/Assets.xcassets/Image.imageset/Contents.json rename to ios/Mobile/Assets.xcassets/Image.imageset/Contents.json diff --git a/Mobile/Mobile/Base.lproj/LaunchScreen.storyboard b/ios/Mobile/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Mobile/Mobile/Base.lproj/LaunchScreen.storyboard rename to ios/Mobile/Base.lproj/LaunchScreen.storyboard diff --git a/Mobile/Mobile/Base.lproj/Main.storyboard b/ios/Mobile/Base.lproj/Main.storyboard similarity index 100% rename from Mobile/Mobile/Base.lproj/Main.storyboard rename to ios/Mobile/Base.lproj/Main.storyboard diff --git a/Mobile/Mobile/Document.h b/ios/Mobile/Document.h similarity index 100% rename from Mobile/Mobile/Document.h rename to ios/Mobile/Document.h diff --git a/Mobile/Mobile/Document.mm b/ios/Mobile/Document.mm similarity index 100% rename from Mobile/Mobile/Document.mm rename to ios/Mobile/Document.mm diff --git a/Mobile/Mobile/DocumentBrowserViewController.h b/ios/Mobile/DocumentBrowserViewController.h similarity index 100% rename from Mobile/Mobile/DocumentBrowserViewController.h rename to ios/Mobile/DocumentBrowserViewController.h diff --git a/Mobile/Mobile/DocumentBrowserViewController.mm b/ios/Mobile/DocumentBrowserViewController.mm similarity index 100% rename from Mobile/Mobile/DocumentBrowserViewController.mm rename to ios/Mobile/DocumentBrowserViewController.mm diff --git a/Mobile/Mobile/Docume
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 51fdcdb424933136b8408c8eacc330d2bec9fc1c Author: Andras Timar AuthorDate: Wed Nov 7 12:39:47 2018 +0100 Commit: Andras Timar CommitDate: Wed Nov 7 12:39:47 2018 +0100 configure: undefined option is "" not "no" Change-Id: I39cba79aa98b7e0d13a53b37cba0833c5a5267a8 diff --git a/configure.ac b/configure.ac index b70958b71..39e4cf3b3 100644 --- a/configure.ac +++ b/configure.ac @@ -434,7 +434,7 @@ AM_CONDITIONAL([ENABLE_DEBUG], [test "$ENABLE_DEBUG" = "true"]) mobile_app= AC_MSG_CHECKING([Is this a mobile app]) -if test "$enable_gtkapp" != "no" -o "$enable_iosapp" != "no"; then +if test "$enable_gtkapp" = "yes" -o "$enable_iosapp" = "yes"; then AC_MSG_RESULT([Yes]) mobile_app=true; else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac .gitignore Mobile/Mobile.xcodeproj Mobile/README
.gitignore |1
Mobile/Mobile.xcodeproj/project.pbxproj | 499
Mobile/README |8
configure.ac| 34 --
4 files changed, 259 insertions(+), 283 deletions(-)
New commits:
commit 2c5893edfed7c4f923f1c80e3986209d70b8
Author: Tor Lillqvist
AuthorDate: Sun Nov 4 12:48:00 2018 +0200
Commit: Tor Lillqvist
CommitDate: Sun Nov 4 12:58:30 2018 +0200
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 5f2a6f6aa3a0d0ba8a6ba2fb833f98393f94bb9f.
Change-Id: I15fb7363e287fdf4942ac9d362a7151202d0ee9d
diff --git a/.gitignore b/.gitignore
index 110ab9b6c..f910a6d82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,7 +83,6 @@ docker/builddir
Mobile/Mobile/Info.plist
# symlinks created by configure for the iOS app Xcode project
-losrcdir-symlink
lobuilddir-symlink
pocoinclude-symlink
pocolib-symlink
diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj
b/Mobile/Mobile.xcodeproj/project.pbxproj
index 91eb91956..f8528fdb4 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -72,117 +72,117 @@
BE00F89E21396585001CE2D4 /* images */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = images; path =
../../../loleaflet/dist/images; sourceTree = ""; };
BE00F8B4213ED543001CE2D4 /* libiconv.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
BE00F8B6213ED573001CE2D4 /* libz.tbd */ = {isa =
PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
- BE34D10F218B66B600815297 /* docsh.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docsh.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/docsh.cxx"; sourceTree =
""; };
- BE34D110218B66B600815297 /* docstyle.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docstyle.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/docstyle.cxx"; sourceTree =
""; };
- BE34D111218B66B600815297 /* docshdrw.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docshdrw.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/docshdrw.cxx"; sourceTree =
""; };
- BE34D112218B66B600815297 /* docshini.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = docshini.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/docshini.cxx"; sourceTree =
""; };
- BE34D113218B66B600815297 /* swmodul1.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swmodul1.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/swmodul1.cxx"; sourceTree =
""; };
- BE34D114218B66B600815297 /* swdllimpl.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = swdllimpl.hxx;
path = "../losrcdir-symlink/sw/source/uibase/app/swdllimpl.hxx"; sourceTree =
""; };
- BE34D115218B66B600815297 /* swwait.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swwait.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/swwait.cxx"; sourceTree =
""; };
- BE34D116218B66B600815297 /* swdll.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swdll.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/swdll.cxx"; sourceTree =
""; };
- BE34D117218B66B600815297 /* apphdl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = apphdl.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/apphdl.cxx"; sourceTree =
""; };
- BE34D118218B66B600815297 /* appenv.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = appenv.cxx;
path = "../losrcdir-symlink/sw/source/uibase/app/appenv.cxx"; sourceTree =
""; };
- BE34D119218B66B600815297 /* appenv.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = appenv.hxx; path
= "../losrcdir-symlink/sw/source/uibase/app/appenv.hxx"; sourceTree =
""; };
- BE34D11A218B66B600815297 /* swmodule.cxx */ = {isa =
PBX
[Libreoffice-commits] online.git: configure.ac
configure.ac | 213 ++- 1 file changed, 109 insertions(+), 104 deletions(-) New commits: commit e41ae3559449dbcce3298868018ee68ce072278a Author: Tor Lillqvist AuthorDate: Fri Nov 2 18:03:11 2018 +0200 Commit: Tor Lillqvist CommitDate: Fri Nov 2 18:13:08 2018 +0200 Differentiate the case of using --enable-iosapp on Linux from using it on macOS On Linux, you use it just to process the JS bits, for copying them over to the Mac where you build the app. (Because setting up npm and whatnot on my Mac, from unknown 3rd parties, with unknown side effects, semed a bit scary.) diff --git a/configure.ac b/configure.ac index cb98f1050..fb6113e37 100644 --- a/configure.ac +++ b/configure.ac @@ -227,58 +227,62 @@ if test "$enable_iosapp" = "yes"; then IOSAPP_NAME="$with_iosapp_name" fi - AC_MSG_CHECKING([for LibreOffice source tree to build against]) - if test -z "$with_lo_srcdir"; then - AC_MSG_ERROR([You MUST use the --with-lo-srcdir option when configuring the iOS app build tree.]) + # When configuring for building the app itself, on macOS, we need + # these. But not when just configuring for building the JS on + # Linux, for copying over to the Mac. + if test `uname -s` = "Darwin"; then + AC_MSG_CHECKING([for LibreOffice source tree to build against]) + if test -z "$with_lo_srcdir"; then + AC_MSG_ERROR([You MUST use the --with-lo-srcdir option when configuring the iOS app build tree.]) + fi + + LOSRCDIR="$with_lo_srcdir" + # Sanity check, just a random source file in the LibreOffice core tree + if test -f "$LOSRCDIR/vcl/ios/iosinst.cxx"; then + AC_MSG_RESULT([$LOSRCDIR]) + else + AC_MSG_ERROR([This is not a LibreOffice core source directory: $LOSRCDIR]) + fi + + AC_MSG_CHECKING([for LibreOffice build tree to build against]) + if test -z "$with_lo_builddir"; then + AC_MSG_ERROR([You MUST use the --with-lo-builddir option when configuring the iOS app build tree.]) + fi + + LOBUILDDIR="$with_lo_builddir" + # Sanity check, just a random object file in the LibreOffice build tree + if test -f "$LOBUILDDIR/workdir/CxxObject/vcl/ios/iosinst.o"; then + AC_MSG_RESULT([$LOBUILDDIR]) + else + AC_MSG_ERROR([This is not a LibreOffice core build directory: $LOBUILDDIR]) + fi + + AC_MSG_CHECKING([for Poco include directory to build against]) + if test -z "$with_poco_includes"; then + AC_MSG_ERROR([You MUST use the --with-poco-includes option when configuring the iOS app build tree.]) + fi + + POCOINCLUDE="$with_poco_includes" + # Sanity check + if test -f "$POCOINCLUDE/Poco/Poco.h"; then + AC_MSG_RESULT([$POCOINCLUDE]) + else + AC_MSG_ERROR([This is not a Poco include directory: $POCOINCLUDE]) + fi + + AC_MSG_CHECKING([for Poco lib directory to build against]) + if test -z "$with_poco_libs"; then + AC_MSG_ERROR([You MUST use the --with-poco-libs option when configuring the iOS app build tree.]) + fi + + POCOLIB="$with_poco_libs" + # Sanity check + if test -f "$POCOLIB/libPocoFoundation.a"; then + AC_MSG_RESULT([$POCOLIB]) + else + AC_MSG_ERROR([This is not a Poco lib directory: $POCOLIB]) + fi fi - - LOSRCDIR="$with_lo_srcdir" - # Sanity check, just a random source file in the LibreOffice core tree - if test -f "$LOSRCDIR/vcl/ios/iosinst.cxx"; then - AC_MSG_RESULT([$LOSRCDIR]) - else - AC_MSG_ERROR([This is not a LibreOffice core source directory: $LOSRCDIR]) - fi - - AC_MSG_CHECKING([for LibreOffice build tree to build against]) - if test -z "$with_lo_builddir"; then - AC_MSG_ERROR([You MUST use the --with-lo-builddir option when configuring the iOS app build tree.]) - fi - - LOBUILDDIR="$with_lo_builddir" - # Sanity check, just a random object file in the LibreOffice build tree - if test -f "$LOBUILDDIR/workdir/CxxObject/vcl/ios/iosinst.o"; then - AC_MSG_RESULT([$LOBUILDDIR]) - else - AC_MSG_ERROR([This is not a LibreOffice core build directory: $LOBUILDDIR]) - fi - - AC_MSG_CHECKING([for Poco include directory to build against]) - if test -z "$with_poco_includes"; then - AC_MSG_ERROR([You MUST use the --with-poco-includes option when configuring the iOS app build tree.]) - fi - - POCOINCLUDE="$with_poco_includes" - # Sanity check - if test -f "$POCOINCLUDE/Poco/Poco.h"; then - AC_MSG_RESULT([$POCOINCLUDE]) - else - AC_MSG_ERROR([This is not a Poco include directory: $POCOINCLUDE]) - fi - - AC_MSG_CHECKING([for Poco lib directory to build against]) - if test -z "$with_poco_libs"; then - AC_MSG_ERROR([You MUST use the --with-poco-libs option when configuring the iOS app build tree.]) - fi - - POCOLIB="$with_poco_libs" - # Sanity ch
[Libreoffice-commits] online.git: configure.ac
configure.ac |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d5c5a17750c06163b62dc8b04dd78087fdc6917a
Author: Tor Lillqvist
AuthorDate: Tue Oct 30 12:37:31 2018 +0200
Commit: Tor Lillqvist
CommitDate: Tue Oct 30 12:49:59 2018 +0200
We can't use shell conditionals to decide whether to run m4 code or not
Put the definition of the PKG_CHECK_MODULES m4 macro (as empty, for
macOS) inside a m4_if that checks uname, not inside a shell if
statement.
diff --git a/configure.ac b/configure.ac
index b17257c40..4dbf70409 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,9 @@ AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax
-Wno-portability])
AC_CONFIG_MACRO_DIR([m4])
+# We don't want to require pkg-config and PKG_CHECK_MODULES on macOS
+m4_if(m4_esyscmd_s([uname -s]),Linux,[],[m4_define([PKG_CHECK_MODULES],[])])
+
LOOLWSD_VERSION_MAJOR=`echo $VERSION | awk -F. '{print $1}'`
LOOLWSD_VERSION_MINOR=`echo $VERSION | awk -F. '{print $2}'`
LOOLWSD_VERSION_MICRO=`echo $VERSION | awk -F. '{print $3}'`
@@ -204,7 +207,6 @@ ENABLE_IOSAPP=
IOSAPP_NAME="Mobile"
if test "$enable_iosapp" = "yes"; then
ENABLE_IOSAPP=true
- m4_define([PKG_CHECK_MODULES],[])
if test -n "$with_iosapp_name"; then
IOSAPP_NAME="$with_iosapp_name"
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am
configure.ac | 13 + loleaflet/Makefile.am |5 + 2 files changed, 18 insertions(+) New commits: commit fd758496a5e32a7908333479bf5d703fbf2bf8d8 Author: Tor Lillqvist AuthorDate: Wed Oct 17 01:22:24 2018 +0300 Commit: Tor Lillqvist CommitDate: Wed Oct 17 01:22:24 2018 +0300 Add --enable-gtkapp configury option Change-Id: Ib805581663aeec62d713f87ca72ab3cfe95db79f diff --git a/configure.ac b/configure.ac index 5d337ef42..669783ef0 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,12 @@ AC_ARG_ENABLE([iosapp], [Use in a tree where the only purpose is to build the HTML and CSS stuff to be copied to a Mac where the iOS app is being built.])) +AC_ARG_ENABLE([gtkapp], + AS_HELP_STRING([--enable-gtkapp], + [Use in a tree where the only purpose is to build the gtk+ "app" that is supposed + to work similarly to the iOS app, from the JavaScript and the pseudo WebSocket + message plumbing point of view.])) + AC_ARG_ENABLE([seccomp], AS_HELP_STRING([--disable-seccomp], [Disable use of linux/seccomp.h header when kernel on target system does not support it. @@ -165,6 +171,13 @@ fi AC_SUBST(ENABLE_IOSAPP) AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"]) +ENABLE_GTKAPP= +if test "$enable_gtkapp" = "yes"; then + ENABLE_GTKAPP=true +fi +AC_SUBST(ENABLE_GTKAPP) +AM_CONDITIONAL([ENABLE_GTKAPP], [test "$ENABLE_GTKAPP" = "true"]) + MAX_CONNECTIONS=20 AS_IF([test -n "$with_max_connections" && test "$with_max_connections" -gt "0"], [MAX_CONNECTIONS="$with_max_connections"]) diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index a1deb0f78..5ae2ed51c 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -13,8 +13,10 @@ L10N_PO = $(wildcard $(srcdir)/po/*.po) # HTTP to load the message catalog .json files. if !ENABLE_IOSAPP +if !ENABLE_GTKAPP L10N_JSON = $(patsubst $(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO)) endif +endif JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png) @@ -93,9 +95,11 @@ NODE_MODULES_JS =\ node_modules/vex-js/js/vex.dialog.js if !ENABLE_IOSAPP +if !ENABLE_GTKAPP NODE_MODULES_JS +=\ node_modules/l10n-for-node/l10n.js endif +endif NODE_MODULES_JS_SRC = $(patsubst %.js,$(builddir)/%.js,$(NODE_MODULES_JS)) NODE_MODULES_JS_DST = $(patsubst %.js,$(builddir)/dist/%.js,$(NODE_MODULES_JS)) @@ -202,6 +206,7 @@ $(builddir)/dist/loleaflet.html: $(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT @echo "Generating loleaflet.html..." @m4 -E -DDEBUG=$(ENABLE_DEBUG) \ -DIOSAPP=$(ENABLE_IOSAPP) \ + -DGTKAPP=$(ENABLE_GTKAPP) \ -DLOLEAFLET_CSS="$(subst $(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \ -DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(GLOBAL_JS) $(NODE_MODULES_JS) \ $(call LOLEAFLET_JS,$(srcdir)/build/build.js) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/html loleaflet/Makefile.am Makefile.am
Makefile.am |8
configure.ac | 12
loleaflet/Makefile.am|1 +
loleaflet/html/loleaflet.html.m4 | 29 ++---
4 files changed, 43 insertions(+), 7 deletions(-)
New commits:
commit 1ae4a32067c5e1892e47434fb94c7c1f224b7830
Author: Tor Lillqvist
AuthorDate: Fri Aug 31 13:24:17 2018 +0300
Commit: Tor Lillqvist
CommitDate: Mon Sep 3 17:10:19 2018 +0300
Factor out loleaflet/dist construction for iOS app building
The idea is that on a Linux box you have a tree of online that you
configure with --enable-iosapp. Then running 'make' there will only
create the stuff in loleaflet/dist. That loleaflet/dist can then be
copied to the Mac where you build the iOS app.
(To me, this approach seemed for now simpler than to get all the
PKG_CONFIG etc stuff working that running configure normally requires,
and run all the node, npm, and associated crack, on a Mac.)
Change-Id: Id2e495d0521922d0666fdab5fdcb5fcd460136f1
diff --git a/Makefile.am b/Makefile.am
index a8901de71..141467a5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,9 @@
+if ENABLE_IOSAPP
+
+SUBDIRS = loleaflet
+
+else
+
SUBDIRS = . test loleaflet
export ENABLE_DEBUG
@@ -357,3 +363,5 @@ endif
# just run the build without any tests
build-nocheck: all-am
+
+endif
diff --git a/configure.ac b/configure.ac
index 421fdd686..5d337ef42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,11 @@ AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug],
[Enable debugging, link with debugging version of
Poco libraries]))
+AC_ARG_ENABLE([iosapp],
+ AS_HELP_STRING([--enable-iosapp],
+ [Use in a tree where the only purpose is to build
the HTML and CSS stuff
+ to be copied to a Mac where the iOS app is being
built.]))
+
AC_ARG_ENABLE([seccomp],
AS_HELP_STRING([--disable-seccomp],
[Disable use of linux/seccomp.h header when
kernel on target system does not support it.
@@ -153,6 +158,13 @@ if test -n "$with_logfile" ; then
fi
AC_SUBST(LOOLWSD_LOGFILE)
+ENABLE_IOSAPP=
+if test "$enable_iosapp" = "yes"; then
+ ENABLE_IOSAPP=true
+fi
+AC_SUBST(ENABLE_IOSAPP)
+AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
+
MAX_CONNECTIONS=20
AS_IF([test -n "$with_max_connections" && test "$with_max_connections" -gt
"0"],
[MAX_CONNECTIONS="$with_max_connections"])
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index c5baba4b9..922a6242d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -190,6 +190,7 @@ $(builddir)/dist/loleaflet.html:
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
$(builddir)/dist/bundle.css $(builddir)/dist/bundle.js
@echo "Generating loleaflet.html..."
@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
+ -DIOSAPP=$(ENABLE_IOSAPP) \
-DLOLEAFLET_CSS="$(subst
$(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(GLOBAL_JS)
$(NODE_MODULES_JS) \
$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 87bcf697e..f41d80c4f 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -23,14 +23,29 @@
define([_foreachq],[ifelse([$#],[3],[],[define([$1],[$4])$2[]$0([$1],[$2],shift(
};
window.addEventListener('message', PostMessageReadyListener, false);
-ifelse(DEBUG,[true],foreachq([fileCSS],[LOLEAFLET_CSS],[
-]),[
-])dnl
+ifelse(IOSAPP,[true],
+ ifelse(DEBUG,[true],
+foreachq([fileCSS],[LOLEAFLET_CSS],[
+ ]),
+[
+ ]),
+ ifelse(DEBUG,[true],
+foreachq([fileCSS],[LOLEAFLET_CSS],[
+ ]),
+[
+ ])dnl
+)dnl
-
-
-
-
+ifelse(IOSAPP,[true],
+ [
+
+
+ ],
+ [
+
+
+ ]
+)dnl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac wsd/LOOLWSD.cpp
configure.ac|2 +-
wsd/LOOLWSD.cpp | 51 +--
2 files changed, 10 insertions(+), 43 deletions(-)
New commits:
commit b811f70492922ade05b1d0a30c71a7be22084c19
Author: Tor Lillqvist
AuthorDate: Wed Aug 15 11:01:05 2018 +0300
Commit: Tor Lillqvist
CommitDate: Wed Aug 15 11:36:20 2018 +0300
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 3a9e536dfab71f6999a39d7371a9dd8844815ae7.
Change-Id: I503b61f85264b9be658064632ffd1f94518b2a3c
diff --git a/configure.ac b/configure.ac
index 823378d6e..421fdd686 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,7 +332,7 @@ else
fi
AC_SUBST(ENABLE_SUPPORT_KEY)
-LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX}
-lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX}
-lPocoXML${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX}
-lPocoCrypto${POCO_DEBUG_SUFFIX} -lPocoZip${POCO_DEBUG_SUFFIX}"
+LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX}
-lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX}
-lPocoXML${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX}
-lPocoCrypto${POCO_DEBUG_SUFFIX}"
AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h],
[],
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index fc1f83013..ae32cfb18 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -91,8 +91,6 @@
#include
#include
#include
-#include
-#include
#include "Admin.hpp"
#include "Auth.hpp"
@@ -2065,49 +2063,18 @@ private:
std::string thumbnailFile;
if (format == "png")
{
+// Check whether we already have a cached "thumbnail" for
this document.
+
+// NOTE: We do *not* want to simply extract the embedded
+// Thumbnails/thumbnail.png from an ODF document, as that
is typically too small
+// for many purposes (side is max 256 pixels in documents
generated by
+// LibreOffice or its predecessor), and there is no way to
pass in a requested
+// minimum pixel size of the result so we can't know
whether the actual size of
+// the embedded thumbail is big enough.
+
std::ifstream istr(fromPath, std::ios::binary);
if (istr.is_open() && istr.good())
{
-// Check whether it is an ODF document with an
embedded PNG thumbnail.
-
-try
-{
-Poco::Zip::ZipArchive zip(istr);
-auto thumbnailHeader =
zip.findHeader("Thumbnails/thumbnail.png");
-if (thumbnailHeader != zip.headerEnd() &&
thumbnailHeader->second.isFile())
-{
-Poco::Zip::ZipStreamBuf
thumbnailStreamBuf(istr, thumbnailHeader->second, true);
-std::istream
thumbnailStream(&thumbnailStreamBuf);
-if (thumbnailStream.good())
-{
-std::string png;
-
Poco::StreamCopier::copyToString(thumbnailStream, png);
-if (!thumbnailStream.bad())
-{
-LOG_TRC("Extracted thumbnail from ODF
document");
-
-response.set("Content-Disposition",
"attachment; filename=\"thumbnail.png\"");
-response.setContentType("image/png");
-response.setContentLength(png.size());
-socket->send(response);
-socket->send(png.data(), png.size(),
true);
-
-return;
-}
-}
-}
-}
-catch (Poco::Exception&)
-{
-}
-
-// Close and re-open istr after the Zip stuff above to
get it into a known
-// good state.
-istr.close();
-istr.open(fromPath, std::ios::binary);
-
-// Look for cached thumbnail.
-
Poco::SHA1Engine sha1;
Poco::DigestOutputStream dos(sha1);
Poco::StreamCopier::copyStream(istr, dos);
___
Lib
[Libreoffice-commits] online.git: configure.ac loleaflet/npm-shrinkwrap.json loleaflet/npm-shrinkwrap.json.in
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 06c978f0ef51ba39834ffaf00c9b525a7f1877ce Author: Jan Holesovsky Date: Fri May 18 15:48:19 2018 +0200 Don't confuse git wwhen the npm-shrinkwrap.json auto-updates. Change-Id: I84e4d2b57b2b8db76935e33c28b2e99129b281c6 diff --git a/configure.ac b/configure.ac index 13204904c..421fdd686 100644 --- a/configure.ac +++ b/configure.ac @@ -448,12 +448,12 @@ AC_SUBST(ENABLE_SETCAP) AC_CONFIG_LINKS([discovery.xml:discovery.xml]) AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu]) AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json]) -AC_CONFIG_LINKS([loleaflet/npm-shrinkwrap.json:loleaflet/npm-shrinkwrap.json]) AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap]) AC_CONFIG_FILES([Makefile test/Makefile loleaflet/Makefile + loleaflet/npm-shrinkwrap.json loolwsd.spec loolwsd.xml debian/loolwsd.postinst]) diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json.in similarity index 100% rename from loleaflet/npm-shrinkwrap.json rename to loleaflet/npm-shrinkwrap.json.in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/build loleaflet/css loleaflet/dist loleaflet/.eslintignore loleaflet/html loleaflet/images loleaflet/js loleaflet/l10n loleaflet/loleaflet.html
configure.ac |6 loleaflet/.eslintignore|3 loleaflet/Makefile.am | 231 loleaflet/build/deps.js|2 loleaflet/css/loleaflet.css|6 loleaflet/css/selectionMarkers.css |4 loleaflet/css/toolbar.css | 122 loleaflet/dist/errormessages.js| 18 loleaflet/dist/toolbar/w2ui-1.4.3.css | 2754 - loleaflet/dist/toolbar/w2ui-1.4.3.js |13715 - loleaflet/dist/toolbar/w2ui-1.4.3.min.css |2 loleaflet/dist/toolbar/w2ui-1.4.3.min.js | 11 loleaflet/dist/toolbar/w2ui-1.5.rc1.min.js | 14 loleaflet/js/global.js | 32 loleaflet/js/main.js | 62 loleaflet/loleaflet.html.m4| 18 loleaflet/main.css.m4 | 25 loleaflet/package.json |2 loleaflet/src/errormessages.js | 34 loleaflet/src/unocommands.js |2 scripts/unocommands.py |4 21 files changed, 375 insertions(+), 16692 deletions(-) New commits: commit 8618885b3175781a95573c261f876e8626978573 Author: Henry Castro Date: Thu Apr 12 15:57:00 2018 -0400 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 Tested-by: pranavk diff --git a/configure.ac b/configure.ac index 70c6f7d91..13204904c 100644 --- a/configure.ac +++ b/configure.ac @@ -445,6 +445,12 @@ fi AC_SUBST(ENABLE_SETCAP) +AC_CONFIG_LINKS([discovery.xml:discovery.xml]) +AC_CONFIG_LINKS([loolkitconfig.xcu:loolkitconfig.xcu]) +AC_CONFIG_LINKS([loleaflet/package.json:loleaflet/package.json]) +AC_CONFIG_LINKS([loleaflet/npm-shrinkwrap.json:loleaflet/npm-shrinkwrap.json]) +AC_LINK_FILES([loleaflet/node_shrinkwrap], [loleaflet/node_shrinkwrap]) + AC_CONFIG_FILES([Makefile test/Makefile loleaflet/Makefile diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore index 26e742c88..4ddb46e95 100644 --- a/loleaflet/.eslintignore +++ b/loleaflet/.eslintignore @@ -2,4 +2,5 @@ dist/**/*.js !dist/toolbar/toolbar.js -src/admin/Base.js +**/src/admin/Base.js +**/src/unocommands.js diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 036f4c729..7166a6de9 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -8,34 +8,221 @@ DRAW_VERSION=0.2.4 MINIFY=false -L10N_PO = $(wildcard po/*.po) -L10N_JSON = $(patsubst po/%.po,dist/l10n/%.json,$(L10N_PO)) +L10N_PO = $(wildcard $(srcdir)/po/*.po) +L10N_JSON = $(patsubst $(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO)) JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png) -JQUERY_UI_DIST_IMAGES = $(patsubst $(JQUERY_UI_IMAGE_PATH)/%.png,dist/$(JQUERY_UI_IMAGE_PATH)/%.png,$(JQUERY_UI_IMAGES)) +JQUERY_UI_DIST_IMAGES = $(patsubst $(JQUERY_UI_IMAGE_PATH)/%.png,$(builddir)/dist/images/%.png,$(JQUERY_UI_IMAGES)) + +LOLEAFLET_IMAGES_SRC = $(wildcard $(srcdir)/images/*) +LOLEAFLET_IMAGES_DST = $(patsubst $(srcdir)/%,$(builddir)/dist/%,$(LOLEAFLET_IMAGES_SRC)) + +LOLEAFLET_L10N_SRC = $(shell find $(srcdir)/l10n -name '*.*') +LOLEAFLET_L10N_DST = $(patsubst $(srcdir)/l10n/%,$(builddir)/dist/l10n/%,$(LOLEAFLET_L10N_SRC)) + +LOLEAFLET_DRAW_JS_SRC = $(shell find $(srcdir)/plugins/draw-$(DRAW_VERSION)/src -name '*.js') +LOLEAFLET_DRAW_CSS_SRC = $(shell find $(srcdir)/plugins/draw-$(DRAW_VERSION)/dist -name '*.css') + +LOLEAFLET_HTML_SRC = $(shell find $(srcdir)/html -name '*.html') +LOLEAFLET_HTML_DST = $(patsubst $(srcdir)/html/%.html,$(builddir)/dist/%.html,$(LOLEAFLET_HTML_SRC)) + +define file_target +$(1): $(2) + @cp $$< $$@ + +endef + +define file_targets +$(foreach file,$(1),$(call file_target,\ + $(builddir)/dist/$(notdir $(file)),\ + $(file))) +endef + +LOLEAFLET_CSS =\ + $(srcdir)/css/w2ui-1.5.rc1.css \ + $(srcdir)/css/leaflet.css \ + $(srcdir)/css/selectionMarkers.css \ + $(srcdir)/css/loleaflet.css \ + $(srcdir)/css/toolbar.css \ + $(srcdir)/css/partsPreviewControl.css \ + $(srcdir)/css/scrollBar.css \ + $(srcdir)/css/searchControl.css \ + $(srcdir)/css/spreadsheet.css \ + $(srcdir)/css/editor.css \ + $(srcdir)/plugins/draw-$(DRAW_VERSION)/dist/leaflet.draw.css \ + $(builddir)/node_modules/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css \ + $(builddir)/node_modules/jquery-contextmenu/dist/jquery.contextMenu.css \ + $(builddir)/node_modules/vex-js/css/vex.css \ + $(builddir)/node_modules/vex-js/css/vex-theme-plain.css \ +
[Libreoffice-commits] online.git: configure.ac .gitignore Makefile.am test/run_unit.sh.in
.gitignore |1 +
Makefile.am | 22 --
configure.ac|2 ++
test/run_unit.sh.in |4
4 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit 04feab241ff3356789ee9f2f8133590eb7981fe2
Author: Andras Timar
Date: Wed May 9 13:34:14 2018 +0200
use local tile cache directory for tests
Change-Id: I4c66a45df93bee22131c5950029cffa863d397b0
Reviewed-on: https://gerrit.libreoffice.org/54028
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/.gitignore b/.gitignore
index 8f1313bd3..697c13843 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ common/support-public-key.hpp
systemplate
test-driver
jails
+cache
test/data/hello-world.odt
*.o
diff --git a/Makefile.am b/Makefile.am
index 8107c3539..938a60fc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -238,37 +238,43 @@ $(SYSTEM_STAMP) : ${top_srcdir}/loolwsd-systemplate-setup
@JAILS_PATH@ :
mkdir -p $@
+@TILECACHE_PATH@ :
+ mkdir -p $@
+
clean-local:
if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@"; fi
if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@";
fi
+ if test "z@TILECHACHE_PATH@" != "z"; then rm -rf "@TILECHACHE_PATH@"; fi
-run: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
+run: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo "Launching loolwsd"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@echo
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
+ --o:tile_cache_path="@TILECHACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=true --o:logging.level=trace
-run-valgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
+run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
+ --o:tile_cache_path="@TILECHACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=false
--o:logging.level=trace
-run-gdb: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
+run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
@echo "Launching loolwsd under valgrind's callgrind"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -276,13 +282,14 @@ run-gdb: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
./loolwsd --nocaps \
--o:sys_template_path="@SYSTEMPLATE_PATH@"
--o:lo_template_path="@LO_PATH@" \
--o:child_root_path="@JAILS_PATH@"
--o:storage.filesystem[@allow]=true \
+ --o:tile_cache_path="@TILECHACHE_PATH@" \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem"
\
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
--o:logging.file[@enable]=false
--o:logging.level=error
-run-callgrind: all @JAILS_PATH@ @SYSTEMPLATE_PATH@/system_stamp
+run-callgrind: all @TILECACHE_PATH@ @JAILS_PATH@
@SYSTEMPLATE_PATH@/system_stamp
@echo "Launching loolwsd under valgrind's callgrind"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt
$(abs_top_srcdir)/test/data/hello-world.
[Libreoffice-commits] online.git: configure.ac
configure.ac | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit c54790def5dc191c358ebcc463cc33e5b5813216
Author: Miklos Vajna
Date: Wed Mar 7 13:45:27 2018 +0100
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
Tested-by: Andras Timar
diff --git a/configure.ac b/configure.ac
index fee51a265..6f101a259 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,6 +425,16 @@ else
fi
fi
+AC_PATH_PROG(NODE, node, no)
+if test "$NODE" = "no"; then
+AC_MSG_ERROR([node required to build loleaflet, but not installed])
+else
+NODE_VER=`node --version | sed 's/^v//' | awk -F. '{ print (($1 * 100) +
$2) * 100 + $3;}'`
+if test "$NODE_VER" -lt 6; then
+AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0])
+fi
+fi
+
test "$prefix" = NONE && prefix=$ac_default_prefix
LOOLWSD_CACHEDIR=${localstatedir}/cache/${PACKAGE}
while :; do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |5 + 1 file changed, 5 insertions(+) New commits: commit 593c3b15f87107a958c0e7383ae7bb0826fc8620 Author: Rene Engelhard Date: Sat Mar 3 13:33:15 2018 +0100 actually check for pam header and lib Change-Id: Iaed84c3b72c2540176c8a0ed8e1f13d7c5cadc44 Reviewed-on: https://gerrit.libreoffice.org/50674 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/configure.ac b/configure.ac index ceff12d40..fee51a265 100644 --- a/configure.ac +++ b/configure.ac @@ -341,6 +341,11 @@ fi AC_SUBST(ENABLE_SSL) +AC_CHECK_HEADERS([security/pam_appl.h], + [], + [AC_MSG_ERROR([header security/pam_appl.h not found, install PAM development package])]) +AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([No. Install PAM development package])]) + if test "x$with_support_public_key" != "x"; then AC_DEFINE([ENABLE_SUPPORT_KEY],1,[Whether to enable support key]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac Makefile.am
Makefile.am |1 + configure.ac | 29 + 2 files changed, 30 insertions(+) New commits: commit 2e4ecfaf4475fd13c510c186f8f79c1cd38228c6 Author: Andras Timar Date: Tue Feb 27 22:21:43 2018 +0100 enable make parallelism Change-Id: Ie16a450bee6d718d8daf58194fbbd7dfd1ac2f38 Reviewed-on: https://gerrit.libreoffice.org/50470 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/Makefile.am b/Makefile.am index 6e6a847d7..db9ee34bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +AM_MAKEFLAGS = @PARALLELISM_OPTION@ SUBDIRS = . test loleaflet export ENABLE_DEBUG diff --git a/configure.ac b/configure.ac index 0f1ffd5ca..ceff12d40 100644 --- a/configure.ac +++ b/configure.ac @@ -121,6 +121,35 @@ AC_ARG_ENABLE([werror], AS_HELP_STRING([--disable-werror], [Do not turn warnings into errors.])) +AC_ARG_WITH(parallelism, +AS_HELP_STRING([--with-parallelism], +[Number of jobs to run simultaneously during build. Parallel builds can +save a lot of time on multi-cpu machines. Defaults to the number of +CPUs on the machine.]), +,) + +# Number of CPUs to use during the build +AC_MSG_CHECKING([for number of processors to use]) +# plain --with-parallelism is just the default +if test -n "$with_parallelism" -a "$with_parallelism" != "yes"; then +if test "$with_parallelism" = "no"; then +PARALLELISM=0 +else +PARALLELISM=$with_parallelism +fi +else +PARALLELISM=`getconf _NPROCESSORS_ONLN` +fi + +if test $PARALLELISM -eq 0; then +AC_MSG_RESULT([explicit make -j option needed]) +PARALLELISM_OPTION= +else +AC_MSG_RESULT([$PARALLELISM]) +PARALLELISM_OPTION="-j $PARALLELISM" +fi +AC_SUBST(PARALLELISM_OPTION) + # Handle options AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"], [POCO_DEBUG_SUFFIX=d], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 591a0b5fed800860db750fabfa4d6ec9fb00923b Author: Samuel Mehrbrodt Date: Tue Feb 13 09:31:11 2018 +0100 Improve explanation for support key in configure Change-Id: Ifd2fef9ff6b15e04e75bfecc478c3ac63efc84f5 Reviewed-on: https://gerrit.libreoffice.org/49672 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/configure.ac b/configure.ac index bafe11e8..0f1ffd5c 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,7 @@ AC_ARG_ENABLE([ssl], AC_ARG_WITH([support-public-key], AS_HELP_STRING([--with-support-public-key=], -[Implements signed key with expiration required for support. Almost certainly you don not want to use this.])) +[Implements signed key with expiration required for support. Targeted at LibreOffice Online Service Providers.])) AC_ARG_WITH([max-connections], AS_HELP_STRING([--with-max-connections], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) New commits: commit b8926baa1809300410783fc9991a02162767a374 Author: Miklos Vajna Date: Thu Feb 8 15:27:12 2018 +0100 configure: allow disable werror with --disable-werror Change-Id: Ie614ce2143669008c38ecf4b267d6fec78337be6 Reviewed-on: https://gerrit.libreoffice.org/49434 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/configure.ac b/configure.ac index ff96e7a6..bafe11e8 100644 --- a/configure.ac +++ b/configure.ac @@ -117,6 +117,10 @@ AC_ARG_ENABLE([setcap], AS_HELP_STRING([--disable-setcap], [Do not set capabilities on files. For packaging builds])) +AC_ARG_ENABLE([werror], +AS_HELP_STRING([--disable-werror], + [Do not turn warnings into errors.])) + # Handle options AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"], [POCO_DEBUG_SUFFIX=d], @@ -170,8 +174,17 @@ AC_SUBST(MAX_DOCUMENTS) # Test for build environment CXXFLAGS="$CXXFLAGS -std=c++11" -CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror -Wshadow" -CFLAGS="$CFLAGS -Wall -Wextra -Werror" +CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow" +CFLAGS="$CFLAGS -Wall -Wextra" + +AC_MSG_CHECKING([whether to turn warnings to errors]) +if test -z "$enable_werror" -o "$enable_werror" = "yes"; then +AC_MSG_RESULT([yes]) +CXXFLAGS="$CXXFLAGS -Werror" +CFLAGS="$CFLAGS -Werror" +else +AC_MSG_RESULT([no]) +fi # check for C++11 support HAVE_CXX11= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac debian/rules loolwsd.spec.in Makefile.am
Makefile.am | 14 +++---
configure.ac| 21 +
debian/rules|6 +-
loolwsd.spec.in |7 ---
4 files changed, 33 insertions(+), 15 deletions(-)
New commits:
commit 51993b8990c8eb0123e860088df09e3ad6436079
Author: Christian Glombek
Date: Thu Feb 1 14:49:44 2018 +0100
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
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/Makefile.am b/Makefile.am
index 2fce7fdd..542f8d53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -314,13 +314,13 @@ clang-tidy:
# installing the RPM or Debian package.
all-local: loolforkit @JAILS_PATH@ $(SYSTEM_STAMP)
- @if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
- sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit; \
- sudo @SETCAP@ cap_sys_admin=ep loolmount; \
- echo "Set required capabilities"; \
- else \
- echo "Skipping capability setting"; \
- fi
+if ENABLE_SETCAP
+ sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit
+ sudo @SETCAP@ cap_sys_admin=ep loolmount
+ echo "Set required capabilities"
+else
+ echo "Skipping capability setting"
+endif
# just run the build without any tests
build-nocheck: all-am
diff --git a/configure.ac b/configure.ac
index 3172f12b..ff96e7a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,6 +113,10 @@ AC_ARG_WITH([compiler-plugins],
[Experimental! Unlikely to work for anyone except Noel! Enable
compiler plugins that will perform additional checks during
building.]))
+AC_ARG_ENABLE([setcap],
+AS_HELP_STRING([--disable-setcap],
+ [Do not set capabilities on files. For packaging
builds]))
+
# Handle options
AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
[POCO_DEBUG_SUFFIX=d],
@@ -395,6 +399,22 @@ AC_SUBST(LOOLWSD_CONFIGDIR)
LOOLWSD_DATADIR=${datadir}/${PACKAGE}
AC_SUBST(LOOLWSD_DATADIR)
+AS_IF([test "$enable_setcap" != "no"],
+ [AC_DEFINE([ENABLE_SETCAP],1,[Whether to enable setting of
capabilities])],
+ [AC_DEFINE([ENABLE_SETCAP],0,[Whether to enable setting of
capabilities])])
+
+AM_CONDITIONAL([ENABLE_SETCAP], [test "$enable_setcap" != "no"])
+
+ENABLE_SETCAP=
+if test "$enable_setcap" != "no"; then
+ENABLE_SETCAP=true
+setcap_msg="setcap enabled"
+else
+setcap_msg="setcap disabled"
+fi
+
+AC_SUBST(ENABLE_SETCAP)
+
AC_CONFIG_FILES([Makefile
test/Makefile
loleaflet/Makefile
@@ -414,6 +434,7 @@ Configuration:
LO integration tests${lo_msg}
SSL support $ssl_msg
Debug & low security$debug_msg
+Set capabilities$setcap_msg
\$ make # to compile"
if test -n "$with_lo_path"; then
diff --git a/debian/rules b/debian/rules
index 976dbde7..fe3d10b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
-CONFFLAGS = --enable-silent-rules --prefix=/usr --localstatedir=/var
--sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include $(CONFIG_OPTIONS)
-
-# Avoid setcap when doing "make", when building for packaging
-# the setcap is done at installation time
-export BUILDING_FROM_RPMBUILD=yes
+CONFFLAGS = --enable-silent-rules --prefix=/usr --localstatedir=/var
--sysconfdir=/etc --with-lokit-path=`pwd`/bundled/include --disable-setcap
$(CONFIG_OPTIONS)
# main packaging script based on dh7 syntax
%:
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 0933b1a3..ebfdf7f7 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -65,17 +65,18 @@ Obsoletes: loleaflet <= 1.5.8
--enable-silent-rules \
--with-lokit-path=bundled/include \
--with-lo-path=%{loroot} \
+ --disable-setcap \
%if 0%{?config_options:1}
%{config_options}
%endif
-env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
+make %{?_smp_mflags}
%check
-#env BUILDING_FROM_RPMBUILD=yes make check
+#make check
%install
-env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
%__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -d -m 755 %{buildroot}/var/adm/fillup-templates
%if 0%{?fedora} || 0%{?rhel} >= 7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 3b82f62084689c97d737cc9e606e1ae6d9fbaaba Author: Fabian Jucker Date: Wed Oct 4 10:59:04 2017 +0200 correct help message for with-max-connections, with-max-documents Change-Id: Ib7244a6ee55284b36d874a101505e2fe04377c9c Reviewed-on: https://gerrit.libreoffice.org/43121 Reviewed-by: Fabian Jucker Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/configure.ac b/configure.ac index 5d458fa4..35a16c82 100644 --- a/configure.ac +++ b/configure.ac @@ -101,11 +101,11 @@ AC_ARG_WITH([support-public-key], [Implements signed key with expiration required for support. Almost certainly you don not want to use this.])) AC_ARG_WITH([max-connections], -AS_HELP_STRING([--max-connections], +AS_HELP_STRING([--with-max-connections], [Set the limit on the total number of client connections. Def: 20, Min: 3.])) AC_ARG_WITH([max-documents], - AS_HELP_STRING([--max-documents], + AS_HELP_STRING([--with-max-documents], [Set the limit on the total number of documents. Def: 10, Min: 2.])) AC_ARG_WITH([compiler-plugins], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 396c1488b42a89a7b6dad06583b66db3476301f6 Author: Tor Lillqvist Date: Thu Oct 26 16:53:43 2017 +0300 Avoid test: : integer expression expected Change-Id: I87f087a29ab4dc5cf94b0eee2a115b77c8283552 diff --git a/configure.ac b/configure.ac index 8c405778..5d458fa4 100644 --- a/configure.ac +++ b/configure.ac @@ -146,7 +146,7 @@ fi AC_SUBST(LOOLWSD_LOGFILE) MAX_CONNECTIONS=20 -AS_IF([test -n "$with_max_connections" -a "$with_max_connections" -gt "0"], +AS_IF([test -n "$with_max_connections" && test "$with_max_connections" -gt "0"], [MAX_CONNECTIONS="$with_max_connections"]) AS_IF([test "$MAX_CONNECTIONS" -lt "3"], [MAX_CONNECTIONS="3"]) @@ -154,7 +154,7 @@ AC_DEFINE_UNQUOTED([MAX_CONNECTIONS],[$MAX_CONNECTIONS],[Limit the maximum numbe AC_SUBST(MAX_CONNECTIONS) MAX_DOCUMENTS=10 -AS_IF([test -n "$with_max_documents" -a "$with_max_documents" -gt "0"], +AS_IF([test -n "$with_max_documents" && test "$with_max_documents" -gt "0"], [MAX_DOCUMENTS="$with_max_documents"]) AS_IF([test "$MAX_DOCUMENTS" -gt "$MAX_CONNECTIONS"], [MAX_DOCUMENTS="$MAX_CONNECTIONS"]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 7455705517033acc24e91df0d5cf9a825f0562a0
Author: Aron Budea
Date: Sat Aug 12 07:07:02 2017 +0200
Add dlopen check again to fix build
That unneeded dlopen check isn't unneeded.
Regression from 4be7a6cb166161a5c981f706b460a191984a4c80
Change-Id: I8fc451d16c3fa95696995d884743af675d42804d
Reviewed-on: https://gerrit.libreoffice.org/41077
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/configure.ac b/configure.ac
index 8fbe8e9c..854d9152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,6 +253,12 @@ AS_IF([test `uname -s` = Linux],
[AS_IF([test -n "$with_cppunit_libs"],
[LDFLAGS="$LDFLAGS -Wl,-rpath,${with_cppunit_libs}"])])
+AS_IF([test `uname -s` != Darwin],
+ [AC_SEARCH_LIBS([dlopen],
+ [dl dld],
+ [],
+ [AC_MSG_ERROR([dlopen not found])])])
+
AC_SEARCH_LIBS([png_create_write_struct],
[png],
[],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac | 38 ++
1 file changed, 30 insertions(+), 8 deletions(-)
New commits:
commit 4be7a6cb166161a5c981f706b460a191984a4c80
Author: Jan Holesovsky
Date: Thu Aug 10 09:50:36 2017 +0200
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
Tested-by: Jan Holesovsky
diff --git a/configure.ac b/configure.ac
index 2c22e887..8fbe8e9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
# -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.69])
+AC_PREREQ([2.63])
AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
-AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax -Wno-portability])
+AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
AC_CONFIG_MACRO_DIR([m4])
@@ -165,6 +165,34 @@ CXXFLAGS="$CXXFLAGS -std=c++11"
CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror -Wshadow"
CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+# check for C++11 support
+HAVE_CXX11=
+AC_MSG_CHECKING([whether $CXX supports C++14 or C++11])
+for flag in -std=gnu++14 -std=gnu++1y -std=c++14 -std=c++1y -std=gnu++11
-std=gnu++0x -std=c++11 -std=c++0x ; do
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $flag -Werror"
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include
+#include
+#include
+void f(std::vector & v, std::function fn) {
+std::sort(v.begin(), v.end(), fn);
+}
+]])],[CXXFLAGS_CXX11=$flag])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+if test -n "$CXXFLAGS_CXX11"; then
+HAVE_CXX11=TRUE
+break
+fi
+done
+if test "$HAVE_CXX11" = TRUE; then
+AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)])
+else
+AC_MSG_ERROR(no)
+fi
+
with_lokit_path=`readlink -f $with_lokit_path`
AS_IF([test -n "$with_lokit_path"],
[CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])
@@ -225,12 +253,6 @@ AS_IF([test `uname -s` = Linux],
[AS_IF([test -n "$with_cppunit_libs"],
[LDFLAGS="$LDFLAGS -Wl,-rpath,${with_cppunit_libs}"])])
-AS_IF([test `uname -s` != Darwin],
- [AC_SEARCH_LIBS([dlopen],
- [dl dld],
- [],
- [AC_MSG_ERROR([dlopen not found])])])
-
AC_SEARCH_LIBS([png_create_write_struct],
[png],
[],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am loleaflet/util
configure.ac |2 +-
loleaflet/Makefile.am | 33 +++--
loleaflet/util/po2json.py |8
3 files changed, 24 insertions(+), 19 deletions(-)
New commits:
commit 21192c4306d8b6c5e2bc0db04c2f0a3b18f8de06
Author: Jan Holesovsky
Date: Fri May 5 11:18:26 2017 +0200
Generate the l10n json files only when the appropriate po's change.
Change-Id: I17c0f022775ec631e6493ba81fa41752f6841188
diff --git a/configure.ac b/configure.ac
index 391f23ea..4da3f4e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ([2.69])
AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
-AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax])
+AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax -Wno-portability])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index cb458d68..87c39079 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -8,42 +8,39 @@ DRAW_VERSION=0.2.4
MINIFY=false
+L10N_PO = $(wildcard po/*.po)
+L10N_JSON = $(patsubst po/%.po,dist/l10n/%.json,$(L10N_PO))
+
+L10N_STYLES_PO = $(wildcard po/styles/*.po)
+L10N_STYLES_JSON = $(patsubst
po/styles/%.po,dist/l10n/styles/%.json,$(L10N_STYLES_PO))
+
EXTRA_DIST = $(shell git ls-files)
-all-local: node_modules build-l10n
+all-local: node_modules $(L10N_JSON) $(L10N_STYLES_JSON)
rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p
dist/plugins/draw-$(DRAW_VERSION)
cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist
../../dist/plugins/draw-$(DRAW_VERSION)
jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY)
- mkdir -p dist/l10n/styles
- mv po/*.json dist/l10n/
- mv po/styles/*.json dist/l10n/styles/
-
node_modules: npm-shrinkwrap.json
npm install
touch node_modules
-.PHONY: build-l10n
-build-l10n:
- util/po2json.py --quiet po/*.po
- util/po2json.py --quiet po/styles/*.po
+dist/l10n/%.json: po/%.po
+ @util/po2json.py $< -o $@
-.PHONY: move-l10n-to-dist
-move-l10n-to-dist:
- mv po/*.json dist/l10n/
- mv po/styles/*.json dist/l10n/styles/
+dist/l10n/styles:
+ @mkdir -p $@
+
+dist/l10n/styles/%.json: po/styles/%.po dist/l10n/styles
+ @util/po2json.py $< -o $@
install-data-hook:
mkdir -p $(DESTDIR)$(pkgdatadir)/loleaflet; \
cp -ar dist/ $(DESTDIR)$(pkgdatadir)/loleaflet/;
-dist-hook: build-l10n
+dist-hook:
chmod u+w $(distdir)/dist
- mkdir -p $(distdir)/dist/l10n/styles
- mv po/*.json $(distdir)/dist/l10n/
- mv po/styles/*.json $(distdir)/dist/l10n/styles/
-
mkdir -p
$(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
cp -a
"node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_ee_1x100.png"
$(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/
diff --git a/loleaflet/util/po2json.py b/loleaflet/util/po2json.py
index 168d0975..3769b7be 100755
--- a/loleaflet/util/po2json.py
+++ b/loleaflet/util/po2json.py
@@ -13,6 +13,7 @@ import sys
parser = optparse.OptionParser(usage="usage: %prog [options] pofile...")
parser.add_option("--quiet", action="store_false", default=True,
dest="verbose", help="don't print status messages to stdout")
+parser.add_option("-o", type="string", default="", dest="destfile",
help="output file name (if there is exactly one input file)")
(options, args) = parser.parse_args()
@@ -20,11 +21,18 @@ if args == None or len(args) == 0:
print("ERROR: you must specify at least one po file to translate");
sys.exit(1)
+if options.destfile != '' and len(args) != 1:
+ print("ERROR: when -o is provided, there has to be exactly 1 input
file")
+ sys.exit(1)
+
paramFix = re.compile("(\\(([0-9])\\))")
for srcfile in args:
destfile = os.path.splitext(srcfile)[0] + ".json"
+ if options.destfile != '':
+ destfile = options.destfile
+
if options.verbose:
print("INFO: converting %s to %s" % (srcfile, destfile))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac Makefile.am
Makefile.am |3 +++
configure.ac |2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 848145503bf7b98ce4a4aa0a858a0d71dd0dbb26
Author: Jan Holesovsky
Date: Fri Apr 28 11:54:18 2017 +0200
Distribute the git hash for easier identification.
Change-Id: I57084231d0878de15b4b0478122f49e94af563bf
diff --git a/Makefile.am b/Makefile.am
index c72ad4d0..cfcfd7c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,6 +187,9 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers)
$(kit_headers) \
test/countloolkits.hpp \
test/helpers.hpp
+dist-hook:
+ git log -1 --format=%h > $(distdir)/dist_git_hash 2> /dev/null || rm
$(distdir)/dist_git_hash
+
EXTRA_DIST = discovery.xml \
favicon.ico \
loolkitconfig.xcu \
diff --git a/configure.ac b/configure.ac
index ad4b6757..3f5daff2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice Online
# try to add a git hash for a version if we're developing
LOOLWSD_VERSION_HASH="$LOOLWSD_VERSION"
-git_hash=`cd ${srcdir} && git log -1 --format=%h 2> /dev/null`
+git_hash=`cd ${srcdir} && ( cat dist_git_hash 2> /dev/null || git log -1
--format=%h 2> /dev/null )`
if test "z$git_hash" != "z"; then
LOOLWSD_VERSION_HASH=$git_hash
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 6416fe9d1bae43b47426dc0e6ca714e440581249
Author: Katarina Behrens
Date: Tue Apr 18 14:50:02 2017 +0200
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
Tested-by: pranavk
diff --git a/configure.ac b/configure.ac
index 1a9e16a8..ad4b6757 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,6 +293,16 @@ int main(int argc, char **argv)
[AC_MSG_RESULT([Yes])
LIBS="$LIBS -lpcre"])
+AC_PATH_PROG(NPM, npm, no)
+if test "$NPM" = "no"; then
+AC_MSG_ERROR([npm required to build loleaflet, but not installed])
+else
+NPM_VER=`npm -v | awk -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
+if test "$NPM_VER" -ge 30900 -a "$NPM_VER" -lt 31004; then
+AC_MSG_ERROR([This npm version is buggy, either upgrade to >= 3.10.4
or downgrade to < 3.9.0])
+fi
+fi
+
test "$prefix" = NONE && prefix=$ac_default_prefix
LOOLWSD_CACHEDIR=${localstatedir}/cache/${PACKAGE}
while :; do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 8927eaf0571bc8a178c0e4d820160cb1dc7b40ab
Author: Katarina Behrens
Date: Thu Apr 13 22:39:37 2017 +0200
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
Tested-by: Thorsten Behrens
diff --git a/configure.ac b/configure.ac
index 74d56bd9..1a9e16a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,7 +172,8 @@ SYSTEMPLATE_PATH=not-set
have_lo_path=false
AC_MSG_CHECKING([whether to run tests against a LibreOffice])
if test -n "$with_lo_path"; then
- LO_PATH="$with_lo_path"
+ # strip trailing '/' from LO_PATH, 'ln -s' with such path will otherwise
fail
+ LO_PATH="${with_lo_path%/}"
version_file="$with_lo_path/program/versionrc"
if test -f $version_file; then
JAILS_PATH="\${abs_top_builddir}/jails"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac debian/control loleaflet/README loolwsd.service loolwsd.spec.in README sysconfig.loolwsd tools/Stress.cpp tools/Tool.cpp wsd/LOOLWSD.cpp wsd/README wsd/r
README|2 +-
configure.ac |4 ++--
debian/control|2 +-
loleaflet/README |4 ++--
loolwsd.service |2 +-
loolwsd.spec.in |2 +-
sysconfig.loolwsd |2 +-
tools/Stress.cpp |2 +-
tools/Tool.cpp|2 +-
wsd/LOOLWSD.cpp |2 +-
wsd/README|4 ++--
wsd/reference.txt |4 ++--
12 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 1f2d04a5e496d03d6a69fe3dea097dec894bb2f0
Author: Samuel Mehrbrodt
Date: Fri Feb 3 13:28:48 2017 +
Online, not on-line
Change-Id: I93a8322dceca7c1ed95449c6aeb4ae854b982957
Reviewed-on: https://gerrit.libreoffice.org/33886
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/README b/README
index 9a7f327..6efc238 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-LibreOffice on-line.
+LibreOffice Online.
This project has several components:
diff --git a/configure.ac b/configure.ac
index f65b8e6..b389d69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AC_SUBST([LOOLWSD_VERSION_MINOR])
AC_SUBST([LOOLWSD_VERSION_MICRO])
AC_SUBST([LOOLWSD_VERSION])
-AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice
On-Line WebSocket server version])
+AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice
Online WebSocket server version])
# try to add a git hash for a version if we're developing
LOOLWSD_VERSION_HASH="$LOOLWSD_VERSION"
@@ -30,7 +30,7 @@ if test "z$git_hash" != "z"; then
fi
AC_SUBST([LOOLWSD_VERSION_HASH])
-AC_DEFINE_UNQUOTED([LOOLWSD_VERSION_HASH],[["$LOOLWSD_VERSION_HASH"]],[LibreOffice
On-Line git hash if present])
+AC_DEFINE_UNQUOTED([LOOLWSD_VERSION_HASH],[["$LOOLWSD_VERSION_HASH"]],[LibreOffice
Online git hash if present])
AC_CONFIG_SRCDIR([wsd/LOOLWSD.cpp])
diff --git a/debian/control b/debian/control
index 80af0eb..9a60115 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,6 @@ Package: loolwsd
Section: web
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.1-base, collaboraofficebasis5.1-calc,
collaboraofficebasis5.1-core, collaboraofficebasis5.1-draw,
collaboraofficebasis5.1-extension-beanshell-script-provider,
collaboraofficebasis5.1-extension-ct2n,
collaboraofficebasis5.1-extension-javascript-script-provider,
collaboraofficebasis5.1-extension-mediawiki-publisher,
collaboraofficebasis5.1-extension-nlpsolver,
collaboraofficebasis5.1-extension-numbertext,
collaboraofficebasis5.1-extension-pdf-import,
collaboraofficebasis5.1-extension-report-builder,
collaboraofficebasis5.1-gnome-integration,
collaboraofficebasis5.1-graphicfilter, collaboraofficebasis5.1-images,
collaboraofficebasis5.1-impress, collaboraofficebasis5.1-librelogo,
collaboraofficebasis5.1-math, collaboraofficebasis5.1-ogltrans,
collaboraofficebasis5.1-ooofonts, collaboraofficebasis5.1-oooling
uistic, collaboraofficebasis5.1-postgresql-sdbc,
collaboraofficebasis5.1-python-script-provider, collaboraofficebasis5.1-pyuno,
collaboraofficebasis5.1-writer, collaboraofficebasis5.1-xsltfilter,
collaboraoffice5.1, collaboraoffice5.1-base, collaboraoffice5.1-calc,
collaboraoffice5.1-dict-en, collaboraoffice5.1-draw,
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress,
collaboraoffice5.1-math, collaboraoffice5.1-ure, collaboraoffice5.1-writer,
collaboraofficebasis5.1-en-us, collaboraofficebasis5.1-en-us-base,
collaboraofficebasis5.1-en-us-calc, collaboraofficebasis5.1-en-us-math,
collaboraofficebasis5.1-en-us-res, collaboraofficebasis5.1-en-us-writer,
collaboraoffice5.1-en-us
-Description: LibreOffice On-Line WebSocket Daemon
+Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/loleaflet/README b/loleaflet/README
index 714f7d5..1c08241 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -1,7 +1,7 @@
-Leaflet platform for LibreOffice On-Line
+Leaflet platform for LibreOffice Online
-This is the client part of LibreOffice On-Line. For the server part, see the
+This is the client part of LibreOffice Online. For the server part, see the
../loolwsd/README, and install it first.
Build dependencies
diff --git a/loolwsd.service b/loolwsd.service
index 34b1bb8..327ffc8 100644
--- a/loolwsd.service
+++ b/loolwsd.service
@@ -1,5 +1,5 @@
[Unit]
-Description=LibreOffice On-Line WebSocket Daemon
+Description=LibreOffice Online WebSocket Daemon
After=network.target
[Service]
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 69204c0..d92599e 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -14,7 +14,7 @@ Name: loolwsd
Version:@PACKAGE_VERSION@
Release:1%{?dist}
Vendor: Collabora
-Summary:LibreOffice On-Line WebSo
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 78fdcb903af7aaf75d57f22fba9059dfa46cad45 Author: Ashod Nakashian Date: Sat Jan 28 19:14:57 2017 -0500 wsd: correct configuring MAX_DOCUMENTS Change-Id: I14ffd990cdfb0206d93de01f42fc99efda4e6e8f Reviewed-on: https://gerrit.libreoffice.org/33671 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/configure.ac b/configure.ac index b029d53..f65b8e6 100644 --- a/configure.ac +++ b/configure.ac @@ -146,7 +146,7 @@ AC_DEFINE_UNQUOTED([MAX_CONNECTIONS],[$MAX_CONNECTIONS],[Limit the maximum numbe AC_SUBST(MAX_CONNECTIONS) MAX_DOCUMENTS=10 -AS_IF([test -n "$with_max_documents" -a "$with_max_documents" -gt "0" -a "$with_max_documents" -lt "$MAX_CONNECTIONS"], +AS_IF([test -n "$with_max_documents" -a "$with_max_documents" -gt "0"], [MAX_DOCUMENTS="$with_max_documents"]) AS_IF([test "$MAX_DOCUMENTS" -gt "$MAX_CONNECTIONS"], [MAX_DOCUMENTS="$MAX_CONNECTIONS"]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f25f434be3c4a4f873b00b800f64934c3ab6cf9c Author: Andras Timar Date: Mon Jan 9 21:17:25 2017 +0100 change version to 'master' Change-Id: Ic842f811e86d3d910226fcd07ec44981917b8303 diff --git a/configure.ac b/configure.ac index 386fe3a..b029d53 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [2.0.1+], [libreoffice@lists.freedesktop.org]) +AC_INIT([loolwsd], [master], [libreoffice@lists.freedesktop.org]) LT_INIT([shared, disable-static, dlopen]) AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am
configure.ac |2 +- loleaflet/Makefile.am | 35 ++- 2 files changed, 19 insertions(+), 18 deletions(-) New commits: commit 907b391f433983f170901ceac1bb5e5640bf6c6a Author: Pranav Kant Date: Wed Jan 4 19:38:33 2017 +0530 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 diff --git a/configure.ac b/configure.ac index 4b05b56..386fe3a 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_PREREQ([2.69]) AC_INIT([loolwsd], [2.0.1+], [libreoffice@lists.freedesktop.org]) LT_INIT([shared, disable-static, dlopen]) -AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects]) +AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects tar-pax]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index ade8fee..178b827 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -12,8 +12,7 @@ MINIFY=false EXTRA_DIST = $(shell git ls-files) -.PHONY: build -build: node_modules +all-local: node_modules rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p dist/plugins/draw-$(DRAW_VERSION) cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist ../../dist/plugins/draw-$(DRAW_VERSION) jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY) @@ -24,25 +23,27 @@ node_modules: npm-shrinkwrap.json .PHONY: build-l10n build-l10n: - mkdir -p dist/l10n/styles - util/po2json.py --quiet po/*.po - mv po/*.json dist/l10n/ util/po2json.py --quiet po/styles/*.po + +.PHONY: move-l10n-to-dist +move-l10n-to-dist: + mv po/*.json dist/l10n/ mv po/styles/*.json dist/l10n/styles/ -all-local: build - -.PHONY: dist -dist: MINIFY=true -dist: all build-l10n - rm -rf loleaflet-$(VERSION) - mkdir loleaflet-$(VERSION) - cp -ar dist loleaflet-$(VERSION) - mkdir -p loleaflet-$(VERSION)/dist/node_modules/jquery-ui/themes/ui-lightness/images/ - cp -a node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_ee_1x100.png loleaflet-$(VERSION)/dist/node_modules/jquery-ui/themes/ui-lightness/images/ - tar cfz loleaflet-$(VERSION).tar.gz loleaflet-$(VERSION) - rm -rf loleaflet-$(VERSION) +install-data-hook: + mkdir -p $(DESTDIR)$(pkgdatadir)/loleaflet; \ + cp -ar dist/ $(DESTDIR)$(pkgdatadir)/loleaflet/; + +dist-hook: build-l10n + chmod u+w $(distdir)/dist + + mkdir -p $(distdir)/dist/l10n/styles + mv po/*.json $(distdir)/dist/l10n/ + mv po/styles/*.json $(distdir)/dist/l10n/styles/ + + mkdir -p $(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/ + cp -a node_modules/jquery-ui/themes/ui-lightness/images/ui-bg_highlight-soft_100_ee_1x100.png $(distdir)/dist/node_modules/jquery-ui/themes/ui-lightness/images/ pot: xgettext --from-code=UTF-8 --keyword=_ --output=po/templates/loleaflet-ui.pot \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am
configure.ac |2 +-
loleaflet/Makefile.am |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9ee40629354973a86c825ea4fdcb1e014e7ccf0f
Author: Andras Timar
Date: Wed Dec 14 11:34:11 2016 +0100
Bump version to 2.0.1+
Change-Id: I1a670d3b9a3a5d3711f1a83b2a8978e032ded774
diff --git a/configure.ac b/configure.ac
index 6e1004b..fd0b0f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [2.0.0+], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [2.0.1+], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 227a0c8..fa454c3 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=2.0.0+
+VERSION=2.0.1+
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile loleaflet/Makefile.am Makefile.am
Makefile.am |2 - configure.ac |1 loleaflet/Makefile| 91 --- loleaflet/Makefile.am | 95 ++ 4 files changed, 97 insertions(+), 92 deletions(-) New commits: commit b3db321e85b85d5992dc412662cf0aa782a4808b Author: Pranav Kant Date: Mon Dec 12 17:53:32 2016 +0530 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 diff --git a/Makefile.am b/Makefile.am index b04da13..b1f1932 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . test +SUBDIRS = . test loleaflet export ENABLE_DEBUG diff --git a/configure.ac b/configure.ac index a9be21d..6e1004b 100644 --- a/configure.ac +++ b/configure.ac @@ -300,6 +300,7 @@ AC_SUBST(LOOLWSD_DATADIR) AC_CONFIG_FILES([Makefile test/Makefile + loleaflet/Makefile loolwsd.spec loolwsd.xml maketarballfordeb.sh]) diff --git a/loleaflet/Makefile b/loleaflet/Makefile.am similarity index 91% rename from loleaflet/Makefile rename to loleaflet/Makefile.am index b9a3303..227a0c8 100644 --- a/loleaflet/Makefile +++ b/loleaflet/Makefile.am @@ -8,14 +8,13 @@ VERSION=2.0.0+ # Version number of the bundled 'draw' thing DRAW_VERSION=0.2.4 -DEBUG=false MINIFY=false .PHONY: build build: node_modules rm -rf dist/plugins/draw-$(DRAW_VERSION) && mkdir -p dist/plugins/draw-$(DRAW_VERSION) cd plugins/draw-$(DRAW_VERSION) && jake build && cp -ar dist ../../dist/plugins/draw-$(DRAW_VERSION) - jake build debug=$(DEBUG) minify=$(MINIFY) + jake build debug=$(ENABLE_DEBUG) minify=$(MINIFY) node_modules: npm-shrinkwrap.json npm install @@ -30,11 +29,11 @@ build-l10n: util/po2json.py --quiet po/styles/*.po mv po/styles/*.json dist/l10n/styles/ -all: build build-l10n +all-local: build .PHONY: dist dist: MINIFY=true -dist: all +dist: all build-l10n rm -rf loleaflet-$(VERSION) mkdir loleaflet-$(VERSION) cp -ar dist loleaflet-$(VERSION) @@ -70,6 +69,11 @@ l10n: pot for i in po/ui-*.po; do pot2po --input=po/templates/loleaflet-ui.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done for i in po/help-*.po; do pot2po --input=po/templates/loleaflet-help.pot --template=$$i --output=$$i.new; mv $$i.new $$i;done +clean-local: + rm -rf node_modules + cd dist && rm -f bundle.js bundle.js.map admin-bundle.js admin-bundle.js.map + cd plugins/draw-$(DRAW_VERSION) && rm -f dist/*.js + spec/data/load-test: if [ ! -d spec/data/load_test ]; then \ mkdir -p spec/data/load_test; \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile
configure.ac |2 +-
loleaflet/Makefile |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 740a28bfaed642df1628af79b303ae9dc14fe9f1
Author: Andras Timar
Date: Mon Nov 28 19:13:50 2016 +0100
Bump version to 2.0.0+
diff --git a/configure.ac b/configure.ac
index c08025b..a9be21d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [2.0.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [2.0.0+], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 917eaf4..3265cb8 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=2.0.0
+VERSION=2.0.0+
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile
configure.ac |2 +-
loleaflet/Makefile |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7a5fbd7f3c7ccc9fea5d7105e2361bb6e27e6f31
Author: Andras Timar
Date: Mon Nov 28 19:10:27 2016 +0100
Bump version to 2.0.0
diff --git a/configure.ac b/configure.ac
index 7aa8775..c08025b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.9.0], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [2.0.0], [libreoffice@lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 32829d9..917eaf4 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.9.0
+VERSION=2.0.0
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
