diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-19 17:13:06 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-05-19 17:13:06 -0700 |
| commit | 195e1b45dda5be8b5b8b1f2e8530c4ef05617b49 (patch) | |
| tree | 70cf7c36e8a6f8de5bdeaf0bcc65359fd052bfa9 | |
| parent | 900613d7f066af7121dd06512ace07dcfbf8693b (diff) | |
| download | vcpkg-195e1b45dda5be8b5b8b1f2e8530c4ef05617b49.tar.gz vcpkg-195e1b45dda5be8b5b8b1f2e8530c4ef05617b49.zip | |
[chakracore] Update to 1.4.3
| -rw-r--r-- | ports/chakracore/CONTROL | 2 | ||||
| -rw-r--r-- | ports/chakracore/disable_warning_as_error.patch | 20 | ||||
| -rw-r--r-- | ports/chakracore/no-warning-as-error.props | 8 | ||||
| -rw-r--r-- | ports/chakracore/portfile.cmake | 20 |
4 files changed, 16 insertions, 34 deletions
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL index e03e5256f..f3b510ecd 100644 --- a/ports/chakracore/CONTROL +++ b/ports/chakracore/CONTROL @@ -1,3 +1,3 @@ Source: chakracore -Version: 1.4.0-1 +Version: 1.4.3 Description: Core part of the Chakra Javascript engine
\ No newline at end of file diff --git a/ports/chakracore/disable_warning_as_error.patch b/ports/chakracore/disable_warning_as_error.patch deleted file mode 100644 index da7b5da77..000000000 --- a/ports/chakracore/disable_warning_as_error.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/bin/NativeTests/NativeTests.vcxproj b/bin/NativeTests/NativeTests.vcxproj -index d020992..ac70a65 100644 ---- a/bin/NativeTests/NativeTests.vcxproj -+++ b/bin/NativeTests/NativeTests.vcxproj -@@ -30,6 +30,15 @@ - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <SmallerTypeCheck>false</SmallerTypeCheck> - <MinimalRebuild>false</MinimalRebuild> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</TreatWarningAsError> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</TreatWarningAsError> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Test|Win32'">false</TreatWarningAsError> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</TreatWarningAsError> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</TreatWarningAsError> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Test|ARM'">false</TreatWarningAsError> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</TreatWarningAsError> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</TreatWarningAsError> -+ <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='Test|x64'">false</TreatWarningAsError> - <!-- <CallingConvention Condition="'$(Platform)'=='Win32'">CDecl</CallingConvention> --> - </ClCompile> - <Link> diff --git a/ports/chakracore/no-warning-as-error.props b/ports/chakracore/no-warning-as-error.props new file mode 100644 index 000000000..6020ed1e8 --- /dev/null +++ b/ports/chakracore/no-warning-as-error.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemDefinitionGroup> + <ClCompile> + <TreatWarningAsError>false</TreatWarningAsError> + </ClCompile> + </ItemDefinitionGroup> +</Project> diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 3f19224ed..331cd8b31 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -7,18 +7,12 @@ if (VCPKG_CRT_LINKAGE STREQUAL static) endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ChakraCore-1.4.1) -vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://github.com/Microsoft/ChakraCore/archive/v1.4.1.tar.gz" - FILENAME "ChakraCore-1.4.1.tar.gz" - SHA512 9ca89de88a4d6102826ce4e301ea81b70296cca72131043f9942de715dee2862791c6f33ebce1f12fcafc1554a872a2cf9317313d56c57abff0a6d814a77f2d5 -) -vcpkg_extract_source_archive(${ARCHIVE_FILE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/disable_warning_as_error.patch +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/ChakraCore + REF v1.4.3 + SHA512 6083bbbb4b980f44fe0e1d3581eea17190e379134f9312f11d195694aa3e0d9723406d8048ce461bc2744306c07b44465d6d58636b114a82b2f42d7a3316c9af + HEAD_REF master ) find_path(COR_H_PATH cor.h) @@ -29,7 +23,7 @@ get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE) vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/Build/Chakra.Core.sln - OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" + OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" ) file(INSTALL |