hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

QL: Merge extractor crates into one

Browse Source 
This mirrors the structure we have in the Ruby extractor, and will allow
us to share more code.
This commit is contained in:
Harry Maclean
2023-03-16 15:35:00 +13:00
parent 6171eae7a2
commit 8c60b6e657
9 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ql/Cargo.lock generated
View File

Binary file not shown.

2
ql/Cargo.toml
View File

@@ -1,7 +1,5 @@
[workspace]
members = [
"autobuilder",
"extractor",
"generator",
"buramu",
]

9
ql/autobuilder/Cargo.toml
View File

@@ -1,9 +0,0 @@
[package]
name = "ql-autobuilder"
version = "0.1.0"
authors = ["GitHub"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]

0
ql/autobuilder/src/main.rs → ql/extractor/src/bin/autobuilder.rs
View File

0
ql/extractor/src/main.rs → ql/extractor/src/bin/extractor.rs
View File

0
ql/generator/src/main.rs → ql/extractor/src/bin/generator.rs
View File

18
ql/generator/Cargo.toml
View File

@@ -1,18 +0,0 @@
[package]
name = "ql-generator"
version = "0.1.0"
authors = ["GitHub"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
clap = "2.33"
tracing = "0.1"
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql.git", rev = "d08db734f8dc52f6bc04db53a966603122bc6985"}
tree-sitter-ql-dbscheme = { git = "https://github.com/erik-krogh/tree-sitter-ql-dbscheme.git", rev = "63e1344353f63931e88bfbc2faa2e78e1421b213"}
tree-sitter-ql-yaml = {git = "https://github.com/erik-krogh/tree-sitter-ql.git", rev = "cf704bf3671e1ae148e173464fb65a4d2bbf5f99"}
tree-sitter-blame = {path = "../buramu/tree-sitter-blame"}
tree-sitter-json = { git = "https://github.com/tausbn/tree-sitter-json.git", rev = "745663ee997f1576fe1e7187e6347e0db36ec7a9"}
codeql-extractor = { path = "../../shared/extractor" }

6
ql/scripts/create-extractor-pack.ps1
View File

@@ -1,6 +1,6 @@
cargo build --release
cargo run --release -p ql-generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
cargo run --release --bin generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
codeql query format -i ql\src\codeql_ql\ast\internal\TreeSitter.qll
if (Test-Path -Path extractor-pack) {
@@ -10,5 +10,5 @@ mkdir extractor-pack | Out-Null
cp codeql-extractor.yml, ql\src\ql.dbscheme, ql\src\ql.dbscheme.stats extractor-pack
cp -Recurse tools extractor-pack
mkdir extractor-pack\tools\win64 | Out-Null
cp target\release\ql-extractor.exe extractor-pack\tools\win64\extractor.exe
cp target\release\ql-autobuilder.exe extractor-pack\tools\win64\autobuilder.exe
cp target\release\extractor.exe extractor-pack\tools\win64\extractor.exe
cp target\release\autobuilder.exe extractor-pack\tools\win64\autobuilder.exe

7
ql/scripts/create-extractor-pack.sh
View File

@@ -20,13 +20,12 @@ else
fi
cargo build --release
cargo run --release -p ql-generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
cargo run --release --bin generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
$CODEQL_BINARY query format -i ql/src/codeql_ql/ast/internal/TreeSitter.qll
rm -rf extractor-pack
mkdir -p extractor-pack
cp -r codeql-extractor.yml tools ql/src/ql.dbscheme ql/src/ql.dbscheme.stats extractor-pack/
mkdir -p extractor-pack/tools/${platform}
cp target/release/ql-extractor extractor-pack/tools/${platform}/extractor
cp target/release/ql-autobuilder extractor-pack/tools/${platform}/autobuilder
cp target/release/extractor extractor-pack/tools/${platform}/extractor
cp target/release/autobuilder extractor-pack/tools/${platform}/autobuilder