diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-03-12 22:06:21 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-13 14:33:56 +0100 |
| commit | ec8d4b1d23e85cc27f1d08e1b1ed9c18e63f7a3c (patch) | |
| tree | 54f8f141f436a00ab2ee25de27bb082c4f259245 | |
| parent | 5c57a102efb261975b89729e4e4042c5848af174 (diff) | |
gbuild: use zip --must-match to fail if input files are missing
With the last "find" call to determine inputs removed, this should
hopefully work reliably now.
Change-Id: Ie725e29d0889ec40cefc961ff61b2cf29839fb66
| -rw-r--r-- | extras/CustomTarget_autocorr.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/ExtensionTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Zip.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk index b04bebf2647c..ea2838d927c2 100644 --- a/extras/CustomTarget_autocorr.mk +++ b/extras/CustomTarget_autocorr.mk @@ -291,7 +291,7 @@ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.dat : $(call gb_Output_announce,$*.dat,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOCORR_DIR) && \ - zip -qrX --filesync $@ $(EXTRAS_AUTOCORR_FILES) \ + zip -qrX --filesync --must-match $@ $(EXTRAS_AUTOCORR_FILES) \ ) define extras_Autocorr_make_file_deps diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 09ebb1899ed6..171d754c1e48 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -116,7 +116,7 @@ $(call gb_ExtensionTarget_get_target,%) : \ $(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,$*) &&) \ cd $(call gb_ExtensionTarget_get_rootdir,$*) && \ - $(gb_ExtensionTarget_ZIPCOMMAND) -rX --filesync \ + $(gb_ExtensionTarget_ZIPCOMMAND) -rX --filesync --must-match \ $(call gb_ExtensionTarget_get_target,$*) \ $(sort $(FILES))) diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk index 2685ce33d26c..4f8b13948c38 100644 --- a/solenv/gbuild/Zip.mk +++ b/solenv/gbuild/Zip.mk @@ -50,7 +50,7 @@ $(call gb_Zip_get_target,%) : RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ $(FILES)) && \ 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} ) # the final target is a touch target; we use it as registered targets should be in workdir, not in outdir |