aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWiSo <wiso@xbmc.org>2014-01-11 14:41:57 +0100
committerwsoltys <wiso@no.way>2014-01-21 18:07:06 +0100
commit78de9448149c67046ffc26a118c9cac95f146ed2 (patch)
tree74c6a1466430c68127acada765eb5abd2c1c1a12
parente9167cfd783bd4dbbf97e8e831dad61de7518dce (diff)
[WIN32] fixed: exit on build failure with pvr addons
-rw-r--r--project/Win32BuildSetup/BuildSetup.bat4
-rw-r--r--project/Win32BuildSetup/buildpvraddons.bat8
2 files changed, 12 insertions, 0 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 830ea368a7..db32e4edf7 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -245,6 +245,10 @@ IF %comp%==vs2010 (
ECHO ------------------------------------------------------------
call buildpvraddons.bat %NET%
+ IF %errorlevel%==1 (
+ set DIETEXT="failed to build pvr addons"
+ goto DIE
+ )
IF EXIST error.log del error.log > NUL
SET build_path=%CD%
diff --git a/project/Win32BuildSetup/buildpvraddons.bat b/project/Win32BuildSetup/buildpvraddons.bat
index 1573443bdc..7a4df2ec84 100644
--- a/project/Win32BuildSetup/buildpvraddons.bat
+++ b/project/Win32BuildSetup/buildpvraddons.bat
@@ -64,6 +64,10 @@ REM build xbmc-pvr-addons.sln
ECHO Building PVR addons
%1 %OPTS_EXE%
+IF %errorlevel%==1 (
+ goto fail
+)
+
REM copy the built pvr addons into ADDONS_DIR
CD "%BUILT_ADDONS_DIR%"
SET ADDONS_DIR=..\..\..\..\Win32BuildSetup\BUILD_WIN32\Xbmc\xbmc-pvr-addons
@@ -91,6 +95,10 @@ GOTO done
ECHO No git command available. Unable to fetch and build xbmc-pvr-addons.
SET EXITCODE=1
+:fail
+ECHO Failed to build one or more pvr addons
+SET EXITCODE=1
+
:done
SET GITEXE=
EXIT /B %EXITCODE%