Merge PR #43: Properly return error codes for errors in ifs in mumble…

…-win*.cmd
mumble-voip · Feb 11, 2017 · c0886a0 · c0886a0
2 parents 1c734a6 + 557adba
commit c0886a0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/buildscripts/1.3.x/mumble-win32-static.cmd b/buildscripts/1.3.x/mumble-win32-static.cmd
@@ -61,6 +61,7 @@ if "%MUMBLE_DO_PLUGIN_REPLACEMENT" == "1" (
 	echo Perform plugin replacement
 	python "%MUMBLE_PREFIX%\mumble-releng\tools\plugin_replacement.py" --version "%mumblebuildversion%" --repo . release\plugins
 )
+if errorlevel 1 exit /b %errorlevel%
 
 echo Build installer
 SET MumbleNoMergeModule=1
@@ -85,11 +86,10 @@ cd ..\..\..
 if not "%MUMBLE_SKIP_INTERNAL_SIGNING%" == "1" (
 	echo Adding build machine's signature to installer
 	signtool sign /sm /a "installer/bin/Release/mumble-%mumblebuildversion%.msi"
-	if errorlevel 1 exit /b %errorlevel%
 )
+if errorlevel 1 exit /b %errorlevel%
 
 if not "%MUMBLE_SKIP_COLLECT_SYMBOLS%" == "1" (
 	python "%MUMBLE_BUILDENV_DIR%\mumble-releng\tools\collect_symbols.py" collect --version "%mumblebuildversion%" --buildtype "%MUMBLE_BUILD_TYPE%" --product "Mumble %MUMBLE_BUILD_ARCH%" release\ symbols.7z
-	if errorlevel 1 exit /b %errorlevel%
 )
-
+if errorlevel 1 exit /b %errorlevel%
diff --git a/buildscripts/1.3.x/mumble-win64-static-portable.cmd b/buildscripts/1.3.x/mumble-win64-static-portable.cmd
@@ -52,5 +52,5 @@ if errorlevel 1 exit /b %errorlevel%
 
 if not "%MUMBLE_SKIP_COLLECT_SYMBOLS%" == "1" (
 	python "%MUMBLE_BUILDENV_DIR%\mumble-releng\tools\collect_symbols.py" collect --version "%mumblebuildversion%" --buildtype "%MUMBLE_BUILD_TYPE%" --product "Mumble %MUMBLE_BUILD_ARCH% Portable" release\ symbols.7z
-	if errorlevel 1 exit /b %errorlevel%
 )
+if errorlevel 1 exit /b %errorlevel%
diff --git a/buildscripts/1.3.x/mumble-win64-static.cmd b/buildscripts/1.3.x/mumble-win64-static.cmd
@@ -51,11 +51,10 @@ cd ..\..\..\..
 if not "%MUMBLE_SKIP_INTERNAL_SIGNING%" == "1" (
 	echo Adding build machine's signature to installer
 	signtool sign /sm /a "installer/bin/x64/Release/mumble-%mumblebuildversion%.winx64.msi"
-	if errorlevel 1 exit /b %errorlevel%
 )
+if errorlevel 1 exit /b %errorlevel%
 
 if not "%MUMBLE_SKIP_COLLECT_SYMBOLS%" == "1" (
 	python "%MUMBLE_BUILDENV_DIR%\mumble-releng\tools\collect_symbols.py" collect --version "%mumblebuildversion%" --buildtype "%MUMBLE_BUILD_TYPE%" --product "Mumble %MUMBLE_BUILD_ARCH%" release\ symbols.7z
-	if errorlevel 1 exit /b %errorlevel%
 )
-
+if errorlevel 1 exit /b %errorlevel%