Build JavaScriptCoreTest and upload artifacts

Author: bavulapati

.github/workflows/build-javascriptcore.yml

@@ -9,7 +9,13 @@ jobs:
         run: |
           git clone https://github.com/microsoft/vcpkg.git
           ./vcpkg/bootstrap-vcpkg.bat
-          ls vcpkg\scripts\buildsystems\vcpkg.cmake
       - name: Build JavaScriptCore
-        run: |
-          cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE="vcpkg\scripts\buildsystems\vcpkg.cmake"
+        run: cmake --preset release -DCMAKE_TOOLCHAIN_FILE="vcpkg\scripts\buildsystems\vcpkg.cmake"
+      - name: Build JavaScriptCoreTest
+        run: cmake --build --preset release
+      - name: Upload JavaScriptCore artifacts
+        uses: actions/upload-artifact@v4
+        with:
+            name: JavaScriptCore
+            path: build/release/vcpkg_installed/x64-windows/
+            if-no-files-found: error

.gitignore

@@ -0,0 +1,7 @@
+################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+/build
+/CMakeUserPresets.json
+/.vs

CMakeLists.txt

@@ -1,5 +1,24 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.23)
 
 project(PublishJavaScriptCore)
 
+add_executable(JavaScriptCoreTest main.cpp)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+
+# Find JavaScriptCore
 find_package(JavaScriptCore REQUIRED)
+if (NOT TARGET JavaScriptCore)
+    add_library(JavaScriptCore SHARED IMPORTED)
+    set_target_properties(JavaScriptCore PROPERTIES
+    IMPORTED_LOCATION "${JavaScriptCore_LOCATION_RELEASE}"
+    IMPORTED_LOCATION_DEBUG "${JavaScriptCore_LOCATION_DEBUG}"
+    IMPORTED_IMPLIB "${JavaScriptCore_IMPLIB_RELEASE}"
+    IMPORTED_IMPLIB_DEBUG "${JavaScriptCore_IMPLIB_DEBUG}"
+    INTERFACE_INCLUDE_DIRECTORIES "${JavaScriptCore_INCLUDE_DIRS}"
+    IMPORTED_CONFIGURATIONS "Release;Debug"
+  )
+endif()
+
+target_link_libraries(JavaScriptCoreTest PRIVATE JavaScriptCore)
+

CMakePresets.json

@@ -0,0 +1,35 @@
+{
+  "version": 3,
+  "configurePresets": [
+    {
+      "name": "release",
+      "binaryDir": "build/release",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": {
+          "type": "STRING",
+          "value": "Release"
+        }
+      }
+    },
+    {
+      "name": "debug",
+      "binaryDir": "build/debug",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": {
+          "type": "STRING",
+          "value": "Debug"
+        }
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "release",
+      "configurePreset": "release"
+    },
+    {
+      "name": "debug",
+      "configurePreset": "debug"
+    }
+  ]
+}

cmake/FindJavaScriptCore.cmake

@@ -0,0 +1,11 @@
+message(STATUS "Using vcpkg to find JavaScriptCore")
+message(STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
+set(JavaScriptCore_DIR "${CMAKE_BINARY_DIR}/vcpkg_installed/x64-windows")
+set(JavaScriptCore_INCLUDE_DIRS "${JavaScriptCore_DIR}/include")
+message(STATUS "JavaScriptCore_INCLUDE_DIRS: ${JavaScriptCore_INCLUDE_DIRS}")
+
+set(JavaScriptCore_LOCATION_DEBUG "${JavaScriptCore_DIR}/debug/bin/JavaScriptCore.dll")
+set(JavaScriptCore_LOCATION_RELEASE "${JavaScriptCore_DIR}/bin/JavaScriptCore.dll")
+set(JavaScriptCore_IMPLIB_DEBUG "${JavaScriptCore_DIR}/debug/lib/JavaScriptCore.lib")
+set(JavaScriptCore_IMPLIB_RELEASE "${JavaScriptCore_DIR}/lib/JavaScriptCore.lib")
+set(JavaScriptCore_FOUND TRUE)

main.cpp

@@ -0,0 +1,13 @@
+#include <iostream>
+#include <JavaScriptCore/JavaScript.h>
+
+int main() {
+  JSStringRef string = JSStringCreateWithUTF8CString("Hello JSCore!");
+  int length = JSStringGetLength(string);
+  std::cout << "Length of the String: " << length << std::endl;
+  char buffer[20];
+  JSStringGetUTF8CString(string, buffer, JSStringGetLength(string) + 1);
+  std::cout << "String: " << buffer << std::endl;
+  JSStringRelease(string);
+  return 0;
+}

overlay-ports/javascriptcore/disable_api_tests.patch

@@ -12,43 +12,30 @@ index aa99898dc4f1..17db4640001e 100644
 
  # Remove this cmake_policy() after upgrading cmake_minimum_required() to 3.20.
 diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
-index a64c09b5d470..80c45bd91c17 100644
+index 5fbb9a3bc110..cab1c6927b41 100644
 --- a/Source/JavaScriptCore/CMakeLists.txt
 +++ b/Source/JavaScriptCore/CMakeLists.txt
-@@ -1490,6 +1490,13 @@ WEBKIT_COPY_FILES(JavaScriptCore_CopyHeaders
-     FLATTENED
- )
+@@ -1569,10 +1569,22 @@ if (NOT "${PORT}" STREQUAL "Mac")
+     if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
+         WEBKIT_POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
+         set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
+-        install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
+     endif ()
+ endif ()
 
 +target_sources(JavaScriptCore PUBLIC
 +    FILE_SET install_headers
 +    TYPE HEADERS
 +    BASE_DIRS API
 +    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
 +)
-+
- WEBKIT_COPY_FILES(JavaScriptCore_CopyPrivateHeaders
-     DESTINATION ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
-     FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
-@@ -1548,9 +1555,15 @@ if (NOT "${PORT}" STREQUAL "Mac")
-     if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED")
-         WEBKIT_POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE)
-         set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
--        install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}")
-     endif ()
- endif ()
-+install(
-+          TARGETS JavaScriptCore
-+          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
-+          LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
-+          RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
-+          FILE_SET install_headers DESTINATION "${CMAKE_INSTALL_PREFIX}/include/JavaScriptCore"
++install(TARGETS JavaScriptCore
++    ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
++    LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
++    RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
++    FILE_SET install_headers DESTINATION "${CMAKE_INSTALL_PREFIX}/include/JavaScriptCore"
 +)
- 
++
  # Force staging of shared scripts, even if they aren't directly used to build JavaScriptCore.
 
-@@ -1565,4 +1578,4 @@ if (CMAKE_GENERATOR MATCHES "Visual Studio")
-     add_dependencies(JavaScriptCoreSharedScripts JSCBuiltins)
- endif ()
- 
--add_subdirectory(shell)
-+# add_subdirectory(shell)
+ add_custom_target(JavaScriptCoreSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})

overlay-ports/javascriptcore/modify_install_rules.patch

@@ -1,15 +1,13 @@
 vcpkg_from_github(
       OUT_SOURCE_PATH SOURCE_PATH
       REPO webkit/webkit
-      REF WebKit-7616.1.27.211.1
-      SHA512 aea5feb085f9adaa6efbbb840b2bdbc677c69c82c53c611ef9b527ae4ea2490a983dfdc55eb8aa471ab9975b748ea51d2cf9f2c853454904018ab8bb0ec77ad0
+      REF 60339678878a0cc06b7ba3b5c5bc574d59f821a1
+      SHA512 7fbd81c3aca23ee105f64d5f8f63e00fcbaadde544377047ba58da670adb774752ed6e1fb6bff1aade8e579fecf22cbe5bd547eef82645675c05386c9ad771c5
       HEAD_REF main
       PATCHES
         remove_webkit_find_package.patch
         tune_jsconly_port_for_windows.patch
-        tune_wtf.patch
         modify_install_rules.patch
-        disable_api_tests.patch
 )
 
 vcpkg_find_acquire_program(RUBY)
@@ -27,7 +25,7 @@ vcpkg_add_to_path("${PERL_DIR}")
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
   set(ENABLE_STATIC_JSC ON)
 else()
-  set(ENABLE_STATIC_JSC ON)
+  set(ENABLE_STATIC_JSC OFF)
 endif()
 
 vcpkg_cmake_configure(
@@ -36,6 +34,7 @@ vcpkg_cmake_configure(
       -DPORT=JSCOnly
       -DENABLE_STATIC_JSC=${ENABLE_STATIC_JSC}
       -DUSE_APPLE_ICU=OFF
+      -DENABLE_TOOLS=OFF
 )
 
 vcpkg_cmake_install()

overlay-ports/javascriptcore/portfile.cmake

@@ -1,8 +1,8 @@
 diff --git a/Source/cmake/WebKitCommon.cmake b/Source/cmake/WebKitCommon.cmake
-index d85ee1813b4b..1670ea855ebf 100644
+index f20a8d06d914..16c7846511ef 100644
 --- a/Source/cmake/WebKitCommon.cmake
 +++ b/Source/cmake/WebKitCommon.cmake
-@@ -222,7 +222,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+@@ -231,7 +231,7 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
      include(WebKitCompilerFlags)
      include(WebKitStaticAnalysis)
      include(WebKitFeatures)

overlay-ports/javascriptcore/remove_webkit_find_package.patch

@@ -1,36 +1,22 @@
 diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
-index ff391d7e0849..e05f2a3adeef 100644
+index 31e353ded188..218c34c24338 100644
 --- a/Source/cmake/OptionsJSCOnly.cmake
 +++ b/Source/cmake/OptionsJSCOnly.cmake
-@@ -1,4 +1,6 @@
--find_package(Threads REQUIRED)
-+if (NOT WIN32)
-+    find_package(Threads REQUIRED)
-+endif ()
+@@ -41,12 +41,7 @@ set(ENABLE_WEBKIT_LEGACY OFF)
+ set(ENABLE_WEBKIT OFF)
+ set(ENABLE_WEBINSPECTORUI OFF)
+ set(ENABLE_WEBGL OFF)
+-
+-if (WIN32)
+-    set(ENABLE_API_TESTS OFF)
+-else ()
+-    set(ENABLE_API_TESTS ON)
+-endif ()
++set(ENABLE_API_TESTS OFF)
 
- if (MSVC)
-     include(OptionsMSVC)
-@@ -55,10 +57,15 @@ endif ()
- 
- # FIXME: JSCOnly on WIN32 seems to only work with fully static build
- # https://bugs.webkit.org/show_bug.cgi?id=172862
--if (NOT ENABLE_STATIC_JSC AND NOT WIN32)
--    set(JavaScriptCore_LIBRARY_TYPE SHARED)
--    set(bmalloc_LIBRARY_TYPE OBJECT)
--    set(WTF_LIBRARY_TYPE OBJECT)
-+if (NOT ENABLE_STATIC_JSC)
-+    if (NOT WIN32)
-+      set(JavaScriptCore_LIBRARY_TYPE SHARED)
-+      set(bmalloc_LIBRARY_TYPE OBJECT)
-+      set(WTF_LIBRARY_TYPE OBJECT)
-+    else ()
-+      set(JavaScriptCore_LIBRARY_TYPE SHARED)
-+      set(WTF_LIBRARY_TYPE SHARED)
-+    endif ()
- endif ()
- 
- if (WIN32)
-@@ -74,7 +81,7 @@ if (WIN32)
+ if (WTF_CPU_ARM OR WTF_CPU_MIPS)
+     SET_AND_EXPOSE_TO_BUILD(USE_CAPSTONE TRUE)
+@@ -71,7 +66,7 @@ if (WIN32)
          endif ()
      endif ()
 
@@ -39,15 +25,3 @@ index ff391d7e0849..e05f2a3adeef 100644
 
      if (WTF_CPU_X86_64)
          set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS OFF)
-@@ -94,7 +101,10 @@ if (WIN32)
- endif ()
- 
- string(TOLOWER ${EVENT_LOOP_TYPE} LOWERCASE_EVENT_LOOP_TYPE)
--if (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
-+if (WIN32)
-+    SET_AND_EXPOSE_TO_BUILD(USE_GENERIC_EVENT_LOOP 0)
-+    SET_AND_EXPOSE_TO_BUILD(WTF_DEFAULT_EVENT_LOOP 1)
-+elseif (LOWERCASE_EVENT_LOOP_TYPE STREQUAL "glib")
-     find_package(GLIB 2.36 REQUIRED COMPONENTS gio gio-unix gobject)
-     SET_AND_EXPOSE_TO_BUILD(USE_GLIB 1)
-     SET_AND_EXPOSE_TO_BUILD(USE_GLIB_EVENT_LOOP 1)

overlay-ports/javascriptcore/tune_jsconly_port_for_windows.patch

@@ -1,6 +1,6 @@
 {
   "name": "javascriptcore",
-  "version": "2023-09-15",
+  "version": "2024-02-07",
   "description": "JavaScriptCore is the built-in JavaScript engine for WebKit, which implements ECMAScript as in ECMA-262 specification.",
   "homepage": "https://webkit.org/",
   "license": null,