mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: use zip --must-match to fail if input files are missing

Browse Source 
With the last "find" call to determine inputs removed, this should
hopefully work reliably now.

Change-Id: Ie725e29d0889ec40cefc961ff61b2cf29839fb66
This commit is contained in:
Michael Stahl
2013-03-12 22:06:21 +01:00
parent 5c57a102ef
commit ec8d4b1d23
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/CustomTarget_autocorr.mk
View File

@@ -291,7 +291,7 @@ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.dat :
$(call gb_Output_announce,$*.dat,$(true),ZIP,2) $(call gb_Output_announce,$*.dat,$(true),ZIP,2)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
cd $(EXTRAS_AUTOCORR_DIR) && \ cd $(EXTRAS_AUTOCORR_DIR) && \
zip -qrX --filesync $@ $(EXTRAS_AUTOCORR_FILES) \ zip -qrX --filesync --must-match $@ $(EXTRAS_AUTOCORR_FILES) \
) )
define extras_Autocorr_make_file_deps define extras_Autocorr_make_file_deps

2
solenv/gbuild/ExtensionTarget.mk
View File

@@ -116,7 +116,7 @@ $(call gb_ExtensionTarget_get_target,%) : \
$(if $(LICENSE),cp -f $(LICENSE) $(call gb_ExtensionTarget_get_rootdir,$*)/registration &&) \ $(if $(LICENSE),cp -f $(LICENSE) $(call gb_ExtensionTarget_get_rootdir,$*)/registration &&) \
$(if $(and $(gb_ExtensionTarget_TRANS_LANGS),$(DESCRIPTION)),cp $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \ $(if $(and $(gb_ExtensionTarget_TRANS_LANGS),$(DESCRIPTION)),cp $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \
cd $(call gb_ExtensionTarget_get_rootdir,$*) && \ cd $(call gb_ExtensionTarget_get_rootdir,$*) && \
$(gb_ExtensionTarget_ZIPCOMMAND) -rX --filesync \ $(gb_ExtensionTarget_ZIPCOMMAND) -rX --filesync --must-match \
$(call gb_ExtensionTarget_get_target,$*) \ $(call gb_ExtensionTarget_get_target,$*) \
$(sort $(FILES))) $(sort $(FILES)))

2
solenv/gbuild/Zip.mk
View File

@@ -50,7 +50,7 @@ $(call gb_Zip_get_target,%) :
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
$(FILES)) && \ $(FILES)) && \
mkdir -p $(dir $(call gb_Zip_get_target,$*)) && \ mkdir -p $(dir $(call gb_Zip_get_target,$*)) && \
cd $(LOCATION) && cat $${RESPONSEFILE} | tr "[:space:]" "\n" | $(gb_Zip_ZIPCOMMAND) -@rX --filesync $(call gb_Zip_get_target,$*) && \ cd $(LOCATION) && cat $${RESPONSEFILE} | tr "[:space:]" "\n" | $(gb_Zip_ZIPCOMMAND) -@rX --filesync --must-match $(call gb_Zip_get_target,$*) && \
rm -f $${RESPONSEFILE} ) rm -f $${RESPONSEFILE} )
# the final target is a touch target; we use it as registered targets should be in workdir, not in outdir # the final target is a touch target; we use it as registered targets should be in workdir, not in outdir