diff options
| author | Elliott Hughes <enh@google.com> | 2018-03-01 00:44:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-01 00:44:30 +0000 |
| commit | 279fa5e2839348e5b1898acbd247d4e70857f8e1 (patch) | |
| tree | ba15caf6905acc99ac3fbab158d7bf2fb0364a21 /projects/generate.bat | |
| parent | b7c7f24e06c79611f4f58dfdeb13af661d50ea37 (diff) | |
| parent | 95f668fdba032059552cc770824e1d07821ab64b (diff) | |
| download | android_external_curl-279fa5e2839348e5b1898acbd247d4e70857f8e1.tar.gz android_external_curl-279fa5e2839348e5b1898acbd247d4e70857f8e1.tar.bz2 android_external_curl-279fa5e2839348e5b1898acbd247d4e70857f8e1.zip | |
Merge "Update to 7.58.0 - January 24 2018." am: 0c6d81f80b
am: 95f668fdba
Change-Id: I56ce9e830e6b121cc97d68e2eabb3ca6d137f40f
Diffstat (limited to 'projects/generate.bat')
| -rw-r--r-- | projects/generate.bat | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/projects/generate.bat b/projects/generate.bat index fbe3a92..f8fb81f 100644 --- a/projects/generate.bat +++ b/projects/generate.bat @@ -6,7 +6,7 @@ rem * / __| | | | |_) | | rem * | (__| |_| | _ <| |___ rem * \___|\___/|_| \_\_____| rem * -rem * Copyright (C) 2014 - 2015, Steve Holme, <steve_holme@hotmail.com>. +rem * Copyright (C) 2014 - 2017, 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 @@ -62,6 +62,8 @@ rem *************************************************************************** set VERSION=VC12 ) else if /i "%~1" == "vc14" ( set VERSION=VC14 + ) else if /i "%~1" == "vc15" ( + set VERSION=VC15 ) else if /i "%~1" == "-clean" ( set MODE=CLEAN ) else if /i "%~1" == "-?" ( @@ -96,6 +98,7 @@ rem *************************************************************************** if "%VERSION%" == "VC11" goto vc11 if "%VERSION%" == "VC12" goto vc12 if "%VERSION%" == "VC14" goto vc14 + if "%VERSION%" == "VC15" goto vc15 :vc6 echo. @@ -230,12 +233,27 @@ rem *************************************************************************** call :clean Windows\VC14\lib\libcurl.vcxproj ) + if not "%VERSION%" == "ALL" goto success + +:vc15 + echo. + + if "%MODE%" == "GENERATE" ( + echo Generating VC15 project files + call :generate vcxproj Windows\VC15\src\curl.tmpl Windows\VC15\src\curl.vcxproj + call :generate vcxproj Windows\VC15\lib\libcurl.tmpl Windows\VC15\lib\libcurl.vcxproj + ) else ( + echo Removing VC15 project files + call :clean Windows\VC15\src\curl.vcxproj + call :clean Windows\VC15\lib\libcurl.vcxproj + ) + goto success rem Main generate function. rem rem %1 - Project Type (dsp for VC6, vcproj1 for VC7 and VC7.1, vcproj2 for VC8 and VC9 -rem or vcxproj for VC10, VC11, VC12 and VC14) +rem or vcxproj for VC10, VC11, VC12, VC14 and VC15) rem %2 - Input template file rem %3 - Output project file rem @@ -298,7 +316,7 @@ rem rem Generates a single file xml element. rem rem %1 - Project Type (dsp for VC6, vcproj1 for VC7 and VC7.1, vcproj2 for VC8 and VC9 -rem or vcxproj for VC10, VC11, VC12 and VC14) +rem or vcxproj for VC10, VC11, VC12, VC14 and VC15) rem %2 - Directory (src, lib, lib\vauth or lib\vtls) rem %3 - Source filename rem %4 - Output project file @@ -394,6 +412,7 @@ rem echo vc11 - Use Visual Studio 2012 echo vc12 - Use Visual Studio 2013 echo vc14 - Use Visual Studio 2015 + echo vc15 - Use Visual Studio 2017 echo. echo -clean - Removes the project files goto error |