diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-10 11:50:46 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-10 11:50:46 -0800 |
| commit | 259af8514a3c3634c1980d8aebd7a57752d8e1a9 (patch) | |
| tree | 9d679d909cc17482e046387400d6b4fe373eb4f0 | |
| parent | eb7ca47d4839a6bf8cea36cba8507750cd5d7746 (diff) | |
| parent | 1eb542c07926342ad2caa4ea8e1919dd2d31cf47 (diff) | |
| download | vcpkg-259af8514a3c3634c1980d8aebd7a57752d8e1a9.tar.gz vcpkg-259af8514a3c3634c1980d8aebd7a57752d8e1a9.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | ports/chakracore/CONTROL | 2 | ||||
| -rw-r--r-- | ports/chakracore/portfile.cmake | 16 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg_Strings.cpp | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index c0ea61800..addb84aa2 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,3 @@ Source: chakracore -Version: 1.2.0.0 +Version: 1.3.0 Description: Core part of the Chakra Javascript engine
\ No newline at end of file diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index ea4a3d7ff..bdba23809 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -3,23 +3,15 @@ set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) -find_program(POWERSHELL powershell) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ChakraCore-1.2.0.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ChakraCore-1.3.0) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://github.com/Microsoft/ChakraCore/archive/v1.2.0.0.tar.gz" - FILENAME "ChakraCore-1.2.0.0.tar.gz" - SHA512 53e487028a30605a4e2589c40b65da060ca4884617fdba8877557e4db75f911be4433d260132cce3526647622bdc742a0aacda1443a16dfed3d3fdd442539528 + URLS "https://github.com/Microsoft/ChakraCore/archive/v1.3.0.tar.gz" + FILENAME "ChakraCore-1.3.0.tar.gz" + SHA512 d00757e25f5c62bfc29721bd8f715df8dbaf0ac14c1dbdb0735227535cb4f2a209ec3957f24bb6a7e2bced540475bbf3e54712a930fb517fdfd5adb4d56cea07 ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) -message(STATUS "Patching JavascriptPromise.cpp for https://github.com/Microsoft/ChakraCore/issues/1429") -vcpkg_execute_required_process( - COMMAND ${POWERSHELL} -command (gc lib/runtime/library/JavascriptPromise.cpp -encoding utf7) -replace('«', '^<^<') -replace('»', '^>^>') | Set-Content lib/runtime/library/JavascriptPromise.cpp - WORKING_DIRECTORY ${SOURCE_PATH} -) -message(STATUS "Patching done.") - vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/Build/Chakra.Core.sln ) diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp index c53cba1fc..19ba8595f 100644 --- a/toolsrc/src/vcpkg_Strings.cpp +++ b/toolsrc/src/vcpkg_Strings.cpp @@ -77,7 +77,7 @@ namespace vcpkg {namespace Strings output.append(v.at(0)); - for (int i = 1; i < size; ++i) + for (size_t i = 1; i < size; ++i) { output.append(delimiter); output.append(v.at(i)); |