Skip to content

Commit ee07e22

Browse files
committed
src,tools: initialize cppgc
nodejs/node#45704
1 parent a566c46 commit ee07e22

File tree

1 file changed

+98
-24
lines changed

1 file changed

+98
-24
lines changed

patches/node/build_add_gn_build_files.patch

Lines changed: 98 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2136,22 +2136,111 @@ index 0000000000000000000000000000000000000000..616dc0c61ed4ea1bf2fb9e4768ba2ec5
21362136
+ f.write(json.dumps(out, sort_keys=True, indent=2, separators=(',', ': ')))
21372137
+ f.write('\n')
21382138
diff --git a/tools/install.py b/tools/install.py
2139-
index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd4c536570 100755
2139+
index 11616e1bcac5308020eb68fdb811bfb86cb14dd5..845e6ce69d93983963a7a57117ecab3bd1a05e71 100755
21402140
--- a/tools/install.py
21412141
+++ b/tools/install.py
2142-
@@ -202,60 +202,74 @@ def files(action):
2143-
def headers(action):
2144-
def wanted_v8_headers(files_arg, dest):
2142+
@@ -199,105 +199,106 @@ def headers(action):
21452143
v8_headers = [
2144+
# The internal cppgc headers are depended on by the public
2145+
# ones, so they need to be included as well.
2146+
- 'deps/v8/include/cppgc/internal/api-constants.h',
2147+
- 'deps/v8/include/cppgc/internal/atomic-entry-flag.h',
2148+
- 'deps/v8/include/cppgc/internal/base-page-handle.h',
2149+
- 'deps/v8/include/cppgc/internal/caged-heap-local-data.h',
2150+
- 'deps/v8/include/cppgc/internal/caged-heap.h',
2151+
- 'deps/v8/include/cppgc/internal/compiler-specific.h',
2152+
- 'deps/v8/include/cppgc/internal/finalizer-trait.h',
2153+
- 'deps/v8/include/cppgc/internal/gc-info.h',
2154+
- 'deps/v8/include/cppgc/internal/logging.h',
2155+
- 'deps/v8/include/cppgc/internal/member-storage.h',
2156+
- 'deps/v8/include/cppgc/internal/name-trait.h',
2157+
- 'deps/v8/include/cppgc/internal/persistent-node.h',
2158+
- 'deps/v8/include/cppgc/internal/pointer-policies.h',
2159+
- 'deps/v8/include/cppgc/internal/write-barrier.h',
2160+
+ '../../v8/include/cppgc/internal/api-constants.h',
2161+
+ '../../v8/include/cppgc/internal/atomic-entry-flag.h',
2162+
+ '../../v8/include/cppgc/internal/base-page-handle.h',
2163+
+ '../../v8/include/cppgc/internal/caged-heap-local-data.h',
2164+
+ '../../v8/include/cppgc/internal/caged-heap.h',
2165+
+ '../../v8/include/cppgc/internal/compiler-specific.h',
2166+
+ '../../v8/include/cppgc/internal/finalizer-trait.h',
2167+
+ '../../v8/include/cppgc/internal/gc-info.h',
2168+
+ '../../v8/include/cppgc/internal/logging.h',
2169+
+ '../../v8/include/cppgc/internal/member-storage.h',
2170+
+ '../../v8/include/cppgc/internal/name-trait.h',
2171+
+ '../../v8/include/cppgc/internal/persistent-node.h',
2172+
+ '../../v8/include/cppgc/internal/pointer-policies.h',
2173+
+ '../../v8/include/cppgc/internal/write-barrier.h',
2174+
# cppgc headers
2175+
- 'deps/v8/include/cppgc/allocation.h',
21462176
- 'deps/v8/include/cppgc/common.h',
2147-
- 'deps/v8/include/libplatform/libplatform.h',
2177+
- 'deps/v8/include/cppgc/cross-thread-persistent.h',
2178+
- 'deps/v8/include/cppgc/custom-space.h',
2179+
- 'deps/v8/include/cppgc/default-platform.h',
2180+
- 'deps/v8/include/cppgc/ephemeron-pair.h',
2181+
- 'deps/v8/include/cppgc/explicit-management.h',
2182+
- 'deps/v8/include/cppgc/garbage-collected.h',
2183+
- 'deps/v8/include/cppgc/heap-consistency.h',
2184+
- 'deps/v8/include/cppgc/heap-handle.h',
2185+
- 'deps/v8/include/cppgc/heap-state.h',
2186+
- 'deps/v8/include/cppgc/heap-statistics.h',
2187+
- 'deps/v8/include/cppgc/heap.h',
2188+
- 'deps/v8/include/cppgc/liveness-broker.h',
2189+
- 'deps/v8/include/cppgc/macros.h',
2190+
- 'deps/v8/include/cppgc/member.h',
2191+
- 'deps/v8/include/cppgc/name-provider.h',
2192+
- 'deps/v8/include/cppgc/object-size-trait.h',
2193+
- 'deps/v8/include/cppgc/persistent.h',
2194+
- 'deps/v8/include/cppgc/platform.h',
2195+
- 'deps/v8/include/cppgc/prefinalizer.h',
2196+
- 'deps/v8/include/cppgc/process-heap-statistics.h',
2197+
- 'deps/v8/include/cppgc/sentinel-pointer.h',
2198+
- 'deps/v8/include/cppgc/source-location.h',
2199+
- 'deps/v8/include/cppgc/testing.h',
2200+
- 'deps/v8/include/cppgc/trace-trait.h',
2201+
- 'deps/v8/include/cppgc/type-traits.h',
2202+
- 'deps/v8/include/cppgc/visitor.h',
2203+
+ '../../v8/include/cppgc/allocation.h',
2204+
+ '../../v8/include/cppgc/common.h',
2205+
+ '../../v8/include/cppgc/cross-thread-persistent.h',
2206+
+ '../../v8/include/cppgc/custom-space.h',
2207+
+ '../../v8/include/cppgc/default-platform.h',
2208+
+ '../../v8/include/cppgc/ephemeron-pair.h',
2209+
+ '../../v8/include/cppgc/explicit-management.h',
2210+
+ '../../v8/include/cppgc/garbage-collected.h',
2211+
+ '../../v8/include/cppgc/heap-consistency.h',
2212+
+ '../../v8/include/cppgc/heap-handle.h',
2213+
+ '../../v8/include/cppgc/heap-state.h',
2214+
+ '../../v8/include/cppgc/heap-statistics.h',
2215+
+ '../../v8/include/cppgc/heap.h',
2216+
+ '../../v8/include/cppgc/liveness-broker.h',
2217+
+ '../../v8/include/cppgc/macros.h',
2218+
+ '../../v8/include/cppgc/member.h',
2219+
+ '../../v8/include/cppgc/name-provider.h',
2220+
+ '../../v8/include/cppgc/object-size-trait.h',
2221+
+ '../../v8/include/cppgc/persistent.h',
2222+
+ '../../v8/include/cppgc/platform.h',
2223+
+ '../../v8/include/cppgc/prefinalizer.h',
2224+
+ '../../v8/include/cppgc/process-heap-statistics.h',
2225+
+ '../../v8/include/cppgc/sentinel-pointer.h',
2226+
+ '../../v8/include/cppgc/source-location.h',
2227+
+ '../../v8/include/cppgc/testing.h',
2228+
+ '../../v8/include/cppgc/trace-trait.h',
2229+
+ '../../v8/include/cppgc/type-traits.h',
2230+
+ '../../v8/include/cppgc/visitor.h',
2231+
# libplatform headers
21482232
- 'deps/v8/include/libplatform/libplatform-export.h',
2233+
- 'deps/v8/include/libplatform/libplatform.h',
21492234
- 'deps/v8/include/libplatform/v8-tracing.h',
2150-
- 'deps/v8/include/v8.h',
2235+
+ '../../v8/include/libplatform/libplatform-export.h',
2236+
+ '../../v8/include/libplatform/libplatform.h',
2237+
+ '../../v8/include/libplatform/v8-tracing.h',
2238+
# v8 headers
21512239
- 'deps/v8/include/v8-array-buffer.h',
21522240
- 'deps/v8/include/v8-callbacks.h',
21532241
- 'deps/v8/include/v8-container.h',
21542242
- 'deps/v8/include/v8-context.h',
2243+
- 'deps/v8/include/v8-cppgc.h',
21552244
- 'deps/v8/include/v8-data.h',
21562245
- 'deps/v8/include/v8-date.h',
21572246
- 'deps/v8/include/v8-debug.h',
@@ -2195,11 +2284,8 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd
21952284
- 'deps/v8/include/v8-version.h',
21962285
- 'deps/v8/include/v8-wasm.h',
21972286
- 'deps/v8/include/v8-weak-callback-info.h',
2287+
- 'deps/v8/include/v8.h',
21982288
- 'deps/v8/include/v8config.h',
2199-
+ '../../v8/include/cppgc/common.h',
2200-
+ '../../v8/include/libplatform/libplatform.h',
2201-
+ '../../v8/include/libplatform/libplatform-export.h',
2202-
+ '../../v8/include/libplatform/v8-tracing.h',
22032289
+ '../../v8/include/v8-array-buffer.h',
22042290
+ '../../v8/include/v8-callbacks.h',
22052291
+ '../../v8/include/v8-container.h',
@@ -2213,14 +2299,10 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd
22132299
+ '../../v8/include/v8-exception.h',
22142300
+ '../../v8/include/v8-extension.h',
22152301
+ '../../v8/include/v8-external.h',
2216-
+ '../../v8/include/v8-fast-api-calls.h',
22172302
+ '../../v8/include/v8-forward.h',
22182303
+ '../../v8/include/v8-function-callback.h',
22192304
+ '../../v8/include/v8-function.h',
2220-
+ '../../v8/include/v8-handle-base.h',
22212305
+ '../../v8/include/v8-initialization.h',
2222-
+ '../../v8/include/v8-inspector-protocol.h',
2223-
+ '../../v8/include/v8-inspector.h',
22242306
+ '../../v8/include/v8-internal.h',
22252307
+ '../../v8/include/v8-isolate.h',
22262308
+ '../../v8/include/v8-json.h',
@@ -2229,7 +2311,6 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd
22292311
+ '../../v8/include/v8-maybe.h',
22302312
+ '../../v8/include/v8-memory-span.h',
22312313
+ '../../v8/include/v8-message.h',
2232-
+ '../../v8/include/v8-metrics.h',
22332314
+ '../../v8/include/v8-microtask-queue.h',
22342315
+ '../../v8/include/v8-microtask.h',
22352316
+ '../../v8/include/v8-object.h',
@@ -2243,31 +2324,24 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd
22432324
+ '../../v8/include/v8-regexp.h',
22442325
+ '../../v8/include/v8-script.h',
22452326
+ '../../v8/include/v8-snapshot.h',
2246-
+ '../../v8/include/v8-source-location.h',
22472327
+ '../../v8/include/v8-statistics.h',
22482328
+ '../../v8/include/v8-template.h',
22492329
+ '../../v8/include/v8-traced-handle.h',
22502330
+ '../../v8/include/v8-typed-array.h',
2251-
+ '../../v8/include/v8-unwinder-state.h',
22522331
+ '../../v8/include/v8-unwinder.h',
2253-
+ '../../v8/include/v8-util.h',
2254-
+ '../../v8/include/v8-value-serializer-version.h',
22552332
+ '../../v8/include/v8-value-serializer.h',
22562333
+ '../../v8/include/v8-value.h',
2257-
+ '../../v8/include/v8-version-string.h',
22582334
+ '../../v8/include/v8-version.h',
2259-
+ '../../v8/include/v8-wasm-trap-handler-posix.h',
2260-
+ '../../v8/include/v8-wasm-trap-handler-win.h',
22612335
+ '../../v8/include/v8-wasm.h',
22622336
+ '../../v8/include/v8-weak-callback-info.h',
22632337
+ '../../v8/include/v8.h',
2264-
+ '../../v8/include/v8config.h'
2338+
+ '../../v8/include/v8config.h',
22652339
]
22662340
+ v8_headers = [h.replace('deps/', '../../') for h in v8_headers]
22672341
files_arg = [name for name in files_arg if name in v8_headers]
22682342
action(files_arg, dest)
22692343

2270-
@@ -282,7 +296,7 @@ def headers(action):
2344+
@@ -324,7 +325,7 @@ def headers(action):
22712345
if sys.platform.startswith('aix') or sys.platform == "os400":
22722346
action(['out/Release/node.exp'], 'include/node/')
22732347

0 commit comments

Comments
 (0)