Makefile.in | 1 + rust_uno/CustomTarget_cargo.mk | 9 +++++++++ rust_uno/CustomTarget_rustmaker.mk | 9 +++++++++ 3 files changed, 19 insertions(+)
New commits: commit 6d12a896d604269c9f2c0f9499d32dfe7f4400e8 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Nov 25 11:39:25 2025 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Tue Nov 25 14:59:18 2025 +0100 Clean the artifacts that rust_uno/CustomTarget_* put in $(SRCDIR) This is a temporary measure. The right fix will be to not have those CustomTargets put anything into $(SRCDIR) in the first place. Change-Id: Ib211b5bc5e0059c8c8206c044e28443265d69353 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194517 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> Code-Style: Stephan Bergmann <[email protected]> diff --git a/Makefile.in b/Makefile.in index cedf1a89011b..5bdf5198cfd4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -189,6 +189,7 @@ clean-host: rm -fr $(TESTINSTALLDIR) rm -fr $(INSTDIR) rm -fr $(WORKDIR) + rm -fr $(SRCDIR)/rust_uno/Cargo.lock $(SRCDIR)/rust_uno/src/generated $(SRCDIR)/rust_uno/target clean-build: ifneq ($(CROSS_COMPILING),) diff --git a/rust_uno/CustomTarget_cargo.mk b/rust_uno/CustomTarget_cargo.mk index d27ec0b0797a..c7f56870f419 100644 --- a/rust_uno/CustomTarget_cargo.mk +++ b/rust_uno/CustomTarget_cargo.mk @@ -15,4 +15,13 @@ $(call gb_CustomTarget_get_target,rust_uno/cargo): \ $(gb_CustomTarget_workdir)/rust_uno/rustmaker/cpp cd $(SRCDIR)/rust_uno && cargo build $(if $(verbose),--verbose,) --release +#TODO: Add to the general pattern rule from solenv/gbuild/CustomTarget.mk, instead of having to +# repeat its recipe here: +$(call gb_CustomTarget_get_clean_target,rust_uno/cargo): + $(call gb_Output_announce,rust_uno/cargo,$(false),CUS,3) + $(call gb_Helper_abbreviate_dirs,\ + rm -rf $(gb_CustomTarget_workdir)/rust_uno/cargo && \ + rm -f $(call gb_CustomTarget_get_target,rust_uno/cargo)) + rm -fr $(SRCDIR)/rust_uno/Cargo.lock $(SRCDIR)/rust_uno/target + # vim: set noet sw=4 ts=4: diff --git a/rust_uno/CustomTarget_rustmaker.mk b/rust_uno/CustomTarget_rustmaker.mk index b519be3c627c..4a253f861141 100644 --- a/rust_uno/CustomTarget_rustmaker.mk +++ b/rust_uno/CustomTarget_rustmaker.mk @@ -28,4 +28,13 @@ $(gb_CustomTarget_workdir)/rust_uno/rustmaker/cpp: \ $(call gb_UnoApi_get_target,offapi) $(call gb_UnoApi_get_target,udkapi))) touch $@ +#TODO: Add to the general pattern rule from solenv/gbuild/CustomTarget.mk, instead of having to +# repeat its recipe here: +$(call gb_CustomTarget_get_clean_target,rust_uno/rustmaker): + $(call gb_Output_announce,rust_uno/rustmaker,$(false),CUS,3) + $(call gb_Helper_abbreviate_dirs,\ + rm -rf $(gb_CustomTarget_workdir)/rust_uno/rustmaker && \ + rm -f $(call gb_CustomTarget_get_target,rust_uno/rustmaker)) + rm -fr $(SRCDIR)/rust_uno/src/generated + # vim: set noet sw=4 ts=4:
