simplify some sed rules/statements and use proper quoting

make removes partially built targets in case the rule exits with
non-zero status, so creating a temp file and moving it is not necessary
also use single quotes for cases where characters might be interpreted
by the shell
Also combine multiple sed calls into a single call of sed with multiple
expressions and replace additional "grep -v foo" with corresponding sed
delete command

Change-Id: Iff7e3b962175e347e5ed100a87c96fbaeef39985
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166410
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

5 files changed, 20 insertions, 36 deletions

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 260a52b25fec..266df95f2706 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -19,37 +19,24 @@ $(call gb_CustomTarget_get_target,cli_ure/source) : \
 	$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs : \
-	$(SRCDIR)/cli_ure/source/basetypes/assembly.cs \
-	$(SRCDIR)/cli_ure/version/version.txt \
-	$(cli_ure_source_MAKEFILE) \
-	| $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/.dir
+        $(SRCDIR)/cli_ure/source/basetypes/assembly.cs \
+        $(SRCDIR)/cli_ure/version/version.txt \
+        $(cli_ure_source_MAKEFILE) \
+        | $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/.dir
+	sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" $< > $@
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx : \
-	$(SRCDIR)/cli_ure/source/native/assembly.cxx \
-	$(SRCDIR)/cli_ure/version/version.txt \
-	$(cli_ure_source_MAKEFILE) \
-	| $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/.dir
+        $(SRCDIR)/cli_ure/source/native/assembly.cxx \
+        $(SRCDIR)/cli_ure/version/version.txt \
+        $(cli_ure_source_MAKEFILE) \
+        | $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/.dir
+	sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" $< > $@
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
-	$(SRCDIR)/cli_ure/source/ure/assembly.cs \
-	$(SRCDIR)/cli_ure/version/version.txt \
-	$(cli_ure_source_MAKEFILE) \
-	| $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir
-
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
-	sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" \
-		< $< > $@.tmp && \
-	mv $@.tmp $@
-
-# TODO use macros for this
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
-	sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" \
-		< $< > $@.tmp && \
-	mv $@.tmp $@
-
-$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
-	sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" \
-		< $< > $@.tmp && \
-	mv $@.tmp $@
+        $(SRCDIR)/cli_ure/source/ure/assembly.cs \
+        $(SRCDIR)/cli_ure/version/version.txt \
+        $(cli_ure_source_MAKEFILE) \
+        | $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir
+	sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" $< > $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/editeng/CustomTarget_generated.mk b/editeng/CustomTarget_generated.mk
index 77fb4f7bf383..8f05f6ccb23b 100644
--- a/editeng/CustomTarget_generated.mk
+++ b/editeng/CustomTarget_generated.mk
@@ -19,9 +19,8 @@ $(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.tx
 	$(call gb_ExternalExecutable_get_command,python) $(editeng_PY) $(editeng_SRC)/tokens.txt $(editeng_INC)/tokens.gperf
 
 $(editeng_INC)/tokens.cxx : $(editeng_INC)/tokens.gperf
-	$(GPERF) --compare-strncmp --readonly-tables --output-file=$(editeng_INC)/tokens.cxx $(editeng_INC)/tokens.gperf
-	sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(editeng_INC)/tokens.cxx
-	sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "/^#line/d" $(editeng_INC)/tokens.cxx
+	$(GPERF) --compare-strncmp --readonly-tables $(editeng_INC)/tokens.gperf \
+	| sed -e '/^#line/d' -e 's/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g' > $@
 
 $(call gb_CustomTarget_get_target,editeng/generated) : $(editeng_INC)/tokens.cxx
 
diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk
index 065e26e1bb1c..bc980eb48e82 100644
--- a/filter/CustomTarget_svg.mk
+++ b/filter/CustomTarget_svg.mk
@@ -41,8 +41,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		 $(GPERF) --compare-strncmp -C -m 20 --switch=2 --readonly-tables $(filter_GEN_svg_Tokens_gperf) \
-			 | sed -e "s/(char\*)0/(char\*)0$(COMMA) 0/g" \
-			 > $(filter_GEN_svg_Tokens_cxx))
+			 | sed -e '/^#line/d' -e 's/(char\*)0/(char\*)0$(COMMA) 0/g' > $@)
 
 $(filter_GEN_svg_Script_hxx) : \
 			$(call gb_ExternalExecutable_get_dependencies,python) \
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 1237640fb13e..64272b9d450e 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -85,7 +85,7 @@ $(call gb_CustomTarget_get_target,$(1)) : $(call gb_CustomTarget_get_workdir,$(1
 $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(call gb_CustomTarget_get_workdir,$(1))/misc/$(3)
 	$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,GPF,1)
 	$(GPERF) --compare-strncmp --switch=2 --readonly-tables $$< \
-		| sed -e 's/char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $$@
+		| sed -e '/^#line/d' -e 's/(char\*)0/(char\*)0, 0/g' > $$@
 
 endef
 
diff --git a/sw/CustomTarget_generated.mk b/sw/CustomTarget_generated.mk
index 80a1c1642ea9..c3277ca418a7 100644
--- a/sw/CustomTarget_generated.mk
+++ b/sw/CustomTarget_generated.mk
@@ -28,8 +28,7 @@ $(sw_INC)/tokens.cxx : $(sw_INC)/TextBlockTokens.gperf $(sw_INC)/BlockListTokens
 	--class-name=TextBlockTokens --word-array-name=textBlockList --enum $(sw_INC)/TextBlockTokens.gperf
 	$(GPERF) --compare-strncmp --readonly-tables -T $(sw_INC)/BlockListTokens.gperf \
 	--class-name=BlockListTokens --word-array-name=blockListList >> $(sw_INC)/tokens.cxx
-	sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(sw_INC)/tokens.cxx
-	sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e "/^#line/d" $(sw_INC)/tokens.cxx
+	sed -i $(if $(filter MACOSX,$(OS_FOR_BUILD)),'') -e '/^#line/d' -e 's/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g' $(sw_INC)/tokens.cxx
 
 $(call gb_CustomTarget_get_target,sw/generated) : $(sw_INC)/tokens.cxx