From 5b46c45f4a0b6985a518911c829bfcf5a4d56239 Mon Sep 17 00:00:00 2001 From: Stefano D'Angelo Date: Mon, 12 May 2025 07:44:28 +0200 Subject: [PATCH] added .DELETE_ON_ERROR and ensured proper cleanup on error --- templates/android-make/Makefile | 2 ++ templates/cmd-make/Makefile | 2 ++ templates/ios-make/Makefile | 2 ++ templates/lv2-make/Makefile | 7 ++++++- templates/vst3-make/Makefile | 2 ++ templates/web-make/Makefile | 2 ++ 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/templates/android-make/Makefile b/templates/android-make/Makefile index 9b5118e..b6a2b6f 100644 --- a/templates/android-make/Makefile +++ b/templates/android-make/Makefile @@ -169,3 +169,5 @@ $(CXX_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).cp $(CXX) $^ -o $@ -c $(CXXFLAGS_ALL) -include $(MKINC_DIR)/rules-secondexp-extra.mk + +.DELETE_ON_ERROR: diff --git a/templates/cmd-make/Makefile b/templates/cmd-make/Makefile index eee5cf3..6368b1c 100644 --- a/templates/cmd-make/Makefile +++ b/templates/cmd-make/Makefile @@ -129,3 +129,5 @@ $(CXX_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).cp $(CXX) $^ -o $@ -c $(CXXFLAGS_ALL) -include $(MKINC_DIR)/rules-secondexp-extra.mk + +.DELETE_ON_ERROR: diff --git a/templates/ios-make/Makefile b/templates/ios-make/Makefile index 081cb9a..7ace4df 100644 --- a/templates/ios-make/Makefile +++ b/templates/ios-make/Makefile @@ -95,3 +95,5 @@ $(RESOURCES_OUT): build/gen/res/%: $$(filter $$(PERCENT)/%,$$(RESOURCES)) | buil cp -R $^ $@ -include $(MKINC_DIR)/rules-secondexp-extra.mk + +.DELETE_ON_ERROR: diff --git a/templates/lv2-make/Makefile b/templates/lv2-make/Makefile index 56a2fb2..7d7177c 100644 --- a/templates/lv2-make/Makefile +++ b/templates/lv2-make/Makefile @@ -124,7 +124,10 @@ strip: $(STRIP_PREREQS) #rdfproc lv2_store serialize ntriples > build/$(BUNDLE_DIR)/manifest.ttl || (rm lv2_store* && exit 1) #rm lv2_store* #f=`cat build/$(BUNDLE_DIR)/manifest.ttl` && echo "$f" | sed '/^[[:space:]]**$/d' > build/$(BUNDLE_DIR)/manifest.ttl - f=`sed '/^[[:space:]]*$$/d' build/$(BUNDLE_DIR)/manifest.ttl` && echo "$$f" > build/$(BUNDLE_DIR)/manifest.ttl + $(eval TMP := $(shell mktemp /tmp/index.XXXXXX)) + sed '/^[[:space:]]*$$/d' build/$(BUNDLE_DIR)/manifest.ttl > $(TMP) || (rm $(TMP) && exit 1) + cp $(TMP) build/$(BUNDLE_DIR)/manifest.ttl || (rm $(TMP) && exit 1) + rm $(TMP) install: all @for d in `find build/$(BUNDLE_DIR) -type d`; do \ @@ -172,3 +175,5 @@ $(CXX_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).cp $(CXX) $^ -o $@ -c $(CXXFLAGS_ALL) -include $(MKINC_DIR)/rules-secondexp-extra.mk + +.DELETE_ON_ERROR: diff --git a/templates/vst3-make/Makefile b/templates/vst3-make/Makefile index fe2000f..ec82afc 100644 --- a/templates/vst3-make/Makefile +++ b/templates/vst3-make/Makefile @@ -192,3 +192,5 @@ $(CXX_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).cp $(CXX) $^ -o $@ -c $(CXXFLAGS_ALL) -include $(MKINC_DIR)/rules-secondexp-extra.mk + +.DELETE_ON_ERROR: diff --git a/templates/web-make/Makefile b/templates/web-make/Makefile index 5f29b06..6be8d7b 100644 --- a/templates/web-make/Makefile +++ b/templates/web-make/Makefile @@ -134,3 +134,5 @@ $(CXX_OBJS): build/obj/%.o: $$(filter $$(PERCENT)/$$(basename $$(notdir $$@)).cp $(CXX) $^ -o $@ -c $(CXXFLAGS_ALL) -include $(MKINC_DIR)/rules-secondexp-extra.mk + +.DELETE_ON_ERROR: