From 7d7564be59e44baca601cf1d3eefc4cae7444023 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Wed, 16 Jun 2021 10:38:28 +0300 Subject: [PATCH 01/16] [ChakraCore] Add Linux support --- ports/chakracore/portfile.cmake | 190 ++++++++++++++++++++------------ ports/chakracore/vcpkg.json | 6 +- 2 files changed, 121 insertions(+), 75 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 991e3a3de194d9..f8e8a93b77534f 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,72 +1,118 @@ -vcpkg_fail_port_install(ON_TARGET osx linux uwp ON_CRT_LINKAGE static ON_LIBRARY_LINKAGE static) - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Microsoft/ChakraCore - REF 63c5099027ebb4547c802d62c2d2a6a39ee7eff6 # v1.11.22 - SHA512 5de915db48f5a125d4e0e112671ad7447212e6c0165d6c634a855a1d334f0bd2f7c015ba8c58d55225dd75d4c6687e6807987b8354b82405eb87944b46313062 - HEAD_REF master -) - -find_path(COR_H_PATH cor.h) -if(COR_H_PATH MATCHES "NOTFOUND") - message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") -endif() -get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE) - -set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(REMOVE_RECURSE ${BUILDTREE_PATH}) -file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) - -set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage - -vcpkg_build_msbuild( - PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln - OPTIONS - "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" - "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" - "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" -) - -file(INSTALL - ${BUILDTREE_PATH}/lib/jsrt/ChakraCore.h - ${BUILDTREE_PATH}/lib/jsrt/ChakraCommon.h - ${BUILDTREE_PATH}/lib/jsrt/ChakraCommonWindows.h - ${BUILDTREE_PATH}/lib/jsrt/ChakraDebug.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include -) -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) -endif() - -vcpkg_copy_pdbs() -file(INSTALL - ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/ChakraCore RENAME copyright) +vcpkg_fail_port_install(ON_TARGET osx uwp) + +if (WIN32) + vcpkg_fail_port_install(ON_CRT_LINKAGE static ON_LIBRARY_LINKAGE static) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/ChakraCore + REF 385409ee4b634b860e090606a28acbc99f4d2567 + SHA512 ef47db988c4ddd77fa87f4c5e1ac91d9f6b31b35aa6934d8b2863ee1274776d90a2b85dbad51eef069c96777d3cd7729349b89f23eda8c61b4cb637150bead71 + HEAD_REF master +) + +if(WIN32) + find_path(COR_H_PATH cor.h) + if(COR_H_PATH MATCHES "NOTFOUND") + message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") + endif() + get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE) +endif() + +set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +file(REMOVE_RECURSE ${BUILDTREE_PATH}) +file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) + +set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage + +if(WIN32) + vcpkg_build_msbuild( + PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln + OPTIONS + "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" + "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" + "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" + ) +else() + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(CHAKRACORE_TARGET_ARCH amd64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(CHAKRACORE_TARGET_ARCH x86) + endif() + + vcpkg_find_acquire_program(CLANG) + if(CLANG MATCHES "-NOTFOUND") + message(FATAL_ERROR "Clang is required.") + endif() + + execute_process( + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" + WORKING_DIRECTORY ${BUILDTREE_PATH} + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT + ERROR_VARIABLE CHAKRA_BUILD_SH_ERR + RESULT_VARIABLE CHAKRA_BUILD_SH_RES + ECHO_OUTPUT_VARIABLE + ECHO_ERROR_VARIABLE + ) +endif() + +if (WIN32) + set(JSRT_DIRECTORY_NAME jsrt) +else() + set(JSRT_DIRECTORY_NAME Jsrt) +endif() + +file(INSTALL + ${BUILDTREE_PATH}/lib/${JSRT_DIRECTORY_NAME}/ChakraCore.h + ${BUILDTREE_PATH}/lib/${JSRT_DIRECTORY_NAME}/ChakraCommon.h + ${BUILDTREE_PATH}/lib/${JSRT_DIRECTORY_NAME}/ChakraDebug.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) +if(WIN32) + file(INSTALL + ${BUILDTREE_PATH}/lib/${JSRT_DIRECTORY_NAME}/ChakraCommonWindows.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include + ) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + ) + file(INSTALL + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + ) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb + DESTINATION ${CURRENT_PACKAGES_DIR}/bin + ) + file(INSTALL + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + ) + file(INSTALL + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe + ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) + endif() + vcpkg_copy_pdbs() +else() + +endif() + +if(WIN32) + set(LICENSE_DESTINATION ${CURRENT_PACKAGES_DIR}/share/ChakraCore) +else() + set(LICENSE_DESTINATION ${CURRENT_PACKAGES_DIR}/share/chakracore) +endif() +file(INSTALL + ${SOURCE_PATH}/LICENSE.txt + DESTINATION ${LICENSE_DESTINATION} RENAME copyright) \ No newline at end of file diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index 5c6426d7d57f1d..33ce75821a3fa5 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,8 +1,8 @@ { "name": "chakracore", - "version-string": "1.11.22", - "port-version": 1, + "version-date": "2021-04-22", + "port-version": 0, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", - "supports": "windows & !uwp & !static" + "supports": "!uwp & !static" } From 14c2663626af2c012261ef2917479881574113ae Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 20 Jun 2021 01:33:41 +0300 Subject: [PATCH 02/16] Fix --- ports/chakracore/fix-debug-linux-build.patch | 13 +++ ports/chakracore/portfile.cmake | 98 +++++++++++++------- ports/chakracore/vcpkg.json | 5 +- 3 files changed, 82 insertions(+), 34 deletions(-) create mode 100644 ports/chakracore/fix-debug-linux-build.patch diff --git a/ports/chakracore/fix-debug-linux-build.patch b/ports/chakracore/fix-debug-linux-build.patch new file mode 100644 index 00000000000000..10c1ca5e7e947e --- /dev/null +++ b/ports/chakracore/fix-debug-linux-build.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Common/Memory/RecyclerObjectGraphDumper.cpp b/lib/Common/Memory/RecyclerObjectGraphDumper.cpp +index 0885df3fb..12bdfb96e 100644 +--- a/lib/Common/Memory/RecyclerObjectGraphDumper.cpp ++++ b/lib/Common/Memory/RecyclerObjectGraphDumper.cpp +@@ -58,7 +58,7 @@ void RecyclerObjectGraphDumper::BeginDumpObject(void * objectAddress) + { + Assert(false); + this->dumpObjectTypeInfo = nullptr; +- this->dumpObjectIsArray = nullptr; ++ this->dumpObjectIsArray = 0; + } + } + #endif diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index f8e8a93b77534f..378ee9fa1ab6b0 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,9 +1,8 @@ vcpkg_fail_port_install(ON_TARGET osx uwp) - -if (WIN32) +if(WIN32) vcpkg_fail_port_install(ON_CRT_LINKAGE static ON_LIBRARY_LINKAGE static) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) endif() +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,6 +10,8 @@ vcpkg_from_github( REF 385409ee4b634b860e090606a28acbc99f4d2567 SHA512 ef47db988c4ddd77fa87f4c5e1ac91d9f6b31b35aa6934d8b2863ee1274776d90a2b85dbad51eef069c96777d3cd7729349b89f23eda8c61b4cb637150bead71 HEAD_REF master + PATCHES + fix-debug-linux-build.patch ) if(WIN32) @@ -25,9 +26,8 @@ set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) file(REMOVE_RECURSE ${BUILDTREE_PATH}) file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) -set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage - if(WIN32) + set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage vcpkg_build_msbuild( PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln OPTIONS @@ -47,32 +47,46 @@ else() message(FATAL_ERROR "Clang is required.") endif() - execute_process( - COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" - WORKING_DIRECTORY ${BUILDTREE_PATH} - OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT - ERROR_VARIABLE CHAKRA_BUILD_SH_ERR - RESULT_VARIABLE CHAKRA_BUILD_SH_RES - ECHO_OUTPUT_VARIABLE - ECHO_ERROR_VARIABLE - ) -endif() + if(NOT DEFINED VCPKG_BUILD_TYPE) + message(FATAL_ERROR "VCPKG_BUILD_TYPE is not defined") + endif() -if (WIN32) - set(JSRT_DIRECTORY_NAME jsrt) -else() - set(JSRT_DIRECTORY_NAME Jsrt) + 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" + WORKING_DIRECTORY ${BUILDTREE_PATH} + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT + ERROR_VARIABLE CHAKRA_BUILD_SH_ERR + RESULT_VARIABLE CHAKRA_BUILD_SH_RES + ECHO_OUTPUT_VARIABLE + ECHO_ERROR_VARIABLE + ) + endif() + 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}" + WORKING_DIRECTORY ${BUILDTREE_PATH} + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT + ERROR_VARIABLE CHAKRA_BUILD_SH_ERR + RESULT_VARIABLE CHAKRA_BUILD_SH_RES + ECHO_OUTPUT_VARIABLE + ECHO_ERROR_VARIABLE + ) + endif() + endif() file(INSTALL - ${BUILDTREE_PATH}/lib/${JSRT_DIRECTORY_NAME}/ChakraCore.h - ${BUILDTREE_PATH}/lib/${JSRT_DIRECTORY_NAME}/ChakraCommon.h - ${BUILDTREE_PATH}/lib/${JSRT_DIRECTORY_NAME}/ChakraDebug.h + ${BUILDTREE_PATH}/lib/Jsrt/ChakraCore.h + ${BUILDTREE_PATH}/lib/Jsrt/ChakraCommon.h + ${BUILDTREE_PATH}/lib/Jsrt/ChakraDebug.h DESTINATION ${CURRENT_PACKAGES_DIR}/include ) if(WIN32) file(INSTALL - ${BUILDTREE_PATH}/lib/${JSRT_DIRECTORY_NAME}/ChakraCommonWindows.h + ${BUILDTREE_PATH}/lib/Jsrt/ChakraCommonWindows.h DESTINATION ${CURRENT_PACKAGES_DIR}/include ) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") @@ -100,19 +114,41 @@ if(WIN32) ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore) + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore + ) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) endif() - vcpkg_copy_pdbs() else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(out_file libChakraCore.so) + else() + set(out_file lib/libChakraCoreStatic.a) + endif() -endif() + set(destination_dir_debug ${CURRENT_PACKAGES_DIR}/debug/bin) + set(destination_dir_release ${CURRENT_PACKAGES_DIR}/bin) + set(out_dir_debug ${BUILDTREE_PATH}/out/Debug) + set(out_dir_release ${BUILDTREE_PATH}/out/Release) + foreach(config ${configs}) + file(INSTALL + ${out_dir_${config}}/${out_file} + DESTINATION ${destination_dir_${config}} + ) + endforeach() -if(WIN32) - set(LICENSE_DESTINATION ${CURRENT_PACKAGES_DIR}/share/ChakraCore) -else() - set(LICENSE_DESTINATION ${CURRENT_PACKAGES_DIR}/share/chakracore) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL + ${out_dir_release}/ch + DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore + ) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) + endif() endif() + +vcpkg_copy_pdbs() + file(INSTALL ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${LICENSE_DESTINATION} RENAME copyright) \ No newline at end of file + DESTINATION ${CURRENT_PACKAGES_DIR}/share/chakracore + RENAME copyright +) \ No newline at end of file diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index 33ce75821a3fa5..316fefa0a97c7b 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,8 +1,7 @@ { "name": "chakracore", - "version-date": "2021-04-22", - "port-version": 0, + "version-string": "2021-04-22", "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", - "supports": "!uwp & !static" + "supports": "!osx & !uwp & (linux | !static)" } From eaba76ca06a42960a488aa76f58e7f9a9ec6d901 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Sun, 20 Jun 2021 01:35:09 +0300 Subject: [PATCH 03/16] x-add-version --- versions/baseline.json | 4 ++-- versions/c-/chakracore.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index c46e2c457b2618..ed9c9191de5464 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1209,8 +1209,8 @@ "port-version": 0 }, "chakracore": { - "baseline": "1.11.22", - "port-version": 1 + "baseline": "2021-04-22", + "port-version": 0 }, "charls": { "baseline": "2.2.0", diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 889e61da0cac1a..5b7eac0705ac1d 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0064688f1a4907fa94cf28caa761e3a1831626b3", + "version-string": "2021-04-22", + "port-version": 0 + }, { "git-tree": "89c6f3a1c86e3849e7f58941ab165af8da0b2f25", "version-string": "1.11.22", From 33a572295f58851f3e8553fdc18c26fa8ab1a5dc Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 20 Jul 2021 09:48:19 +0300 Subject: [PATCH 04/16] Update ci.baseline.txt --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0e9115309a4272..b0b0389346cf4f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -101,6 +101,7 @@ cfitsio:arm-uwp=fail cfitsio:x64-uwp=fail cgicc:arm-uwp=fail cgicc:x64-uwp=fail +chakracore:x64-linux=skip # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy) charls:arm64-windows=skip charls:arm-uwp=skip From 9e7fe9af9810f9f68aa55d43a9afbdc9488cfdbf Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 20 Jul 2021 09:52:29 +0300 Subject: [PATCH 05/16] Update portfile.cmake --- ports/chakracore/portfile.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 378ee9fa1ab6b0..58f501ae2d0191 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -42,9 +42,8 @@ else() set(CHAKRACORE_TARGET_ARCH x86) endif() - vcpkg_find_acquire_program(CLANG) - if(CLANG MATCHES "-NOTFOUND") - message(FATAL_ERROR "Clang is required.") + if (VCPKG_TARGET_IS_LINUX) + message(WARNING "This port requires Clang to build.") endif() if(NOT DEFINED VCPKG_BUILD_TYPE) @@ -151,4 +150,4 @@ file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/chakracore RENAME copyright -) \ No newline at end of file +) From f41fde49ee652b42163c4d7b2a3ca4e25ba11892 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 20 Jul 2021 09:53:51 +0300 Subject: [PATCH 06/16] Do not emit error if VCPKG_BUILD_TYPE is undefined --- ports/chakracore/portfile.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 58f501ae2d0191..a8cad9342dfeda 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -46,10 +46,6 @@ else() message(WARNING "This port requires Clang to build.") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE) - message(FATAL_ERROR "VCPKG_BUILD_TYPE is not defined") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") list(APPEND configs "debug") execute_process( From f4181ecc3d8488e9654afb8107e0fa2483251411 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 20 Jul 2021 11:44:20 +0300 Subject: [PATCH 07/16] Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/chakracore/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index a8cad9342dfeda..a35b76bb5af1ad 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -43,7 +43,8 @@ else() endif() if (VCPKG_TARGET_IS_LINUX) - message(WARNING "This port requires Clang to build.") + message(WARNING"${PORT} requires Clang from the system package manager, this can be installed on Ubuntu systems via sudo apt install clang") + endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") From f68ab017dfae05c5ef985f0ae125c51ff7279416 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 20 Jul 2021 17:50:43 +0300 Subject: [PATCH 08/16] Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/chakracore/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index a35b76bb5af1ad..a0aeca7bde0b04 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -63,7 +63,7 @@ else() list(APPEND configs "release") execute_process( COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" - WORKING_DIRECTORY ${BUILDTREE_PATH} + WORKING_DIRECTORY "${BUILDTREE_PATH}" OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT ERROR_VARIABLE CHAKRA_BUILD_SH_ERR RESULT_VARIABLE CHAKRA_BUILD_SH_RES From a4cf07c693064d91c172af6586a1ab9dd13a1dbc Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 20 Jul 2021 17:50:58 +0300 Subject: [PATCH 09/16] Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/chakracore/portfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index a0aeca7bde0b04..e2015ebbdfb011 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -51,7 +51,8 @@ else() list(APPEND configs "debug") execute_process( COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" - WORKING_DIRECTORY ${BUILDTREE_PATH} + WORKING_DIRECTORY "${BUILDTREE_PATH}" + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT ERROR_VARIABLE CHAKRA_BUILD_SH_ERR RESULT_VARIABLE CHAKRA_BUILD_SH_RES From 7de6e6f90a5f67a1bbfb5515db40ddd3ef807fb2 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 20 Jul 2021 17:51:06 +0300 Subject: [PATCH 10/16] Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/chakracore/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index e2015ebbdfb011..76ddf431105d8b 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -72,7 +72,6 @@ else() ECHO_ERROR_VARIABLE ) endif() - endif() file(INSTALL From ce0054788b4907b1cd18868acbc133fd655677f9 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 20 Jul 2021 17:51:13 +0300 Subject: [PATCH 11/16] Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/chakracore/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 76ddf431105d8b..5f1530148cda69 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -44,7 +44,6 @@ else() if (VCPKG_TARGET_IS_LINUX) message(WARNING"${PORT} requires Clang from the system package manager, this can be installed on Ubuntu systems via sudo apt install clang") - endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") From 14ad29a7b51b51f96d6eaac42aeab78bcb9b98e4 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Wed, 21 Jul 2021 07:18:42 +0300 Subject: [PATCH 12/16] Add missing space --- ports/chakracore/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 5f1530148cda69..2b5cd5ecdc1afb 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -43,7 +43,7 @@ else() endif() if (VCPKG_TARGET_IS_LINUX) - message(WARNING"${PORT} requires Clang from the system package manager, this can be installed on Ubuntu systems via sudo apt install clang") + message(WARNING "${PORT} requires Clang from the system package manager, this can be installed on Ubuntu systems via sudo apt install clang") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") From e84967e2b00652be5232301a8f5eece302e0f27c Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 21 Jul 2021 01:52:36 -0700 Subject: [PATCH 13/16] Add quotes to variables --- ports/chakracore/portfile.cmake | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 2b5cd5ecdc1afb..dc6edd2451077b 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -29,7 +29,7 @@ file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) if(WIN32) set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage vcpkg_build_msbuild( - PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln + PROJECT_PATH "${BUILDTREE_PATH}/Build/Chakra.Core.sln" OPTIONS "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" @@ -74,44 +74,44 @@ else() endif() file(INSTALL - ${BUILDTREE_PATH}/lib/Jsrt/ChakraCore.h - ${BUILDTREE_PATH}/lib/Jsrt/ChakraCommon.h - ${BUILDTREE_PATH}/lib/Jsrt/ChakraDebug.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCore.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommon.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraDebug.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) if(WIN32) file(INSTALL - ${BUILDTREE_PATH}/lib/Jsrt/ChakraCommonWindows.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommonWindows.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" ) file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" ) file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/chakracore" ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/chakracore") endif() else() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -120,10 +120,10 @@ else() set(out_file lib/libChakraCoreStatic.a) endif() - set(destination_dir_debug ${CURRENT_PACKAGES_DIR}/debug/bin) - set(destination_dir_release ${CURRENT_PACKAGES_DIR}/bin) - set(out_dir_debug ${BUILDTREE_PATH}/out/Debug) - set(out_dir_release ${BUILDTREE_PATH}/out/Release) + set(destination_dir_debug "${CURRENT_PACKAGES_DIR}/debug/bin") + set(destination_dir_release "${CURRENT_PACKAGES_DIR}/bin") + set(out_dir_debug "${BUILDTREE_PATH}/out/Debug") + set(out_dir_release "${BUILDTREE_PATH}/out/Release") foreach(config ${configs}) file(INSTALL ${out_dir_${config}}/${out_file} @@ -133,17 +133,17 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(INSTALL - ${out_dir_release}/ch - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore + "${out_dir_release}/ch" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/chakracore" ) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/chakracore") endif() endif() vcpkg_copy_pdbs() file(INSTALL - ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/chakracore + "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/chakracore" RENAME copyright ) From a6df37d347ecdee0362ecd90b37a1d2a344e731c Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 21 Jul 2021 01:53:30 -0700 Subject: [PATCH 14/16] Update the baseline version --- 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 5b7eac0705ac1d..f117242a510ba5 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0064688f1a4907fa94cf28caa761e3a1831626b3", + "git-tree": "d2a087a80eadee19050ecefd83ec7d5187fb4e8c", "version-string": "2021-04-22", "port-version": 0 }, From c6553c347a6c2a4f37a8751f003a3cd86dd2e337 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Thu, 22 Jul 2021 07:52:49 +0300 Subject: [PATCH 15/16] Fix Windows build --- ports/chakracore/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index dc6edd2451077b..62277ecebe3f95 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -82,6 +82,7 @@ file(INSTALL if(WIN32) file(INSTALL "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommonWindows.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCoreWindows.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") From 4dba0c82e71e6edf43f0d08a35ee09460cdda745 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Thu, 22 Jul 2021 14:34:53 +0300 Subject: [PATCH 16/16] vcpkg x-add-version chakracore --- 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 f117242a510ba5..66253a2e8381ac 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d2a087a80eadee19050ecefd83ec7d5187fb4e8c", + "git-tree": "0aa775c085b114b0ec67ea23ee99ece252d9e498", "version-string": "2021-04-22", "port-version": 0 },