diff options
| author | Colin Ihrig <cjihrig@gmail.com> | 2022-10-06 23:51:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-07 09:21:43 +0530 |
| commit | c27234888f3d93aee842e8b30912512867071cb9 (patch) | |
| tree | 92581450e566382045db97372ec2ac3dd7d83a05 | |
| parent | 5a1ea586b4d99a8e3028d51899b921acca484648 (diff) | |
fix(napi): move napi symbols file (#16179)
The current location was causing failures during v1.26.1 publication.
<!--
Before submitting a PR, please read http://deno.land/manual/contributing
1. Give the PR a descriptive title.
Examples of good title:
- fix(std/http): Fix race condition in server
- docs(console): Update docstrings
- feat(doc): Handle nested reexports
Examples of bad title:
- fix #7123
- update docs
- fix bugs
2. Ensure there is a related issue and it is referenced in the PR text.
3. Ensure there are tests that cover the changes.
4. Ensure `cargo test` passes.
5. Ensure `./tools/format.js` passes without changing files.
6. Ensure `./tools/lint.js` passes.
-->
| -rw-r--r-- | cli/build.rs | 6 | ||||
| -rw-r--r-- | cli/napi_sym/lib.rs | 3 | ||||
| -rw-r--r-- | cli/napi_sym/symbol_exports.json (renamed from tools/napi/symbol_exports.json) | 0 | ||||
| -rw-r--r-- | ext/napi/README.md | 0 | ||||
| -rwxr-xr-x | tools/napi/generate_link_win.js | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/cli/build.rs b/cli/build.rs index c1bc3305e..77c95fb17 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -351,11 +351,11 @@ fn main() { symbols: Vec<String>, } let symbols_json = - std::fs::read_to_string("../tools/napi/symbol_exports.json").expect( - "Missing tools/napi/symbol_exports.json! This is a bug in napi_sym", + std::fs::read_to_string("./napi_sym/symbol_exports.json").expect( + "Missing ./napi_sym/symbol_exports.json! This is a bug in napi_sym", ); let symbols: Symbols = serde_json::from_str(&symbols_json) - .expect("tools/napi/symbol_exports.json is not valid JSON"); + .expect("./napi_sym/symbol_exports.json is not valid JSON"); // Don't export all symbols into the dynamic symbol table. -rdynamic exports *all* symbols introducing binary bloat. // We only need to export Node API symbols. diff --git a/cli/napi_sym/lib.rs b/cli/napi_sym/lib.rs index 769dddba9..2805c9957 100644 --- a/cli/napi_sym/lib.rs +++ b/cli/napi_sym/lib.rs @@ -4,8 +4,7 @@ use proc_macro::TokenStream; use quote::quote; use serde::Deserialize; -static NAPI_EXPORTS: &str = - include_str!("../../tools/napi/symbol_exports.json"); +static NAPI_EXPORTS: &str = include_str!("./symbol_exports.json"); #[derive(Deserialize)] struct SymbolExports { diff --git a/tools/napi/symbol_exports.json b/cli/napi_sym/symbol_exports.json index ba1bba67a..ba1bba67a 100644 --- a/tools/napi/symbol_exports.json +++ b/cli/napi_sym/symbol_exports.json diff --git a/ext/napi/README.md b/ext/napi/README.md new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/ext/napi/README.md diff --git a/tools/napi/generate_link_win.js b/tools/napi/generate_link_win.js index a0bda6a42..7d16f81c3 100755 --- a/tools/napi/generate_link_win.js +++ b/tools/napi/generate_link_win.js @@ -1,7 +1,9 @@ #!/usr/bin/env -S deno run --unstable --allow-read --allow-write // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license. -import exports from "./symbol_exports.json" assert { type: "json" }; +import exports from "../../cli/napi_sym/symbol_exports.json" assert { + type: "json", +}; let def = "LIBRARY\nEXPORTS\n"; for (const symbol of exports.symbols) { |
