ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

simplify some sed rules/statements and use proper quoting

Browse Source 
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>
This commit is contained in:
Christian Lohmaier
2024-04-26 14:01:19 +02:00
parent 1a774927f1
commit f618f08cc3
5 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli_ure/CustomTarget_cli_ure_assemblies.mk
+15 -28
View File
@@ -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: