Skip to content

Commit 88c9875

Browse files
Merge pull request #237 from lightpanda-io/zig-js-runtime_rename
Update dependancy jsruntime-lib -> zig-js-runtime
2 parents deed054 + 5fbbf1b commit 88c9875

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

.github/actions/install/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ runs:
88
- name: install v8
99
shell: bash
1010
run: |
11-
mkdir -p vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/debug
12-
ln -s /usr/local/lib/libc_v8.a vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/debug/libc_v8.a
11+
mkdir -p vendor/zig-js-runtime/vendor/v8/${{env.ARCH}}/debug
12+
ln -s /usr/local/lib/libc_v8.a vendor/zig-js-runtime/vendor/v8/${{env.ARCH}}/debug/libc_v8.a
1313
14-
mkdir -p vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/release
15-
ln -s /usr/local/lib/libc_v8.a vendor/jsruntime-lib/vendor/v8/${{env.ARCH}}/release/libc_v8.a
14+
mkdir -p vendor/zig-js-runtime/vendor/v8/${{env.ARCH}}/release
15+
ln -s /usr/local/lib/libc_v8.a vendor/zig-js-runtime/vendor/v8/${{env.ARCH}}/release/libc_v8.a
1616
1717
- name: libiconv
1818
shell: bash

.github/workflows/wpt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
with:
5656
fetch-depth: 0
5757
token: ${{ secrets.GH_CI_PAT }}
58-
# fetch submodules recusively, to get jsruntime-lib submodules also.
58+
# fetch submodules recusively, to get zig-js-runtime submodules also.
5959
submodules: recursive
6060

6161
- uses: ./.github/actions/install

.github/workflows/zig-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
- "build.zig"
1616
- "src/**/*.zig"
1717
- "src/*.zig"
18-
- "vendor/jsruntime-lib"
18+
- "vendor/zig-js-runtime"
1919
pull_request:
2020

2121
# By default GH trigger on types opened, synchronize and reopened.
@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
fetch-depth: 0
5555
token: ${{ secrets.GH_CI_PAT }}
56-
# fetch submodules recusively, to get jsruntime-lib submodules also.
56+
# fetch submodules recusively, to get zig-js-runtime submodules also.
5757
submodules: recursive
5858

5959
- uses: ./.github/actions/install
@@ -79,7 +79,7 @@ jobs:
7979
with:
8080
fetch-depth: 0
8181
token: ${{ secrets.GH_CI_PAT }}
82-
# fetch submodules recusively, to get jsruntime-lib submodules also.
82+
# fetch submodules recusively, to get zig-js-runtime submodules also.
8383
submodules: recursive
8484

8585
- uses: ./.github/actions/install
@@ -105,7 +105,7 @@ jobs:
105105
with:
106106
fetch-depth: 0
107107
token: ${{ secrets.GH_CI_PAT }}
108-
# fetch submodules recusively, to get jsruntime-lib submodules also.
108+
# fetch submodules recusively, to get zig-js-runtime submodules also.
109109
submodules: recursive
110110

111111
- uses: ./.github/actions/install

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[submodule "vendor/jsruntime-lib"]
2-
path = vendor/jsruntime-lib
3-
url = git@github.com:lightpanda-io/jsruntime-lib.git
1+
[submodule "vendor/zig-js-runtime"]
2+
path = vendor/zig-js-runtime
3+
url = git@github.com:lightpanda-io/zig-js-runtime.git
44
[submodule "vendor/netsurf/libwapcaplet"]
55
path = vendor/netsurf/libwapcaplet
66
url = git@github.com:lightpanda-io/libwapcaplet.git

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ help:
2525
# ------------
2626
.PHONY: build build-release run run-release shell test bench download-zig wpt
2727

28-
zig_version = $(shell grep 'recommended_zig_version = "' "vendor/jsruntime-lib/build.zig" | cut -d'"' -f2)
28+
zig_version = $(shell grep 'recommended_zig_version = "' "vendor/zig-js-runtime/build.zig" | cut -d'"' -f2)
2929
kernel = $(shell uname -ms)
3030

3131
## Download the zig recommended version
@@ -93,16 +93,16 @@ test:
9393
# Install and build required dependencies commands
9494
# ------------
9595
.PHONY: install-submodule
96-
.PHONY: install-jsruntime install-jsruntime-dev install-libiconv
96+
.PHONY: install-zig-js-runtime install-zig-js-runtime-dev install-libiconv
9797
.PHONY: _install-netsurf install-netsurf clean-netsurf test-netsurf install-netsurf-dev
9898
.PHONY: install-mimalloc install-mimalloc-dev clean-mimalloc
9999
.PHONY: install-dev install
100100

101101
## Install and build dependencies for release
102-
install: install-submodule install-jsruntime install-netsurf install-mimalloc
102+
install: install-submodule install-zig-js-runtime install-netsurf install-mimalloc
103103

104104
## Install and build dependencies for dev
105-
install-dev: install-submodule install-jsruntime-dev install-netsurf-dev install-mimalloc-dev
105+
install-dev: install-submodule install-zig-js-runtime-dev install-netsurf-dev install-mimalloc-dev
106106

107107
install-netsurf-dev: _install-netsurf
108108
install-netsurf-dev: OPTCFLAGS := -O0 -g -DNDEBUG
@@ -178,12 +178,12 @@ ifeq ("$(wildcard vendor/libiconv/lib/libiconv.a)","")
178178
make && make install
179179
endif
180180

181-
install-jsruntime-dev:
182-
@cd vendor/jsruntime-lib && \
181+
install-zig-js-runtime-dev:
182+
@cd vendor/zig-js-runtime && \
183183
make install-dev
184184

185-
install-jsruntime:
186-
@cd vendor/jsruntime-lib && \
185+
install-zig-js-runtime:
186+
@cd vendor/zig-js-runtime && \
187187
make install
188188

189189
.PHONY: _build_mimalloc

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Browsercore is written with [Zig](https://ziglang.org/) `0.12`. You have to
88
install it with the right version in order to build the project.
99

1010
Browsercore also depends on
11-
[js-runtimelib](https://github.com/francisbouvier/jsruntime-lib/),
11+
[js-runtimelib](https://github.com/francisbouvier/zig-js-runtime/),
1212
[Netsurf libs](https://www.netsurf-browser.org/) and
1313
[Mimalloc](https://microsoft.github.io/mimalloc) libs.
1414

@@ -57,22 +57,22 @@ Note, when Mimalloc is built in dev mode, you can dump memory stats with the
5757
env var `MIMALLOC_SHOW_STATS=1`. See
5858
https://microsoft.github.io/mimalloc/environment.html
5959

60-
### Build jsruntime-lib
60+
### Build zig-js-runtime
6161

62-
The command `make install-jsruntime-dev` uses jsruntime-lib's `zig-v8` dependency to build v8 engine lib.
62+
The command `make install-zig-js-runtime-dev` uses zig-js-runtime's `zig-v8` dependency to build v8 engine lib.
6363
Be aware the build task is very long and cpu consuming.
6464

6565
Build v8 engine for debug/dev version, it creates
66-
`vendor/jsruntime-lib/vendor/v8/$ARCH/debug/libc_v8.a` file.
66+
`vendor/zig-js-runtime/vendor/v8/$ARCH/debug/libc_v8.a` file.
6767

6868
```
69-
make install-jsruntime-dev
69+
make install-zig-js-runtime-dev
7070
```
7171

7272
You should also build a release vesion of v8 with:
7373

7474
```
75-
make install-jsruntime
75+
make install-zig-js-runtime
7676
```
7777

7878
### All in one build

build.zig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const std = @import("std");
2020

2121
const builtin = @import("builtin");
2222

23-
const jsruntime_path = "vendor/jsruntime-lib/";
24-
const jsruntime = @import("vendor/jsruntime-lib/build.zig");
23+
const jsruntime_path = "vendor/zig-js-runtime/";
24+
const jsruntime = @import("vendor/zig-js-runtime/build.zig");
2525
const jsruntime_pkgs = jsruntime.packages(jsruntime_path);
2626

2727
/// 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 {
106106

107107
// add jsruntime pretty deps
108108
const pretty = tests.step.owner.createModule(.{
109-
.source_file = .{ .path = "vendor/jsruntime-lib/src/pretty.zig" },
109+
.source_file = .{ .path = "vendor/zig-js-runtime/src/pretty.zig" },
110110
});
111111
tests.addModule("pretty", pretty);
112112

0 commit comments

Comments
 (0)