@@ -2136,22 +2136,111 @@ index 0000000000000000000000000000000000000000..616dc0c61ed4ea1bf2fb9e4768ba2ec5
2136
2136
+ f.write(json.dumps(out, sort_keys=True, indent=2, separators=(',', ': ')))
2137
2137
+ f.write('\n')
2138
2138
diff --git a/tools/install.py b/tools/install.py
2139
- indexf13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd4c536570 100755
2139
+ index11616e1bcac5308020eb68fdb811bfb86cb14dd5..845e6ce69d93983963a7a57117ecab3bd1a05e71 100755
2140
2140
--- a/tools/install.py
2141
2141
+++ 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):
2145
2143
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',
2146
2176
- '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
2148
2232
- 'deps/v8/include/libplatform/libplatform-export.h',
2233
+ - 'deps/v8/include/libplatform/libplatform.h',
2149
2234
- '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
2151
2239
- 'deps/v8/include/v8-array-buffer.h',
2152
2240
- 'deps/v8/include/v8-callbacks.h',
2153
2241
- 'deps/v8/include/v8-container.h',
2154
2242
- 'deps/v8/include/v8-context.h',
2243
+ - 'deps/v8/include/v8-cppgc.h',
2155
2244
- 'deps/v8/include/v8-data.h',
2156
2245
- 'deps/v8/include/v8-date.h',
2157
2246
- 'deps/v8/include/v8-debug.h',
@@ -2195,11 +2284,8 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd
2195
2284
- 'deps/v8/include/v8-version.h',
2196
2285
- 'deps/v8/include/v8-wasm.h',
2197
2286
- 'deps/v8/include/v8-weak-callback-info.h',
2287
+ - 'deps/v8/include/v8.h',
2198
2288
- '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',
2203
2289
+ '../../v8/include/v8-array-buffer.h',
2204
2290
+ '../../v8/include/v8-callbacks.h',
2205
2291
+ '../../v8/include/v8-container.h',
@@ -2213,14 +2299,10 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd
2213
2299
+ '../../v8/include/v8-exception.h',
2214
2300
+ '../../v8/include/v8-extension.h',
2215
2301
+ '../../v8/include/v8-external.h',
2216
- + '../../v8/include/v8-fast-api-calls.h',
2217
2302
+ '../../v8/include/v8-forward.h',
2218
2303
+ '../../v8/include/v8-function-callback.h',
2219
2304
+ '../../v8/include/v8-function.h',
2220
- + '../../v8/include/v8-handle-base.h',
2221
2305
+ '../../v8/include/v8-initialization.h',
2222
- + '../../v8/include/v8-inspector-protocol.h',
2223
- + '../../v8/include/v8-inspector.h',
2224
2306
+ '../../v8/include/v8-internal.h',
2225
2307
+ '../../v8/include/v8-isolate.h',
2226
2308
+ '../../v8/include/v8-json.h',
@@ -2229,7 +2311,6 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd
2229
2311
+ '../../v8/include/v8-maybe.h',
2230
2312
+ '../../v8/include/v8-memory-span.h',
2231
2313
+ '../../v8/include/v8-message.h',
2232
- + '../../v8/include/v8-metrics.h',
2233
2314
+ '../../v8/include/v8-microtask-queue.h',
2234
2315
+ '../../v8/include/v8-microtask.h',
2235
2316
+ '../../v8/include/v8-object.h',
@@ -2243,31 +2324,24 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd
2243
2324
+ '../../v8/include/v8-regexp.h',
2244
2325
+ '../../v8/include/v8-script.h',
2245
2326
+ '../../v8/include/v8-snapshot.h',
2246
- + '../../v8/include/v8-source-location.h',
2247
2327
+ '../../v8/include/v8-statistics.h',
2248
2328
+ '../../v8/include/v8-template.h',
2249
2329
+ '../../v8/include/v8-traced-handle.h',
2250
2330
+ '../../v8/include/v8-typed-array.h',
2251
- + '../../v8/include/v8-unwinder-state.h',
2252
2331
+ '../../v8/include/v8-unwinder.h',
2253
- + '../../v8/include/v8-util.h',
2254
- + '../../v8/include/v8-value-serializer-version.h',
2255
2332
+ '../../v8/include/v8-value-serializer.h',
2256
2333
+ '../../v8/include/v8-value.h',
2257
- + '../../v8/include/v8-version-string.h',
2258
2334
+ '../../v8/include/v8-version.h',
2259
- + '../../v8/include/v8-wasm-trap-handler-posix.h',
2260
- + '../../v8/include/v8-wasm-trap-handler-win.h',
2261
2335
+ '../../v8/include/v8-wasm.h',
2262
2336
+ '../../v8/include/v8-weak-callback-info.h',
2263
2337
+ '../../v8/include/v8.h',
2264
- + '../../v8/include/v8config.h'
2338
+ + '../../v8/include/v8config.h',
2265
2339
]
2266
2340
+ v8_headers = [h.replace('deps/', '../../') for h in v8_headers]
2267
2341
files_arg = [name for name in files_arg if name in v8_headers]
2268
2342
action(files_arg, dest)
2269
2343
2270
- @@ -282 ,7 +296 ,7 @@ def headers(action):
2344
+ @@ -324 ,7 +325 ,7 @@ def headers(action):
2271
2345
if sys.platform.startswith('aix') or sys.platform == "os400":
2272
2346
action(['out/Release/node.exp'], 'include/node/')
2273
2347