moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

buildconf.bat: Move DOS variable clean-up code to separate function 

Rather than duplicate future variables, during clean-up of both success
and error conditions, use a common function that can be called by both.
This commit is contained in:
Steve Holme 2015-08-09 17:02:27 +01:00
parent 4d13b78aec
commit ecece2cfb5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
buildconf.bat
View File

@ -79,6 +79,7 @@ rem snapshot archives.
goto success goto success
rem Main generate function. rem Main generate function.
rem
rem Returns: rem Returns:
rem rem
rem 0 - success rem 0 - success
@ -86,7 +87,6 @@ rem 1 - failure to generate Makefile
rem 2 - failure to generate tool_hugehelp.c rem 2 - failure to generate tool_hugehelp.c
rem 3 - failure to generate curlbuild.h rem 3 - failure to generate curlbuild.h
rem rem
rem
:generate :generate
rem create Makefile rem create Makefile
if exist Makefile.dist ( if exist Makefile.dist (
@ -162,6 +162,14 @@ rem
exit /B 0 exit /B 0
rem Function to clean-up local variables under DOS, Windows 3.x and
rem Windows 9x as setlocal isn't available until Windows NT
rem
:dosCleanup
set MODE=
exit /B
:syntax :syntax
rem Display the help rem Display the help
echo. echo.
@ -214,7 +222,7 @@ rem
if "%OS%" == "Windows_NT" ( if "%OS%" == "Windows_NT" (
endlocal endlocal
) else ( ) else (
set MODE= call :dosCleanup
) )
exit /B 1 exit /B 1
@ -222,6 +230,6 @@ rem
if "%OS%" == "Windows_NT" ( if "%OS%" == "Windows_NT" (
endlocal endlocal
) else ( ) else (
set MODE= call :dosCleanup
) )
exit /B 0 exit /B 0