solenv/gbuild/platform/unxgcc.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 53e2f8906fa067efdbb9ef90aa1ebaac4ab0ed2a
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Dec 23 12:41:09 2022 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Dec 23 11:44:14 2022 +0000
Don't use symlinks for the Emscripten soffice.data and
soffice.data.js.metadata
Symlinks just complicate things. Disk space is cheap. soffice.data is
under 100 megs even with Qt5.
Note that after this you will need to clean out the existing
soffice.data and soffice.data.js.metadata symlinks before you run
make, otherwise you will get errors.
As such, it is a bit weird that we unconditionally play around with
soffice.data for *all* (non-CppunitTest) Executable targets. (Thus,
for instance also for vcldemo and unoidl-read.) We should do this
dance only for the soffice executable. And we should reduce the number
of executables we build for Emscripten. Probably none other than
soffice itself makes sense?
Change-Id: I75f6719b92d83e88bf59d65c38aeeab47e0b29e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144781
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index f1cb77a63054..bfb860a41fc2 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -183,8 +183,8 @@ $(if $(filter TRUE,$(ENABLE_QT5)), \
sed -e 's/@APPNAME@/$(subst $(gb_Executable_EXT),,$(notdir $(1)))/'
$(QT5_PLATFORMS_SRCDIR)/wasm_shell.html > $(dir $(1))qt_$(notdir $(1)); \
cp $(QT5_PLATFORMS_SRCDIR)/qtlogo.svg $(QT5_PLATFORMS_SRCDIR)/qtloader.js
$(dir $(1)) ; \
) \
- ln -sf $(call
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir
$(1))/soffice.data ; \
- ln -sf $(call
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
$(dir $(1))/soffice.data.js.metadata \
+ cp $(call
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data $(dir
$(1))/soffice.data ; \
+ cp $(call
gb_CustomTarget_get_workdir,static/emscripten_fs_image)/soffice.data.js.metadata
$(dir $(1))/soffice.data.js.metadata \
)
endef
