mirror of
https://github.com/lightpanda-io/browser.git
synced 2025-10-29 15:13:28 +00:00
Merge pull request #237 from lightpanda-io/zig-js-runtime_rename
Update dependancy jsruntime-lib -> zig-js-runtime
This commit is contained in:
8
.github/actions/install/action.yml
vendored
8
.github/actions/install/action.yml
vendored
@@ -8,11 +8,11 @@ runs:
|
|||||||
- name: install v8
|
- name: install v8
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
mkdir -p vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/debug
|
mkdir -p vendor/zig-js-runtime/vendor/v8/${{env.ARCH}}/debug
|
||||||
ln -s /usr/local/lib/libc_v8.a vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/debug/libc_v8.a
|
ln -s /usr/local/lib/libc_v8.a vendor/zig-js-runtime/vendor/v8/${{env.ARCH}}/debug/libc_v8.a
|
||||||
|
|
||||||
mkdir -p vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/release
|
mkdir -p vendor/zig-js-runtime/vendor/v8/${{env.ARCH}}/release
|
||||||
ln -s /usr/local/lib/libc_v8.a vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/release/libc_v8.a
|
ln -s /usr/local/lib/libc_v8.a vendor/zig-js-runtime/vendor/v8/${{env.ARCH}}/release/libc_v8.a
|
||||||
|
|
||||||
- name: libiconv
|
- name: libiconv
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|||||||
2
.github/workflows/wpt.yml
vendored
2
.github/workflows/wpt.yml
vendored
@@ -55,7 +55,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
token: ${{ secrets.GH_CI_PAT }}
|
token: ${{ secrets.GH_CI_PAT }}
|
||||||
# fetch submodules recusively, to get jsruntime-lib submodules also.
|
# fetch submodules recusively, to get zig-js-runtime submodules also.
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- uses: ./.github/actions/install
|
- uses: ./.github/actions/install
|
||||||
|
|||||||
8
.github/workflows/zig-test.yml
vendored
8
.github/workflows/zig-test.yml
vendored
@@ -15,7 +15,7 @@ on:
|
|||||||
- "build.zig"
|
- "build.zig"
|
||||||
- "src/**/*.zig"
|
- "src/**/*.zig"
|
||||||
- "src/*.zig"
|
- "src/*.zig"
|
||||||
- "vendor/jsruntime-lib"
|
- "vendor/zig-js-runtime"
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
# By default GH trigger on types opened, synchronize and reopened.
|
# By default GH trigger on types opened, synchronize and reopened.
|
||||||
@@ -53,7 +53,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
token: ${{ secrets.GH_CI_PAT }}
|
token: ${{ secrets.GH_CI_PAT }}
|
||||||
# fetch submodules recusively, to get jsruntime-lib submodules also.
|
# fetch submodules recusively, to get zig-js-runtime submodules also.
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- uses: ./.github/actions/install
|
- uses: ./.github/actions/install
|
||||||
@@ -79,7 +79,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
token: ${{ secrets.GH_CI_PAT }}
|
token: ${{ secrets.GH_CI_PAT }}
|
||||||
# fetch submodules recusively, to get jsruntime-lib submodules also.
|
# fetch submodules recusively, to get zig-js-runtime submodules also.
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- uses: ./.github/actions/install
|
- uses: ./.github/actions/install
|
||||||
@@ -105,7 +105,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
token: ${{ secrets.GH_CI_PAT }}
|
token: ${{ secrets.GH_CI_PAT }}
|
||||||
# fetch submodules recusively, to get jsruntime-lib submodules also.
|
# fetch submodules recusively, to get zig-js-runtime submodules also.
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- uses: ./.github/actions/install
|
- uses: ./.github/actions/install
|
||||||
|
|||||||
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -1,6 +1,6 @@
|
|||||||
[submodule "vendor/jsruntime-lib"]
|
[submodule "vendor/zig-js-runtime"]
|
||||||
path = vendor/jsruntime-lib
|
path = vendor/zig-js-runtime
|
||||||
url = git@github.com:lightpanda-io/jsruntime-lib.git
|
url = git@github.com:lightpanda-io/zig-js-runtime.git
|
||||||
[submodule "vendor/netsurf/libwapcaplet"]
|
[submodule "vendor/netsurf/libwapcaplet"]
|
||||||
path = vendor/netsurf/libwapcaplet
|
path = vendor/netsurf/libwapcaplet
|
||||||
url = git@github.com:lightpanda-io/libwapcaplet.git
|
url = git@github.com:lightpanda-io/libwapcaplet.git
|
||||||
|
|||||||
16
Makefile
16
Makefile
@@ -25,7 +25,7 @@ help:
|
|||||||
# ------------
|
# ------------
|
||||||
.PHONY: build build-release run run-release shell test bench download-zig wpt
|
.PHONY: build build-release run run-release shell test bench download-zig wpt
|
||||||
|
|
||||||
zig_version = $(shell grep 'recommended_zig_version = "' "vendor/jsruntime-lib/build.zig" | cut -d'"' -f2)
|
zig_version = $(shell grep 'recommended_zig_version = "' "vendor/zig-js-runtime/build.zig" | cut -d'"' -f2)
|
||||||
kernel = $(shell uname -ms)
|
kernel = $(shell uname -ms)
|
||||||
|
|
||||||
## Download the zig recommended version
|
## Download the zig recommended version
|
||||||
@@ -93,16 +93,16 @@ test:
|
|||||||
# Install and build required dependencies commands
|
# Install and build required dependencies commands
|
||||||
# ------------
|
# ------------
|
||||||
.PHONY: install-submodule
|
.PHONY: install-submodule
|
||||||
.PHONY: install-jsruntime install-jsruntime-dev install-libiconv
|
.PHONY: install-zig-js-runtime install-zig-js-runtime-dev install-libiconv
|
||||||
.PHONY: _install-netsurf install-netsurf clean-netsurf test-netsurf install-netsurf-dev
|
.PHONY: _install-netsurf install-netsurf clean-netsurf test-netsurf install-netsurf-dev
|
||||||
.PHONY: install-mimalloc install-mimalloc-dev clean-mimalloc
|
.PHONY: install-mimalloc install-mimalloc-dev clean-mimalloc
|
||||||
.PHONY: install-dev install
|
.PHONY: install-dev install
|
||||||
|
|
||||||
## Install and build dependencies for release
|
## Install and build dependencies for release
|
||||||
install: install-submodule install-jsruntime install-netsurf install-mimalloc
|
install: install-submodule install-zig-js-runtime install-netsurf install-mimalloc
|
||||||
|
|
||||||
## Install and build dependencies for dev
|
## Install and build dependencies for dev
|
||||||
install-dev: install-submodule install-jsruntime-dev install-netsurf-dev install-mimalloc-dev
|
install-dev: install-submodule install-zig-js-runtime-dev install-netsurf-dev install-mimalloc-dev
|
||||||
|
|
||||||
install-netsurf-dev: _install-netsurf
|
install-netsurf-dev: _install-netsurf
|
||||||
install-netsurf-dev: OPTCFLAGS := -O0 -g -DNDEBUG
|
install-netsurf-dev: OPTCFLAGS := -O0 -g -DNDEBUG
|
||||||
@@ -178,12 +178,12 @@ ifeq ("$(wildcard vendor/libiconv/lib/libiconv.a)","")
|
|||||||
make && make install
|
make && make install
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install-jsruntime-dev:
|
install-zig-js-runtime-dev:
|
||||||
@cd vendor/jsruntime-lib && \
|
@cd vendor/zig-js-runtime && \
|
||||||
make install-dev
|
make install-dev
|
||||||
|
|
||||||
install-jsruntime:
|
install-zig-js-runtime:
|
||||||
@cd vendor/jsruntime-lib && \
|
@cd vendor/zig-js-runtime && \
|
||||||
make install
|
make install
|
||||||
|
|
||||||
.PHONY: _build_mimalloc
|
.PHONY: _build_mimalloc
|
||||||
|
|||||||
12
README.md
12
README.md
@@ -8,7 +8,7 @@ Browsercore is written with [Zig](https://ziglang.org/) `0.12`. You have to
|
|||||||
install it with the right version in order to build the project.
|
install it with the right version in order to build the project.
|
||||||
|
|
||||||
Browsercore also depends on
|
Browsercore also depends on
|
||||||
[js-runtimelib](https://github.com/francisbouvier/jsruntime-lib/),
|
[js-runtimelib](https://github.com/francisbouvier/zig-js-runtime/),
|
||||||
[Netsurf libs](https://www.netsurf-browser.org/) and
|
[Netsurf libs](https://www.netsurf-browser.org/) and
|
||||||
[Mimalloc](https://microsoft.github.io/mimalloc) libs.
|
[Mimalloc](https://microsoft.github.io/mimalloc) libs.
|
||||||
|
|
||||||
@@ -57,22 +57,22 @@ Note, when Mimalloc is built in dev mode, you can dump memory stats with the
|
|||||||
env var `MIMALLOC_SHOW_STATS=1`. See
|
env var `MIMALLOC_SHOW_STATS=1`. See
|
||||||
https://microsoft.github.io/mimalloc/environment.html
|
https://microsoft.github.io/mimalloc/environment.html
|
||||||
|
|
||||||
### Build jsruntime-lib
|
### Build zig-js-runtime
|
||||||
|
|
||||||
The command `make install-jsruntime-dev` uses jsruntime-lib's `zig-v8` dependency to build v8 engine lib.
|
The command `make install-zig-js-runtime-dev` uses zig-js-runtime's `zig-v8` dependency to build v8 engine lib.
|
||||||
Be aware the build task is very long and cpu consuming.
|
Be aware the build task is very long and cpu consuming.
|
||||||
|
|
||||||
Build v8 engine for debug/dev version, it creates
|
Build v8 engine for debug/dev version, it creates
|
||||||
`vendor/jsruntime-lib/vendor/v8/$ARCH/debug/libc_v8.a` file.
|
`vendor/zig-js-runtime/vendor/v8/$ARCH/debug/libc_v8.a` file.
|
||||||
|
|
||||||
```
|
```
|
||||||
make install-jsruntime-dev
|
make install-zig-js-runtime-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
You should also build a release vesion of v8 with:
|
You should also build a release vesion of v8 with:
|
||||||
|
|
||||||
```
|
```
|
||||||
make install-jsruntime
|
make install-zig-js-runtime
|
||||||
```
|
```
|
||||||
|
|
||||||
### All in one build
|
### All in one build
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ const std = @import("std");
|
|||||||
|
|
||||||
const builtin = @import("builtin");
|
const builtin = @import("builtin");
|
||||||
|
|
||||||
const jsruntime_path = "vendor/jsruntime-lib/";
|
const jsruntime_path = "vendor/zig-js-runtime/";
|
||||||
const jsruntime = @import("vendor/jsruntime-lib/build.zig");
|
const jsruntime = @import("vendor/zig-js-runtime/build.zig");
|
||||||
const jsruntime_pkgs = jsruntime.packages(jsruntime_path);
|
const jsruntime_pkgs = jsruntime.packages(jsruntime_path);
|
||||||
|
|
||||||
/// Do not rename this constant. It is scanned by some scripts to determine
|
/// Do not rename this constant. It is scanned by some scripts to determine
|
||||||
@@ -106,7 +106,7 @@ pub fn build(b: *std.build.Builder) !void {
|
|||||||
|
|
||||||
// add jsruntime pretty deps
|
// add jsruntime pretty deps
|
||||||
const pretty = tests.step.owner.createModule(.{
|
const pretty = tests.step.owner.createModule(.{
|
||||||
.source_file = .{ .path = "vendor/jsruntime-lib/src/pretty.zig" },
|
.source_file = .{ .path = "vendor/zig-js-runtime/src/pretty.zig" },
|
||||||
});
|
});
|
||||||
tests.addModule("pretty", pretty);
|
tests.addModule("pretty", pretty);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user