Base code merged to SPIN 2.4

[platform/upstream/curl.git] / projects / build-openssl.bat

diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index 66c8c9a..24410dc 100644 (file)
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -6,7 +6,7 @@ rem *                             / __| | | | |_) | |
 rem *                            | (__| |_| |  _ <| |___
 rem *                             \___|\___/|_| \_\_____|
 rem *
-rem * Copyright (C) 2012 - 2014, Steve Holme, <steve_holme@hotmail.com>.
+rem * Copyright (C) 2012 - 2015, 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
@@ -86,9 +86,9 @@ rem ***************************************************************************
   shift & goto parseArgs
 
 :prerequisites
-  rem Default the start directory if one isn't specified\r
-  if not defined START_DIR set START_DIR=..\..\openssl\r
-\r
+  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%"
@@ -104,9 +104,17 @@ rem ***************************************************************************
 
   rem Check we have Visual Studio installed
   if not exist "%PF%\%VC_PATH%" goto novc
-\r
-  rem Check the start directory exists\r
-  if not exist "%START_DIR%" goto noopenssl\r
+
+  rem Check we have Perl installed
+  echo %PATH% | findstr /I /C:"\Perl" 1>nul\r
+  if errorlevel 1 (\r
+    if not exist "%SystemDrive%\Perl" (\r
+      if not exist "%SystemDrive%\Perl64" goto noperl\r
+    )\r
+  )\r
+
+  rem Check the start directory exists
+  if not exist "%START_DIR%" goto noopenssl
 
 :configure
   if "%BUILD_PLATFORM%" == "" (
@@ -156,7 +164,7 @@ rem ***************************************************************************
   set OUTDIR=build\Win64\%VC_DESC%
   if not exist %OUTDIR% md %OUTDIR%
 
-  if "%BUILD_CONFIG%" == "release" goto x86release
+  if "%BUILD_CONFIG%" == "release" goto x64release\r
 
 :x64debug
   rem Configuring 64-bit Debug Build
@@ -260,7 +268,7 @@ rem ***************************************************************************
 :syntax
   rem Display the help
   echo.
-  echo Usage: build-openssl ^<compiler^> ^<platform^> [configuration] [directory]\r
+  echo Usage: build-openssl ^<compiler^> ^<platform^> [configuration] [directory]
   echo.
   echo Compiler:
   echo.
@@ -308,16 +316,21 @@ rem ***************************************************************************
   echo Error: %VC_DESC% is not installed
   goto error
 
-:nox64\r
-  echo.\r
-  echo Error: %VC_DESC% does not support 64-bit builds\r
-  goto error\r
-\r
-:noopenssl\r
-  echo.\r
-  echo Error: Cannot locate OpenSSL source directory\r
-  goto error\r
-\r
+:noperl
+  echo.
+  echo Error: Perl is not installed
+  goto error
+
+:nox64
+  echo.
+  echo Error: %VC_DESC% does not support 64-bit builds
+  goto error
+
+:noopenssl
+  echo.
+  echo Error: Cannot locate OpenSSL source directory
+  goto error
+
 :error
   if "%OS%" == "Windows_NT" endlocal
   exit /B 1