strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Non-standard sed -i option is different on macOS than with GNU sed

Browse source 
While with GNU sed the optional backup suffix is given directly as part of the
-i[SUFFIX] (or --in-place[=SUFFIX]) argument, on macOS it must unconditionally
be given as a (potentially empty) argument following the -i argument.  That
means that on macOS the -e that happens to follow the -i in these sed
invocations (and that happens to not be necessary to introduce the following
script in these invocations) was mistaken as the backup suffix, causing creation
of pointless workdir/CustomTarget/*/generated/tokens.cxx-e backup files.

Change-Id: Icd865c76139afa348d03813eb83653afd7221a0e
Reviewed-on: https://gerrit.libreoffice.org/66491
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2019-01-17 00:00:46 +01:00
parent e9a9fce778
commit d8106b6db4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editeng/CustomTarget_generated.mk
View file

@ -19,8 +19,8 @@ $(editeng_INC)/tokens.hxx $(editeng_INC)/tokens.gperf : $(editeng_SRC)/tokens.tx
$(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 -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(editeng_INC)/tokens.cxx
sed -i -e "/^#line/d" $(editeng_INC)/tokens.cxx
sed -i $(if $(filter MACOSX,$(OS)),'') -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(editeng_INC)/tokens.cxx
sed -i $(if $(filter MACOSX,$(OS)),'') -e "/^#line/d" $(editeng_INC)/tokens.cxx
$(call gb_CustomTarget_get_target,editeng/generated) : $(editeng_INC)/tokens.cxx

4
sw/CustomTarget_generated.mk
View file

@ -26,8 +26,8 @@ $(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 -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(sw_INC)/tokens.cxx
sed -i -e "/^#line/d" $(sw_INC)/tokens.cxx
sed -i $(if $(filter MACOSX,$(OS)),'') -e "s/(char\*)0/(char\*)0, XML_TOKEN_INVALID/g" $(sw_INC)/tokens.cxx
sed -i $(if $(filter MACOSX,$(OS)),'') -e "/^#line/d" $(sw_INC)/tokens.cxx
$(call gb_CustomTarget_get_target,sw/generated) : $(sw_INC)/tokens.cxx