Commit e173a08b authored by Drake Arconis's avatar Drake Arconis
Browse files

Fixes from merge soup

parent 32bfd7ba
......@@ -38,10 +38,8 @@
# To check:
# (From Daniel Stenberg) The cmake build selected to run gcc with -fPIC on my box while the plain configure script did not.
# (From Daniel Stenberg) The gcc command line use neither -g nor any -O options. As a developer, I also treasure our configure scripts's --enable-debug option that sets a long range of "picky" compiler options.
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
set(CMAKE_DEBUG_POSTFIX "d")
include(Utilities)
include(Macros)
include(CMakeDependentOption)
......@@ -49,6 +47,8 @@ include(CheckCCompilerFlag)
project(CURL C)
message(WARNING "the curl cmake build system is poorly maintained. Be aware")
file(READ ${CURL_SOURCE_DIR}/include/curl/curlver.h CURL_VERSION_H_CONTENTS)
string(REGEX MATCH "#define LIBCURL_VERSION \"[^\"]*"
CURL_VERSION ${CURL_VERSION_H_CONTENTS})
......@@ -76,7 +76,7 @@ include_directories(${CURL_SOURCE_DIR}/include)
option(CURL_WERROR "Turn compiler warnings into errors" OFF)
option(PICKY_COMPILER "Enable picky compiler options" ON)
option(BUILD_CURL_EXE "Set to ON to build curl executable." ON)
option(CURL_STATICLIB "Set to ON to build libcurl with static linking." OFF)
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
option(ENABLE_ARES "Set to ON to enable c-ares support" OFF)
if(WIN32)
option(CURL_STATIC_CRT "Set to ON to build libcurl with static CRT on Windows (/MT)." OFF)
......@@ -138,7 +138,7 @@ option(HTTP_ONLY "disables all protocols except HTTP (This overrides all CURL_DI
mark_as_advanced(HTTP_ONLY)
option(CURL_DISABLE_FTP "disables FTP" OFF)
mark_as_advanced(CURL_DISABLE_FTP)
option(CURL_DISABLE_LDAP "disables LDAP" ON)
option(CURL_DISABLE_LDAP "disables LDAP" OFF)
mark_as_advanced(CURL_DISABLE_LDAP)
option(CURL_DISABLE_TELNET "disables Telnet" OFF)
mark_as_advanced(CURL_DISABLE_TELNET)
......@@ -151,7 +151,7 @@ mark_as_advanced(CURL_DISABLE_TFTP)
option(CURL_DISABLE_HTTP "disables HTTP" OFF)
mark_as_advanced(CURL_DISABLE_HTTP)
option(CURL_DISABLE_LDAPS "to disable LDAPS" ON)
option(CURL_DISABLE_LDAPS "to disable LDAPS" OFF)
mark_as_advanced(CURL_DISABLE_LDAPS)
option(CURL_DISABLE_RTSP "to disable RTSP" OFF)
......@@ -208,7 +208,7 @@ endif()
curl_nroff_check()
find_package(Perl)
option(ENABLE_MANUAL "to provide the built-in manual" ON)
cmake_dependent_option(ENABLE_MANUAL "to provide the built-in manual"
ON "NROFF_USEFUL;PERL_FOUND"
OFF)
......@@ -542,7 +542,7 @@ if(CURL_BROTLI)
endif()
#libSSH2
option(CMAKE_USE_LIBSSH2 "Use libSSH2" OFF)
option(CMAKE_USE_LIBSSH2 "Use libSSH2" ON)
mark_as_advanced(CMAKE_USE_LIBSSH2)
set(USE_LIBSSH2 OFF)
set(HAVE_LIBSSH2 OFF)
......@@ -1256,8 +1256,10 @@ set(CURLVERSION "${CURL_VERSION}")
if(BUILD_SHARED_LIBS)
set(ENABLE_SHARED "yes")
set(ENABLE_STATIC "no")
else()
set(ENABLE_SHARED "no")
set(ENABLE_STATIC "no")
set(ENABLE_STATIC "yes")
endif()
set(exec_prefix "\${prefix}")
set(includedir "\${prefix}/include")
set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
......@@ -1279,12 +1281,6 @@ set(REQUIRE_LIB_DEPS "no")
# SUPPORT_PROTOCOLS
set(VERSIONNUM "${CURL_VERSION_NUM}")
if(MSVC)
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")
ENDIF()
# Finally generate a "curl-config" matching this config
# Use:
# * ENABLE_SHARED
......
......@@ -73,9 +73,9 @@ add_library(
)
if(MSVC AND NOT BUILD_SHARED_LIBS)
set_target_properties(${LIB_NAME} PROPERTIES
STATIC_LIBRARY_FLAGS ${CMAKE_EXE_LINKER_FLAGS}
)
set_target_properties(${LIB_NAME} PROPERTIES STATIC_LIBRARY_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
endif()
if(NOT BUILD_SHARED_LIBS)
set_target_properties(${LIB_NAME} PROPERTIES INTERFACE_COMPILE_DEFINITIONS CURL_STATICLIB)
endif()
......
......@@ -434,8 +434,6 @@ struct ConnectBits {
connection */
bool type_set; /* type= was used in the URL */
bool multiplex; /* connection is multiplexed */
bool poisoned_1420; /* Linden 1420 - Connection became unusable and must not
be considered for pipelining. */
bool tcp_fastopen; /* use TCP Fast Open */
bool tls_enable_npn; /* TLS NPN extension? */
......
......@@ -6,7 +6,7 @@ rem * / __| | | | |_) | |
rem * | (__| |_| | _ <| |___
rem * \___|\___/|_| \_\_____|
rem *
rem * Copyright (C) 2012 - 2016, Steve Holme, <steve_holme@hotmail.com>.
rem * Copyright (C) 2012 - 2018, Steve Holme, <steve_holme@hotmail.com>.
rem *
rem * This software is licensed as described in the file COPYING, which
rem * you should have received as part of this distribution. The terms
......@@ -33,6 +33,16 @@ rem ***************************************************************************
rem Ensure we have the required arguments
if /i "%~1" == "" goto syntax
rem Calculate the program files directory
if defined PROGRAMFILES (
set "PF=%PROGRAMFILES%"
set OS_PLATFORM=x86
)
if defined PROGRAMFILES(x86) (
set "PF=%PROGRAMFILES(x86)%"
set OS_PLATFORM=x64
)
:parseArgs
if "%~1" == "" goto prerequisites
......@@ -72,6 +82,19 @@ rem ***************************************************************************
set VC_VER=14.0
set VC_DESC=VC14
set "VC_PATH=Microsoft Visual Studio 14.0\VC"
) else if /i "%~1" == "vc14.1" (
set VC_VER=14.1
set VC_DESC=VC14.1
rem Determine the VC14.1 path based on the installed edition in descending
rem order (Enterprise, then Professional and finally Community)
if exist "%PF%\Microsoft Visual Studio\2017\Enterprise\VC" (
set "VC_PATH=Microsoft Visual Studio\2017\Enterprise\VC"
) else if exist "%PF%\Microsoft Visual Studio\2017\Professional\VC" (
set "VC_PATH=Microsoft Visual Studio\2017\Professional\VC"
) else (
set "VC_PATH=Microsoft Visual Studio\2017\Community\VC"
)
) else if /i "%~1%" == "x86" (
set BUILD_PLATFORM=x86
) else if /i "%~1%" == "x64" (
......@@ -86,6 +109,24 @@ rem ***************************************************************************
goto syntax
) else if /i "%~1" == "-help" (
goto syntax
) else if /i "%~1" == "-VSpath" (
if "%~2" == "" (
echo.
echo Error. Please provide VS Path.
goto error
) else (
set "ABS_VC_PATH=%~2\VC"
shift
)
) else if /i "%~1" == "-perlpath" (
if "%~2" == "" (
echo.
echo Error. Please provide Perl root Path.
goto error
) else (
set "PERL_PATH=%~2"
shift
)
) else (
if not defined START_DIR (
set START_DIR=%~1%
......@@ -97,47 +138,46 @@ rem ***************************************************************************
shift & goto parseArgs
:prerequisites
rem Compiler and platform are required parameters.
rem Compiler is a required parameter
if not defined VC_VER goto syntax
if not defined BUILD_PLATFORM goto syntax
rem Default the start directory if one isn't specified
if not defined START_DIR set START_DIR=..\..\openssl
rem Calculate the program files directory
if defined PROGRAMFILES (
set "PF=%PROGRAMFILES%"
set OS_PLATFORM=x86
if not defined ABS_VC_PATH (
rem Check we have a program files directory
if not defined PF goto nopf
set "ABS_VC_PATH=%PF%\%VC_PATH%"
)
if defined PROGRAMFILES(x86) (
set "PF=%PROGRAMFILES(x86)%"
set OS_PLATFORM=x64
)
rem Check we have a program files directory
if not defined PF goto nopf
rem Check we have Visual Studio installed
if not exist "%PF%\%VC_PATH%" goto novc
rem Check we have Perl in our path
echo %PATH% | findstr /I /C:"\Perl" 1>nul
if errorlevel 1 (
rem It isn't so check we have it installed and set the path if it is
if exist "%SystemDrive%\Perl" (
set "PATH=%SystemDrive%\Perl\bin;%PATH%"
) else (
if exist "%SystemDrive%\Perl64" (
set "PATH=%SystemDrive%\Perl64\bin;%PATH%"
if not exist "%ABS_VC_PATH%" goto novc
if not defined PERL_PATH (
rem Check we have Perl in our path
perl --version <NUL 1>NUL 2>&1
if errorlevel 1 (
rem It isn't so check we have it installed and set the path if it is
if exist "%SystemDrive%\Perl" (
set "PATH=%SystemDrive%\Perl\bin;%PATH%"
) else (
goto noperl
if exist "%SystemDrive%\Perl64" (
set "PATH=%SystemDrive%\Perl64\bin;%PATH%"
) else (
goto noperl
)
)
)
) else (
set "PATH=%PERL_PATH%\Perl\bin;%PATH%"
)
rem Check the start directory exists
if not exist "%START_DIR%" goto noopenssl
rem Check that OpenSSL is not unsupported version 1.1.0
if not exist "%START_DIR%\ms\do_ms.bat" goto unsupported
:configure
if "%BUILD_PLATFORM%" == "" (
if "%VC_VER%" == "6.0" (
......@@ -163,23 +203,28 @@ rem ***************************************************************************
if "%VC_VER%" == "11.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "12.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "14.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64
)
:start
echo.
set SAVED_PATH=%CD%
if "%VC_VER%" == "6.0" (
call "%PF%\%VC_PATH%\bin\vcvars32"
call "%ABS_VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "7.0" (
call "%PF%\%VC_PATH%\bin\vcvars32"
call "%ABS_VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "7.1" (
call "%PF%\%VC_PATH%\bin\vcvars32"
call "%ABS_VC_PATH%\bin\vcvars32"
) else if "%VC_VER%" == "14.1" (
call "%ABS_VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
) else (
call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
call "%ABS_VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
)
echo.
set SAVED_PATH=%CD%
if defined START_DIR CD %START_DIR%
cd /d %SAVED_PATH%
if defined START_DIR cd /d %START_DIR%
goto %BUILD_PLATFORM%
:x64
......@@ -199,49 +244,69 @@ rem ***************************************************************************
nmake -f ms\ntdll.mak
rem Move the output directories
move out32.dbg "%OUTDIR%\LIB Debug"
move out32dll.dbg "%OUTDIR%\DLL Debug"
if exist "%OUTDIR%\LIB Debug" (
copy /y out32.dbg\* "%OUTDIR%\LIB Debug" 1>nul
rd out32.dbg /s /q
) else (
move out32.dbg "%OUTDIR%\LIB Debug" 1>nul
)
if exist "%OUTDIR%\DLL Debug" (
copy /y out32dll.dbg\* "%OUTDIR%\DLL Debug" 1>nul
rd out32dll.dbg /s /q
) else (
move out32dll.dbg "%OUTDIR%\DLL Debug" 1>nul
)
rem Move the PDB files
move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug"
move tmp32dll.dbg\lib.pdb "%OUTDIR%\DLL Debug"
move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug" 1>nul
move tmp32dll.dbg\lib.pdb "%OUTDIR%\DLL Debug" 1>nul
rem Remove the intermediate directories
rd tmp32.dbg /s /q
rd tmp32dll.dbg /s /q
if "%BUILD_CONFIG%" == "debug" goto success
:x64release
rem Configuring 64-bit Release Build
perl Configure VC-WIN64A --prefix=%CD%
rem Perform the build
call ms\do_win64a
nmake -f ms\nt.mak
nmake -f ms\ntdll.mak
rem Move the output directories
move out32 "%OUTDIR%\LIB Release"
move out32dll "%OUTDIR%\DLL Release"
if exist "%OUTDIR%\LIB Release" (
copy /y out32\* "%OUTDIR%\LIB Release" 1>nul
rd out32 /s /q
) else (
move out32 "%OUTDIR%\LIB Release" 1>nul
)
if exist "%OUTDIR%\DLL Release" (
copy /y out32dll\* "%OUTDIR%\DLL Release" 1>nul
rd out32dll /s /q
) else (
move out32dll "%OUTDIR%\DLL Release" 1>nul
)
rem Move the PDB files
move tmp32\lib.pdb "%OUTDIR%\LIB Release"
move tmp32dll\lib.pdb "%OUTDIR%\DLL Release"
move tmp32\lib.pdb "%OUTDIR%\LIB Release" 1>nul
move tmp32dll\lib.pdb "%OUTDIR%\DLL Release" 1>nul
rem Remove the intermediate directories
rd tmp32 /s /q
rd tmp32dll /s /q
goto success
:x86
rem Calculate our output directory
set OUTDIR=build\Win32\%VC_DESC%
if not exist %OUTDIR% md %OUTDIR%
if "%BUILD_CONFIG%" == "release" goto x86release
:x86debug
rem Configuring 32-bit Debug Build
perl Configure debug-VC-WIN32 no-asm --prefix=%CD%
......@@ -252,19 +317,29 @@ rem ***************************************************************************
nmake -f ms\ntdll.mak
rem Move the output directories
move out32.dbg "%OUTDIR%\LIB Debug"
move out32dll.dbg "%OUTDIR%\DLL Debug"
if exist "%OUTDIR%\LIB Debug" (
copy /y out32.dbg\* "%OUTDIR%\LIB Debug" 1>nul
rd out32.dbg /s /q
) else (
move out32.dbg "%OUTDIR%\LIB Debug" 1>nul
)
if exist "%OUTDIR%\DLL Debug" (
copy /y out32dll.dbg\* "%OUTDIR%\DLL Debug" 1>nul
rd out32dll.dbg /s /q
) else (
move out32dll.dbg "%OUTDIR%\DLL Debug" 1>nul
)
rem Move the PDB files
move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug"
move tmp32dll.dbg\lib.pdb "%OUTDIR%\DLL Debug"
move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug" 1>nul
move tmp32dll.dbg\lib.pdb "%OUTDIR%\DLL Debug" 1>nul
rem Remove the intermediate directories
rd tmp32.dbg /s /q
rd tmp32dll.dbg /s /q
if "%BUILD_CONFIG%" == "debug" goto success
:x86release
rem Configuring 32-bit Release Build
perl Configure VC-WIN32 no-asm --prefix=%CD%
......@@ -273,14 +348,24 @@ rem ***************************************************************************
call ms\do_ms
nmake -f ms\nt.mak
nmake -f ms\ntdll.mak
rem Move the output directories
move out32 "%OUTDIR%\LIB Release"
move out32dll "%OUTDIR%\DLL Release"
if exist "%OUTDIR%\LIB Release" (
copy /y out32\* "%OUTDIR%\LIB Release" 1>nul
rd out32 /s /q
) else (
move out32 "%OUTDIR%\LIB Release" 1>nul
)
if exist "%OUTDIR%\DLL Release" (
copy /y out32dll\* "%OUTDIR%\DLL Release" 1>nul
rd out32dll /s /q
) else (
move out32dll "%OUTDIR%\DLL Release" 1>nul
)
rem Move the PDB files
move tmp32\lib.pdb "%OUTDIR%\LIB Release"
move tmp32dll\lib.pdb "%OUTDIR%\DLL Release"
move tmp32\lib.pdb "%OUTDIR%\LIB Release" 1>nul
move tmp32dll\lib.pdb "%OUTDIR%\DLL Release" 1>nul
rem Remove the intermediate directories
rd tmp32 /s /q
......@@ -291,7 +376,7 @@ rem ***************************************************************************
:syntax
rem Display the help
echo.
echo Usage: build-openssl ^<compiler^> ^<platform^> [configuration] [directory]
echo Usage: build-openssl ^<compiler^> [platform] [configuration] [directory] [-VSpath] ["VSpath"] [-perlpath] ["perlpath"]
echo.
echo Compiler:
echo.
......@@ -304,6 +389,7 @@ rem ***************************************************************************
echo vc11 - Use Visual Studio 2012
echo vc12 - Use Visual Studio 2013
echo vc14 - Use Visual Studio 2015
echo vc14.1 - Use Visual Studio 2017
echo.
echo Platform:
echo.
......@@ -318,6 +404,14 @@ rem ***************************************************************************
echo Other:
echo.
echo directory - Specifies the OpenSSL source directory
echo.
echo -VSpath - Specify the custom VS path if Visual Studio is installed at other location
echo then "C:/<ProgramFiles>/Microsoft Visual Studio[version]
echo For e.g. -VSpath "C:\apps\MVS14"
echo.
echo -perlpath - Specify the custom perl root path if perl is not located at "C:\Perl" and it is a
echo portable copy of perl and not installed on the win system
echo For e.g. -perlpath "D:\strawberry-perl-5.24.3.1-64bit-portable"
goto error
:unknown
......@@ -338,11 +432,15 @@ rem ***************************************************************************
:novc
echo.
echo Error: %VC_DESC% is not installed
echo Error: Please check whether Visual compiler is installed at the path "%ABS_VC_PATH%"
echo Error: Please provide proper VS Path by using -VSpath
goto error
:noperl
echo.
echo Error: Perl is not installed
echo Error: Please check whether Perl is installed or it is at location "C:\Perl"
echo Error: If Perl is portable please provide perl root path by using -perlpath
goto error
:nox64
......@@ -355,11 +453,19 @@ rem ***************************************************************************
echo Error: Cannot locate OpenSSL source directory
goto error
:unsupported
echo.
echo Error: Unsupported OpenSSL version.
echo The pre-generated project files and this build script only support the
echo LTS version of OpenSSL ^(v1.0.2^). The next version of this build script
echo will support OpenSSL v1.1.0.
goto error
:error
if "%OS%" == "Windows_NT" endlocal
exit /B 1
:success
cd %SAVED_PATH%
cd /d %SAVED_PATH%
endlocal
exit /B 0
......@@ -6,7 +6,7 @@ rem * / __| | | | |_) | |
rem * | (__| |_| | _ <| |___
rem * \___|\___/|_| \_\_____|
rem *
rem * Copyright (C) 2012 - 2015, Steve Holme, <steve_holme@hotmail.com>.
rem * Copyright (C) 2012 - 2018, Steve Holme, <steve_holme@hotmail.com>.
rem * Copyright (C) 2015, Jay Satiro, <raysatiro@yahoo.com>.
rem *
rem * This software is licensed as described in the file COPYING, which
......@@ -35,6 +35,16 @@ rem ***************************************************************************
rem Ensure we have the required arguments
if /i "%~1" == "" goto syntax
rem Calculate the program files directory
if defined PROGRAMFILES (
set "PF=%PROGRAMFILES%"
set OS_PLATFORM=x86
)
if defined PROGRAMFILES(x86) (
set "PF=%PROGRAMFILES(x86)%"
set OS_PLATFORM=x64
)
:parseArgs
if "%~1" == "" goto prerequisites
......@@ -58,6 +68,20 @@ rem ***************************************************************************
set VC_DESC=VC14
set VC_TOOLSET=v140
set "VC_PATH=Microsoft Visual Studio 14.0\VC"
) else if /i "%~1" == "vc14.1" (
set VC_VER=14.1
set VC_DESC=VC14.1
set VC_TOOLSET=v141
rem Determine the VC14.1 path based on the installed edition in descending
rem order (Enterprise, then Professional and finally Community)
if exist "%PF%\Microsoft Visual Studio\2017\Enterprise\VC" (
set "VC_PATH=Microsoft Visual Studio\2017\Enterprise\VC"
) else if exist "%PF%\Microsoft Visual Studio\2017\Professional\VC" (
set "VC_PATH=Microsoft Visual Studio\2017\Professional\VC"
) else (
set "VC_PATH=Microsoft Visual Studio\2017\Community\VC"
)
) else if /i "%~1" == "x86" (
set BUILD_PLATFORM=x86
) else if /i "%~1" == "x64" (
......@@ -83,23 +107,12 @@ rem ***************************************************************************
shift & goto parseArgs
:prerequisites
rem Compiler and platform are required parameters.
rem Compiler is a required parameter
if not defined VC_VER goto syntax
if not defined BUILD_PLATFORM goto syntax
rem Default the start directory if one isn't specified
if not defined START_DIR set START_DIR=..\..\wolfssl
rem Calculate the program files directory
if defined PROGRAMFILES (
set "PF=%PROGRAMFILES%"
set OS_PLATFORM=x86
)
if defined PROGRAMFILES(x86) (
set "PF=%PROGRAMFILES(x86)%"
set OS_PLATFORM=x64
)
rem Check we have a program files directory
if not defined PF goto nopf
......@@ -119,15 +132,22 @@ rem ***************************************************************************
if "%VC_VER%" == "11.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "12.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "14.0" set VCVARS_PLATFORM=amd64
if "%VC_VER%" == "14.1" set VCVARS_PLATFORM=amd64
)
:start
echo.
call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
set SAVED_PATH=%CD%
if "%VC_VER%" == "14.1" (
call "%PF%\%VC_PATH%\Auxiliary\Build\vcvarsall" %VCVARS_PLATFORM%
) else (
call "%PF%\%VC_PATH%\vcvarsall" %VCVARS_PLATFORM%
)
echo.
set SAVED_PATH=%CD%
cd %START_DIR%
cd /d %SAVED_PATH%
if defined START_DIR cd /d %START_DIR%
goto %BUILD_PLATFORM%
:x64
......@@ -279,7 +299,7 @@ rem ***************************************************************************
:syntax
rem Display the help
echo.
echo Usage: build-wolfssl ^<compiler^> ^<platform^> [configuration] [directory]
echo Usage: build-wolfssl ^<compiler^> [platform] [configuration] [directory]
echo.
echo Compiler:
echo.
......@@ -287,6 +307,7 @@ rem ***************************************************************************
echo vc11 - Use Visual Studio 2012
echo vc12 - Use Visual Studio 2013
echo vc14 - Use Visual Studio 2015
echo vc14.1 - Use Visual Studio 2017
echo.
echo Platform:
echo.
......@@ -348,6 +369,6 @@ rem ***************************************************************************
echo %SUCCESSFUL_BUILDS%
echo.
)
cd %SAVED_PATH%
cd /d %SAVED_PATH%
endlocal
exit /B 0