From 02b7c87e6e77dde6ade191ee92befba854bd9d07 Mon Sep 17 00:00:00 2001 From: sdcb Date: Thu, 10 Nov 2016 15:48:32 +0800 Subject: [PATCH 1/3] [chakracore] Upgrade version to official lastest 1.3.0 --- ports/chakracore/CONTROL | 2 +- ports/chakracore/portfile.cmake | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index c0ea61800d..addb84aa2c 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 ea4a3d7ff3..b937b17b49 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -5,21 +5,14 @@ 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 ) From 59a879be2b99dc0e9aff31ce4e2709f533a2f892 Mon Sep 17 00:00:00 2001 From: sdcb Date: Thu, 10 Nov 2016 15:50:57 +0800 Subject: [PATCH 2/3] [chakracore] Delete useless code: find_program(powershell). --- ports/chakracore/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index b937b17b49..bdba238097 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -3,7 +3,6 @@ set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) -find_program(POWERSHELL powershell) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ChakraCore-1.3.0) vcpkg_download_distfile(ARCHIVE_FILE From 7220f54e302ce4792868c4ff59b8146c54d2e88c Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 10 Nov 2016 11:48:36 -0800 Subject: [PATCH 3/3] [vcpkg] Correct unsigned/signed mismatch '<' --- toolsrc/src/vcpkg_Strings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp index c53cba1fcf..19ba8595f7 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));