Skip to content

Up JSC Linux #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 15, 2025
Merged

Up JSC Linux #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6c79aa
Up JSC Linux
CedricGuillemet Apr 14, 2025
7809b0d
fix JAVASCRIPTCORE_LIBRARY
CedricGuillemet Apr 14, 2025
8c8e577
redundant move in return statement. remove ‘std::move’ call
CedricGuillemet Apr 14, 2025
bb7a673
up url lib
CedricGuillemet Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/jobs/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
steps:
- script: |
sudo apt-get update
sudo apt-get install libjavascriptcoregtk-4.0-dev libcurl4-openssl-dev ninja-build
sudo apt-get install libjavascriptcoregtk-4.1-dev libcurl4-openssl-dev ninja-build
displayName: 'Install packages'

- script: cmake -B Build/ubuntu -GNinja -D CMAKE_BUILD_TYPE=RelWithDebInfo
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ FetchContent_Declare(llhttp
URL "https://github.com/nodejs/llhttp/archive/refs/tags/release/v8.1.0.tar.gz")
FetchContent_Declare(UrlLib
GIT_REPOSITORY https://github.com/BabylonJS/UrlLib.git
GIT_TAG 2f12534f242ab15aa761c3b273538f44787cf5e3)
GIT_TAG e0eb7d4c36c2cca5bbe82b94fd141734420ba84e)
# --------------------------------------------------

FetchContent_MakeAvailable(CMakeExtensions)
Expand Down
4 changes: 2 additions & 2 deletions Core/Node-API/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ elseif(ANDROID)
set(NAPI_JAVASCRIPT_ENGINE "V8" CACHE STRING "JavaScript engine for Node-API")
elseif(UNIX)
set(NAPI_JAVASCRIPT_ENGINE "JavaScriptCore" CACHE STRING "JavaScript engine for Node-API")
set(JAVASCRIPTCORE_LIBRARY "/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.0.so" CACHE STRING "Path to the JavaScriptCore shared library")
set(JAVASCRIPTCORE_LIBRARY "/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.1.so" CACHE STRING "Path to the JavaScriptCore shared library")
else()
message(FATAL_ERROR "Unable to select Node-API JavaScript engine for platform")
endif()
Expand Down Expand Up @@ -76,7 +76,7 @@ if(NAPI_BUILD_ABI)
set(LINK_LIBRARIES ${LINK_LIBRARIES}
PUBLIC ${JAVASCRIPTCORE_LIBRARY})
set(INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES}
PUBLIC "/usr/include/webkitgtk-4.0/")
PUBLIC "/usr/include/webkitgtk-4.1/")
else()
message(FATAL_ERROR "Unsupported JavaScript engine: ${NAPI_JAVASCRIPT_ENGINE}")
endif()
Expand Down
4 changes: 2 additions & 2 deletions Polyfills/XMLHttpRequest/Source/XMLHttpRequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ namespace Babylon::Polyfills::Internal
gsl::span<const std::byte> responseBuffer{m_request.ResponseBuffer()};
auto arrayBuffer{Napi::ArrayBuffer::New(Env(), responseBuffer.size())};
std::memcpy(arrayBuffer.Data(), responseBuffer.data(), arrayBuffer.ByteLength());
return std::move(arrayBuffer);
return arrayBuffer;
}
}

Expand Down Expand Up @@ -165,7 +165,7 @@ namespace Babylon::Polyfills::Internal
responseHeadersObject.Set(key, value);
}

return std::move(responseHeadersObject);
return responseHeadersObject;
}

void XMLHttpRequest::SetRequestHeader(const Napi::CallbackInfo& info)
Expand Down