diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-09 00:40:43 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-19 10:50:35 +0100 |
| commit | ad5563b4f210b32bcdd7a2efb167ce2c2745f9db (patch) | |
| tree | 5e193a9885010ce12107cf4a46939fa2e61ff52b /desktop | |
| parent | 599cbdb9c2a1184680bb89aa2978e8003eca93d9 (diff) | |
WASM setup as non-multiuser, desktop build
Change-Id: I2ee6e006554cf1e5e5e42c2f4f73d8788bff8f4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128585
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/app/userinstall.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index f936680f7eea..32d5b31278c1 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -499,7 +499,7 @@ void Desktop::Init() RequestHandler::Status aStatus = RequestHandler::Enable(true); if ( aStatus == RequestHandler::IPC_STATUS_PIPE_ERROR ) { -#if defined ANDROID +#if defined(ANDROID) || defined(EMSCRIPTEN) // Ignore crack pipe errors on Android #else // Keep using this oddly named BE_PATHINFO_MISSING value @@ -1273,7 +1273,7 @@ int Desktop::Main() userinstall::Status inst_fin = userinstall::finalize(); if (inst_fin != userinstall::EXISTED && inst_fin != userinstall::CREATED) { - SAL_WARN( "desktop.app", "userinstall failed"); + SAL_WARN( "desktop.app", "userinstall failed: " << inst_fin); if ( inst_fin == userinstall::ERROR_NO_SPACE ) HandleBootstrapErrors( BE_USERINSTALL_NOTENOUGHDISKSPACE, OUString() ); @@ -1297,7 +1297,7 @@ int Desktop::Main() SetSplashScreenProgress(25); -#if HAVE_FEATURE_DESKTOP +#if HAVE_FEATURE_DESKTOP && !defined(EMSCRIPTEN) // check user installation directory for lockfile so we can be sure // there is no other instance using our data files from a remote host diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index bcfd7e3e5596..669a7316cb42 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -27,7 +27,7 @@ #include <officecfg/Setup.hxx> #include <osl/file.h> #include <osl/file.hxx> -#if defined ANDROID || defined IOS +#if defined ANDROID || defined IOS || defined EMSCRIPTEN #include <rtl/bootstrap.hxx> #endif #include <rtl/ustring.hxx> @@ -40,7 +40,7 @@ namespace desktop::userinstall { namespace { -#if !(defined ANDROID || defined IOS) +#if !(defined ANDROID || defined IOS || defined EMSCRIPTEN) osl::FileBase::RC copyRecursive( OUString const & srcUri, OUString const & dstUri) { @@ -104,7 +104,7 @@ Status create(OUString const & uri) { if (e != osl::FileBase::E_None && e != osl::FileBase::E_EXIST) { return ERROR_OTHER; } -#if !(defined ANDROID || defined IOS) +#if !(defined ANDROID || defined IOS || defined EMSCRIPTEN) #if defined UNIX // Set safer permissions for the user directory by default: osl::File::setAttributes( |