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:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user