strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix --with-package-format=emscripten

Browse source 
For one, a dependency on gb_Postprocess_get_target,AllModulesButInstsetNative
was missing, so copying from instdir might have kicked in too early, before the
instdir files had been updated (e.g., in an incremental build).  For another, in
a from-scratch build, files like instdir/program/qt_soffice.html might not yet
have been around, but I'm too dumb to get gbuild to do what I want here (i.e.,
copy files from instdir to workdir once the files are available in instdir and
only if the files in instdir are newer than those in workdir).  So just make
this .PHONY and always copy all the files (in line with how other PKGFORMATs
also always rebuild their artifacts, IIUC).

Change-Id: I8b84677cdf867a2b66027ec4a4d781cd1fe623b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171077
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann 2024-07-26 17:27:17 +02:00
parent 71e29326d2
commit c91c190379
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
instsetoo_native/CustomTarget_emscripten-install.mk
View file

@ -24,12 +24,12 @@ emscripten_install_files := \
soffice.worker.js \
$(if $(ENABLE_SYMBOLS_FOR),soffice.wasm.dwp) \
.PHONY: $(call gb_CustomTarget_get_target,instsetoo_native/emscripten-install)
$(call gb_CustomTarget_get_target,instsetoo_native/emscripten-install): \
$(foreach i,$(emscripten_install_files),$(WORKDIR)/installation/LibreOffice/emscripten/$(i))
$(foreach i,$(emscripten_install_files),$(WORKDIR)/installation/LibreOffice/emscripten/$(i)): \
$(WORKDIR)/installation/LibreOffice/emscripten/%: $(INSTDIR)/program/%
mkdir -p $(dir $@)
cp $< $@
| $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
mkdir -p $(WORKDIR)/installation/LibreOffice/emscripten
for i in $(emscripten_install_files); do \
cp $(INSTDIR)/program/$$i $(WORKDIR)/installation/LibreOffice/emscripten/ || exit 1; \
done
# vim: set noet sw=4 ts=4: