Skip to content
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.

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

Upgrade V8 to v10.3.174.14 #583

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:

- name: Download monolithic libraries and extract to v8.out
run: |
curl -k -O http://download.eclipsesource.com/j2v8/v8/libv8_9.3.345.11_monolith.zip
curl -k -O http://download.eclipsesource.com/j2v8/v8/libv8_10.3.174.14_monolith.zip
mkdir -p v8.out
unzip libv8_9.3.345.11_monolith.zip -d v8.out
unzip libv8_10.3.174.14_monolith.zip -d v8.out

- name: Start J2V8 build
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:

- name: Download monolithic libraries and extract to v8.out
run: |
curl -k -O http://download.eclipsesource.com/j2v8/v8/libv8_9.3.345.11_monolith.zip
curl -k -O http://download.eclipsesource.com/j2v8/v8/libv8_10.3.174.14_monolith.zip
mkdir -p v8.out
unzip libv8_9.3.345.11_monolith.zip -d v8.out
unzip libv8_10.3.174.14_monolith.zip -d v8.out

- name: Start J2V8 build
run: python2 build.py -t linux -a x64 --docker j2v8cmake j2v8jni j2v8cpp j2v8optimize j2v8java j2v8test
Expand All @@ -24,7 +24,7 @@ jobs:
uses: actions/[email protected]
with:
name: j2v8-linux-x86_64
path: build.out/j2v8_linux_x86_64-6.2.1.jar
path: build.out/j2v8_linux_x86_64-6.2.2.jar

build_j2v8_android:
name: Build J2V8 for Android
Expand All @@ -36,9 +36,9 @@ jobs:

- name: Download monolithic libraries and extract to v8.out
run: |
curl -k -O http://download.eclipsesource.com/j2v8/v8/libv8_9.3.345.11_monolith.zip
curl -k -O http://download.eclipsesource.com/j2v8/v8/libv8_10.3.174.14_monolith.zip
mkdir -p v8.out
unzip libv8_9.3.345.11_monolith.zip -d v8.out
unzip libv8_10.3.174.14_monolith.zip -d v8.out

- name: Start J2V8 build
run: |
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ source_group("" FILES ${src_files})
# BUILD SETTINGS & COMPILATION
#-----------------------------------------------------------------------

# tell gcc/clang to use the c++14 standard
set(CMAKE_CXX_STANDARD 14)
# tell gcc/clang to use the c++17 standard
set(CMAKE_CXX_STANDARD 17)

if(CMAKE_SYSTEM_NAME STREQUAL "Android")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused-function -Wno-unused-variable -O3 -funroll-loops -ftree-vectorize -ffast-math -fpermissive -fPIC ")
Expand Down
2 changes: 1 addition & 1 deletion build_system/build_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# J2V8 settings
#-----------------------------------------------------------------------

J2V8_VERSION_MAJOR, J2V8_VERSION_MINOR, J2V8_VERSION_PATCH = 6, 2, 1
J2V8_VERSION_MAJOR, J2V8_VERSION_MINOR, J2V8_VERSION_PATCH = 6, 2, 2
# J2V8_VERSION_SUFFIX = "-SNAPSHOT"
J2V8_VERSION_SUFFIX = ""

Expand Down
2 changes: 1 addition & 1 deletion docker/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# sys_image can be overridden from the CLI
ARG sys_image=debian:stable
ARG sys_image=debian:buster

FROM $sys_image

Expand Down
2 changes: 1 addition & 1 deletion jni/com_eclipsesource_v8_V8Impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1868,7 +1868,7 @@ JNIEXPORT void JNICALL Java_com_eclipsesource_v8_V8__1setWeak
jobject v8 = reinterpret_cast<V8Runtime*>(wrd->v8RuntimePtr)->v8;
env->CallVoidMethod(v8, v8WeakReferenceReleased, wrd->objectHandle);
delete(wrd);
}, WeakCallbackType::kFinalizer);
}, WeakCallbackType::kParameter);
}

JNIEXPORT void JNICALL Java_com_eclipsesource_v8_V8__1clearWeak
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/eclipsesource/v8/V8Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void testLowMemoryNotification() {
public void testGetVersion_StartsWith9() {
String v8version = V8.getV8Version();

assertTrue(v8version.startsWith("9."));
assertTrue(v8version.startsWith("10."));
}

@Test
Expand Down
38 changes: 22 additions & 16 deletions v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG sys_image=debian:10
ARG sys_image=ubuntu:20.04

FROM $sys_image

Expand All @@ -9,18 +9,24 @@ ARG target_cpu=x64

# Update depedency of V8
RUN apt-get -qq update && \
DEBIAN_FRONTEND=noninteractive apt-get -qq install -y \
lsb-release \
sudo \
apt-utils \
DEBIAN_FRONTEND=noninteractive apt-get install --upgrade -qq -y --no-install-recommends \
git \
curl \
wget \
build-essential \
software-properties-common \
patchelf \
sudo \
zip \
unzip \
gcc gcc-multilib \
g++ g++-multilib \
execstack \
python3 \
python \
lbzip2 \
curl \
wget \
xz-utils \
g++-8-arm-linux-gnueabihf \
gcc-arm-linux-gnueabihf
python3-pip \
python3-distutils \
python3-testresources

RUN mkdir -p /v8build
WORKDIR /v8build
Expand All @@ -33,21 +39,21 @@ RUN echo $PATH
# Fetch V8 code
RUN fetch v8
WORKDIR /v8build/v8
RUN git checkout 9.3.345.11
RUN git checkout 10.3.174.14
RUN sed -i 's/snapcraft/nosnapcraft/g' ./build/install-build-deps.sh
RUN ./build/install-build-deps.sh
RUN sed -i 's/nosnapcraft/snapcraft/g' ./build/install-build-deps.sh
WORKDIR /v8build

ENV target_os ${target_os}
RUN echo "target_os= ['${target_os}']" >> .gclient
RUN gclient sync

WORKDIR /v8build/v8
COPY install-deps.sh .
RUN echo y | sh install-deps.sh

ENV target_cpu ${target_cpu}
ENV build_platform ${target_cpu}.release
ENV path_to_args ${target_os}-${target_cpu}/args.gn

WORKDIR /v8build/v8
RUN ./tools/dev/v8gen.py ${build_platform} -vv

RUN rm out.gn/${build_platform}/args.gn
Expand Down