diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-21 21:50:55 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-04-26 14:01:19 +0200 |
| commit | f618f08cc310f20e2888cf4e5e99cfeb8fbd15b7 (patch) | |
| tree | bfad2d9b5f14f60a862f7f372c5e5c4a98719009 /cli_ure | |
| parent | 1a774927f1bd3e9e171732e3636d61ba46ecdc6d (diff) | |
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>
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/CustomTarget_cli_ure_assemblies.mk | 43 |
1 files changed, 15 insertions, 28 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: |