diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-21 18:15:15 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-22 07:06:16 +0000 |
| commit | 43c422ebb7a7c1431d179ed1b9572fabf9845aa8 (patch) | |
| tree | 2629acb89d7c8d32108a9010b23e066fd430e3cc /odk | |
| parent | 085c5c6beade545e4e93cf8463b6848cf2d19060 (diff) | |
silence odk check
Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
Reviewed-on: https://gerrit.libreoffice.org/3536
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 13 | ||||
| -rw-r--r-- | odk/util/check.pl | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index ee693ff13d05..85113b38d1f0 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 738086794fe6..542361e44cd0 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"; } |