traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 'include!' error when building the CLI outside of the repo

Browse source
This commit is contained in:
Max Brunsfeld 2021-09-03 13:45:13 -07:00
parent 1eb4d8efe6
commit 23b28f6f36
2 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/build.rs
View file

@ -6,7 +6,7 @@ fn main() {
println!("cargo:rustc-env={}={}", "BUILD_SHA", git_sha);
}
if wasm_files_present() {
if web_playground_files_present() {
println!("cargo:rustc-cfg={}", "TREE_SITTER_EMBED_WASM_BINDING");
}
@ -23,8 +23,9 @@ fn main() {
);
}
fn wasm_files_present() -> bool {
fn web_playground_files_present() -> bool {
let paths = [
"../docs/assets/js/playground.js",
"../lib/binding_web/tree-sitter.js",
"../lib/binding_web/tree-sitter.wasm",
];

38
cli/src/web_ui.rs
View file

@ -9,28 +9,6 @@ use tiny_http::{Header, Response, Server};
use webbrowser;
macro_rules! resource {
($name: tt, $path: tt) => {
#[cfg(TREE_SITTER_EMBED_WASM_BINDING)]
fn $name(tree_sitter_dir: &Option<PathBuf>) -> Vec<u8> {
if let Some(tree_sitter_dir) = tree_sitter_dir {
fs::read(tree_sitter_dir.join($path)).unwrap()
} else {
include_bytes!(concat!("../../", $path)).to_vec()
}
}
#[cfg(not(TREE_SITTER_EMBED_WASM_BINDING))]
fn $name(tree_sitter_dir: &Option<PathBuf>) -> Vec<u8> {
if let Some(tree_sitter_dir) = tree_sitter_dir {
fs::read(tree_sitter_dir.join($path)).unwrap()
} else {
include_bytes!(concat!("../../", $path)).to_vec()
}
}
};
}
macro_rules! optional_resource {
($name: tt, $path: tt) => {
#[cfg(TREE_SITTER_EMBED_WASM_BINDING)]
fn $name(tree_sitter_dir: &Option<PathBuf>) -> Vec<u8> {
@ -54,8 +32,8 @@ macro_rules! optional_resource {
resource!(get_main_html, "cli/src/web_ui.html");
resource!(get_playground_js, "docs/assets/js/playground.js");
optional_resource!(get_lib_js, "lib/binding_web/tree-sitter.js");
optional_resource!(get_lib_wasm, "lib/binding_web/tree-sitter.wasm");
resource!(get_lib_js, "lib/binding_web/tree-sitter.js");
resource!(get_lib_wasm, "lib/binding_web/tree-sitter.wasm");
pub fn serve(grammar_path: &Path, open_in_browser: bool) {
let port = get_available_port().expect("Couldn't find an available port");
@ -96,17 +74,23 @@ pub fn serve(grammar_path: &Path, open_in_browser: bool) {
for request in server.incoming_requests() {
let res = match request.url() {
"/" => response(&main_html, &html_header),
"/playground.js" => response(&playground_js, &js_header),
"/tree-sitter-parser.wasm" => response(&language_wasm, &wasm_header),
"/playground.js" => {
if playground_js.is_empty() {
redirect("https://tree-sitter.github.io/tree-sitter/assets/js/playground.js")
} else {
response(&playground_js, &js_header)
}
}
"/tree-sitter.js" => {
if cfg!(windows) {
if lib_js.is_empty() {
redirect("https://tree-sitter.github.io/tree-sitter.js")
} else {
response(&lib_js, &js_header)
}
}
"/tree-sitter.wasm" => {
if cfg!(windows) {
if lib_wasm.is_empty() {
redirect("https://tree-sitter.github.io/tree-sitter.wasm")
} else {
response(&lib_wasm, &wasm_header)