[PATCH] silence odk check

[David Tardon (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3536

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3536/1

silence odk check

Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
---
M odk/CustomTarget_check.mk
M odk/util/check.pl
2 files changed, 7 insertions(+), 7 deletions(-)



diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 159bb3c..af6eb1d 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -43,11 +43,12 @@
 		$(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 c1288a9..de554e7 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -367,7 +367,6 @@
 if( $return != 0 )
 {
     print "ERROR\n";
-    unlink "$ARGV[3]";
 } else {
     print "OK\n";
 }

-- 
To view, visit https://gerrit.libreoffice.org/3536
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b2e224cb3b709e3c693f18918dcef5e0304894e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon at redhat.com>