mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 13:59:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Alexander Karatarakis 2016-11-10 11:50:46 -08:00
commit 259af8514a
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/chakracore/CONTROL
View File

@ -1,3 +1,3 @@
Source: chakracore Source: chakracore
Version: 1.2.0.0 Version: 1.3.0
Description: Core part of the Chakra Javascript engine Description: Core part of the Chakra Javascript engine

16
ports/chakracore/portfile.cmake
View File

@ -3,23 +3,15 @@
set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic)
endif() endif()
include(vcpkg_common_functions) 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 vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://github.com/Microsoft/ChakraCore/archive/v1.2.0.0.tar.gz" URLS "https://github.com/Microsoft/ChakraCore/archive/v1.3.0.tar.gz"
FILENAME "ChakraCore-1.2.0.0.tar.gz" FILENAME "ChakraCore-1.3.0.tar.gz"
SHA512 53e487028a30605a4e2589c40b65da060ca4884617fdba8877557e4db75f911be4433d260132cce3526647622bdc742a0aacda1443a16dfed3d3fdd442539528 SHA512 d00757e25f5c62bfc29721bd8f715df8dbaf0ac14c1dbdb0735227535cb4f2a209ec3957f24bb6a7e2bced540475bbf3e54712a930fb517fdfd5adb4d56cea07
) )
vcpkg_extract_source_archive(${ARCHIVE_FILE}) 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( vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/Build/Chakra.Core.sln PROJECT_PATH ${SOURCE_PATH}/Build/Chakra.Core.sln
) )

2
toolsrc/src/vcpkg_Strings.cpp
View File

@ -77,7 +77,7 @@ namespace vcpkg {namespace Strings
output.append(v.at(0)); 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(delimiter);
output.append(v.at(i)); output.append(v.at(i));