Kaydet (Commit) faa9a681 authored tarafından Christian Lohmaier's avatar Christian Lohmaier

using xargs for string manipulation is somewhat of an abuse

(and breaks the build on windows/cygwin for some reason, although
running the find/xargs command by itself works just fine)
So just use awk instead and have a nicer solution without breaking the
build

Change-Id: I24b9f52c0b84c2e8019f3f6719a307fe508fb755
üst ed3fd76b
...@@ -595,27 +595,28 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : ...@@ -595,27 +595,28 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
# find shell command below (see issue 110041): # find shell command below (see issue 110041):
$(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list : $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs,\
echo '<list>' > $@ \ find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\
&& ( find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) -name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \ -name *.xcu -size +0c \
&& echo '</list>' >> $@ \ | awk 'BEGIN{print "<list>"} \
{print "<filename>"$$0"</filename>"} \
END {print "</list>"}' > $@ \
) )
$(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
echo '<list>' > $@ \ $(call gb_Helper_abbreviate_dirs,\
&& $(call gb_Helper_abbreviate_dirs, \ find $(call gb_XcuResTarget_get_target,registry/$*/)\
(find $(call gb_XcuResTarget_get_target,registry/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\ $(foreach driver,$(postprocess_DRIVERS),\
$(foreach driver,$(postprocess_DRIVERS), \ $(call gb_XcuResTarget_get_target,$(driver)/$*/)))\
&& (find $(call gb_XcuResTarget_get_target,$(driver)/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
) \ $(call gb_XcuResTarget_get_target,updchk/$*/))\
) \ -name *.xcu \
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ | awk 'BEGIN{print "<list>"} \
&& (find $(call gb_XcuResTarget_get_target,updchk/$*/) -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>') >> $@ \ {print "<filename>"$$0"</filename>"} \
) \ END {print "</list>"}' > $@ \
) \ )
&& echo '</list>' >> $@
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list : $(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment