From 6dfe3074e92b3188c9fa72303f4135442cc0d5dd Mon Sep 17 00:00:00 2001 From: YohanPipereau Date: Thu, 23 May 2019 11:02:13 +0200 Subject: Correct Makefile to let Jenkins report build errors correctly Change-Id: I611cfd199415ca7776c94a154a102e4f6482db72 Signed-off-by: YohanPipereau --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2b2e93c..e49928c 100644 --- a/Makefile +++ b/Makefile @@ -236,6 +236,7 @@ build-scvpp: @mkdir -p $(BR)/build-scvpp/; cd $(BR)/build-scvpp; \ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr $(WS_ROOT)/src/scvpp/;\ make install + @# NEW INSTRUCTIONS TO BUILD-SCVPP MUST BE DECLARED ON A NEW LINE WITH '@' test-scvpp: build-scvpp @cd $(BR)/build-scvpp; make test @@ -244,17 +245,22 @@ build-plugins: @mkdir -p $(BR)/build-plugins/; cd $(BR)/build-plugins/; \ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr $(WS_ROOT)/src/plugins/; \ make install + @# NEW INSTRUCTIONS TO BUILD-PLUGINS MUST BE DECLARED ON A NEW LINE WITH '@' build-gnmi: @mkdir -p $(BR)/build-gnmi/; cd $(BR)/build-gnmi/; \ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr $(WS_ROOT)/src/gnmi/;make; \ make install; + @# NEW INSTRUCTIONS TO BUILD-GNMI MUST BE DECLARED ON A NEW LINE WITH '@' build-package: @mkdir -p $(BR)/build-package/; cd $(BR)/build-package/;\ $(cmake) -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DENABLE_TESTS=OFF $(WS_ROOT)/src/;make package;\ - rm -rf $(BR)/build-package/_CPack_Packages; + -DENABLE_TESTS=OFF $(WS_ROOT)/src/; make package; + @# NEW INSTRUCTIONS TO BUILD-PACKAGE MUST BE DECLARED ON A NEW LINE WITH + @# '@' NOT WITH ';' ELSE BUILD-PACKAGE WILL NOT RETURN THE CORRECT + @# RETURN CODE FOR JENKINS CI + @rm -rf $(BR)/build-package/_CPack_Packages; install-models: @cd src/plugins/yang/ietf; \ @@ -297,4 +303,4 @@ docker: @scripts/docker.sh docker-test: - @scripts/run_test.sh \ No newline at end of file + @scripts/run_test.sh -- cgit 1.2.3-korg