odk/CustomTarget_check.mk | 13 +++++++------ odk/util/check.pl | 1 - 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 43c422ebb7a7c1431d179ed1b9572fabf9845aa8 Author: David Tardon <dtar...@redhat.com> Date: Sun Apr 21 18:15:15 2013 +0200 silence odk check Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e Reviewed-on: https://gerrit.libreoffice.org/3536 Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org> Tested-by: Fridrich Strba <fridr...@documentfoundation.org> diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index ee693ff..85113b3 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -43,11 +43,12 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) - touch $@ - $(PERL) $< \ - $(INSTDIR)/$(gb_Package_SDKDIRNAME) \ - $(call gb_CustomTarget_get_workdir,odk/odkcommon) \ - $(odk_PLATFORM) "$(gb_Executable_EXT)" $@ - cat $@ + $(call gb_Helper_print_on_error,\ + $(PERL) $< \ + $(INSTDIR)/$(gb_Package_SDKDIRNAME) \ + $(call gb_CustomTarget_get_workdir,odk/odkcommon) \ + $(odk_PLATFORM) "$(gb_Executable_EXT)" \ + ,$@.log \ + ) # vim: set noet sw=4 ts=4: diff --git a/odk/util/check.pl b/odk/util/check.pl index 7380867..542361e 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -367,7 +367,6 @@ if (-d "$PrimaryDir" || -d "$SecondaryDir") { if( $return != 0 ) { print "ERROR\n"; - unlink "$ARGV[3]"; } else { print "OK\n"; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits