Skip to content

Commit 379b7a1

Browse files
committed
Prebuild v3.0.0-rc1 / all platforms / N-API 7
1 parent 0525091 commit 379b7a1

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

.github/workflows/prebuild.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
fail-fast: false
5252
matrix:
5353
node: [21]
54-
canvas_tag: ["v3.0.0"] # e.g. "v2.6.1"
54+
canvas_tag: ["v3.0.0-rc1"] # e.g. "v2.6.1"
5555
name: ${{ matrix.canvas_tag }}, Node.js ${{ matrix.node }}, Linux
5656
runs-on: ubuntu-latest
5757
container:
@@ -144,7 +144,7 @@ jobs:
144144
fail-fast: false
145145
matrix:
146146
node: [21]
147-
canvas_tag: ["v3.0.0"] # e.g. "v2.6.1"
147+
canvas_tag: ["v3.0.0-rc1"] # e.g. "v2.6.1"
148148
name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, macOS
149149
runs-on: macos-latest
150150
env:
@@ -217,7 +217,7 @@ jobs:
217217
fail-fast: false
218218
matrix:
219219
node: [21]
220-
canvas_tag: ["v3.0.0"] # e.g. "v2.6.1"
220+
canvas_tag: ["v3.0.0-rc1"] # e.g. "v2.6.1"
221221
name: ${{ matrix.canvas_tag}}, Node.js ${{ matrix.node }}, Windows
222222
runs-on: windows-2019
223223
env:

prebuild/Linux/binding.gyp

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
'defines': [
2424
'HAVE_GIF',
2525
'HAVE_JPEG',
26-
'HAVE_RSVG'
26+
'HAVE_RSVG',
27+
'NAPI_DISABLE_CPP_EXCEPTIONS',
28+
'NODE_ADDON_API_ENABLE_MAYBE'
2729
],
2830
'libraries': [
2931
'<!@(pkg-config pixman-1 --libs)',
@@ -36,7 +38,7 @@
3638
'-lgif'
3739
],
3840
'include_dirs': [
39-
'<!(node -e "require(\'nan\')")',
41+
'<!(node -p "require(\'node-addon-api\').include_dir")',
4042
'<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)',
4143
'<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
4244
'<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)',

prebuild/Windows/binding.gyp

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
'HAVE_RSVG',
2727
'HAVE_BOOLEAN', # or jmorecfg.h tries to define it
2828
'_USE_MATH_DEFINES', # for M_PI
29-
'NOMINMAX' # allow std::min/max to work
29+
'NOMINMAX', # allow std::min/max to work
30+
'NAPI_DISABLE_CPP_EXCEPTIONS',
31+
'NODE_ADDON_API_ENABLE_MAYBE'
3032
],
3133
'libraries': [
3234
'D:/a/_temp/msys64/ucrt64/lib/libcairo-2.lib',
@@ -42,7 +44,7 @@
4244
'D:/a/_temp/msys64/ucrt64/lib/librsvg-2-2.lib'
4345
],
4446
'include_dirs': [
45-
'<!(node -e "require(\'nan\')")',
47+
'<!(node -p "require(\'node-addon-api\').include_dir")',
4648
'D:/a/_temp/msys64/ucrt64/include',
4749
'D:/a/_temp/msys64/ucrt64/include/harfbuzz',
4850
'D:/a/_temp/msys64/ucrt64/include/pango-1.0',

prebuild/macOS/binding.gyp

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
'defines': [
2424
'HAVE_GIF',
2525
'HAVE_JPEG',
26-
'HAVE_RSVG'
26+
'HAVE_RSVG',
27+
'NAPI_DISABLE_CPP_EXCEPTIONS',
28+
'NODE_ADDON_API_ENABLE_MAYBE'
2729
],
2830
'libraries': [
2931
'<!@(pkg-config pixman-1 --libs)',
@@ -36,14 +38,16 @@
3638
'-lgif'
3739
],
3840
'include_dirs': [
39-
'<!(node -e "require(\'nan\')")',
41+
'<!(node -p "require(\'node-addon-api\').include_dir")',
4042
'<!@(pkg-config cairo --cflags-only-I | sed s/-I//g)',
4143
'<!@(pkg-config libpng --cflags-only-I | sed s/-I//g)',
4244
'<!@(pkg-config pangocairo --cflags-only-I | sed s/-I//g)',
4345
'<!@(pkg-config freetype2 --cflags-only-I | sed s/-I//g)',
4446
'<!@(pkg-config librsvg-2.0 --cflags-only-I | sed s/-I//g)'
4547
],
48+
'cflags+': ['-fvisibility=hidden'],
4649
'xcode_settings': {
50+
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', # -fvisibility=hidden
4751
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
4852
}
4953
}

0 commit comments

Comments
 (0)