From 5f8f66841ec945bb0ee43fd9af7ba518e6c949d6 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 13:14:50 +0300 Subject: [PATCH 01/13] Update portfile.cmake --- ports/chakracore/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 62277ecebe3f95..88b9a6548094e3 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -49,7 +49,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND configs "debug") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT @@ -62,7 +62,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") list(APPEND configs "release") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT ERROR_VARIABLE CHAKRA_BUILD_SH_ERR From 1ffb09dc59b29dc6f9295145fd2d5f2ae7979b0c Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 13:19:52 +0300 Subject: [PATCH 02/13] Update vcpkg.json --- ports/chakracore/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index 316fefa0a97c7b..96a49826eccb9a 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,6 +1,7 @@ { "name": "chakracore", "version-string": "2021-04-22", + "port-version": 1, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", "supports": "!osx & !uwp & (linux | !static)" From 36371a591d03018ef1e9305a35c5dff85f6c2313 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 13:21:50 +0300 Subject: [PATCH 03/13] Update baseline.json --- versions/baseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index a5fcf88f996554..b4144e13bdfd45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1322,7 +1322,7 @@ }, "chakracore": { "baseline": "2021-04-22", - "port-version": 0 + "port-version": 1 }, "charls": { "baseline": "2.2.0", From 649cad72f003930b4316c566c29961903a8b85b1 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 13:23:47 +0300 Subject: [PATCH 04/13] Update chakracore.json --- versions/c-/chakracore.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 66253a2e8381ac..015a5e30954888 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8153c80dc5cfc7c45bb4a3d445aa964570ac302e", + "version-string": "2021-04-22", + "port-version": 1 + }, { "git-tree": "0aa775c085b114b0ec67ea23ee99ece252d9e498", "version-string": "2021-04-22", From b665bce128d985a7c8ae85d3912498c35b4bedd2 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 17:26:24 +0300 Subject: [PATCH 05/13] Update portfile.cmake --- ports/chakracore/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 88b9a6548094e3..57b559e2f7ff51 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -49,7 +49,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND configs "debug") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j=${VCPKG_MAX_CONCURRENCY}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT @@ -62,7 +62,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") list(APPEND configs "release") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_MAX_CONCURRENCY}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT ERROR_VARIABLE CHAKRA_BUILD_SH_ERR From 549156883eded92526ba6a82d027a8a712660fb8 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 17:27:52 +0300 Subject: [PATCH 06/13] Update chakracore.json --- versions/c-/chakracore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 015a5e30954888..6012cc17310a2b 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8153c80dc5cfc7c45bb4a3d445aa964570ac302e", + "git-tree": "2f4aa550def0b4d0462cbc797341d83f0b26df47", "version-string": "2021-04-22", "port-version": 1 }, From 629917e54cafa8ee9c161907ddc3d7bc93e7f766 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 17:31:46 +0300 Subject: [PATCH 07/13] Update portfile.cmake --- ports/chakracore/portfile.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 57b559e2f7ff51..c6c6c2be46245d 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -4,6 +4,12 @@ if(WIN32) endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +if(NOT "$ENV{VCPKG_MAX_CONCURRENCY}" STREQUAL "") + set(NUM_CORES_FLAG "-j=$ENV{VCPKG_MAX_CONCURRENCY}") +else() + set(NUM_CORES_FLAG "-j") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore @@ -49,7 +55,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND configs "debug") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j=${VCPKG_MAX_CONCURRENCY}" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "${NUM_CORES_FLAG}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT @@ -62,7 +68,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") list(APPEND configs "release") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_MAX_CONCURRENCY}" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "${NUM_CORES_FLAG}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT ERROR_VARIABLE CHAKRA_BUILD_SH_ERR From b1844ec52e88691114a5a2d7d88687302ba61934 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 17:32:19 +0300 Subject: [PATCH 08/13] Update portfile.cmake --- ports/chakracore/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index c6c6c2be46245d..cf732e66c79fe0 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -5,9 +5,9 @@ endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) if(NOT "$ENV{VCPKG_MAX_CONCURRENCY}" STREQUAL "") - set(NUM_CORES_FLAG "-j=$ENV{VCPKG_MAX_CONCURRENCY}") + set(NUM_CORES_FLAG "-j=$ENV{VCPKG_MAX_CONCURRENCY}") else() - set(NUM_CORES_FLAG "-j") + set(NUM_CORES_FLAG "-j") endif() vcpkg_from_github( From d19f8eb9f4eafeacf474718f8c0c317037e26353 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 17:39:23 +0300 Subject: [PATCH 09/13] Update chakracore.json --- versions/c-/chakracore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 6012cc17310a2b..9dd1c04db1d942 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2f4aa550def0b4d0462cbc797341d83f0b26df47", + "git-tree": "c267f7a3d3aa9d8972e3dd306ac08c2c703c9af7", "version-string": "2021-04-22", "port-version": 1 }, From 6e7ab5b16e30315bde2a4ab9609433c13e175281 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 17:48:43 +0300 Subject: [PATCH 10/13] Update portfile.cmake --- ports/chakracore/portfile.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index cf732e66c79fe0..7d3b581deee682 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -4,12 +4,6 @@ if(WIN32) endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -if(NOT "$ENV{VCPKG_MAX_CONCURRENCY}" STREQUAL "") - set(NUM_CORES_FLAG "-j=$ENV{VCPKG_MAX_CONCURRENCY}") -else() - set(NUM_CORES_FLAG "-j") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/ChakraCore @@ -55,7 +49,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND configs "debug") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "${NUM_CORES_FLAG}" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" "-j=${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT @@ -68,7 +62,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") list(APPEND configs "release") execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "${NUM_CORES_FLAG}" + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "-j=${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT ERROR_VARIABLE CHAKRA_BUILD_SH_ERR From e3c2f1defc2d4a76d4120342450b016d3ad657b3 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 9 Jan 2022 17:50:03 +0300 Subject: [PATCH 11/13] Update chakracore.json --- versions/c-/chakracore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 9dd1c04db1d942..1046f36d812580 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c267f7a3d3aa9d8972e3dd306ac08c2c703c9af7", + "git-tree": "9e9d1a55573910d6e4c6fe0a9dca0e601df2929c", "version-string": "2021-04-22", "port-version": 1 }, From 5494d21ec69068b893d60ae130e8f8fc5917cb6a Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Mon, 10 Jan 2022 18:32:45 +0300 Subject: [PATCH 12/13] Update ports/chakracore/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/chakracore/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index 96a49826eccb9a..554d9170a48591 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,6 +1,6 @@ { "name": "chakracore", - "version-string": "2021-04-22", + "version-date": "2021-04-22", "port-version": 1, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", From aa9ec3513a8999741f7be642002734b0a47c9ac1 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Mon, 10 Jan 2022 18:34:56 +0300 Subject: [PATCH 13/13] Update chakracore.json --- versions/c-/chakracore.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 1046f36d812580..7356668c825839 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "9e9d1a55573910d6e4c6fe0a9dca0e601df2929c", - "version-string": "2021-04-22", + "git-tree": "8ce7ea484830cdf24c8af45ebad35ba10e76f61c", + "version-date": "2021-04-22", "port-version": 1 }, {