Skip to content

Commit 8c60b6e

Browse files
hmachmac
committed
QL: Merge extractor crates into one
This mirrors the structure we have in the Ruby extractor, and will allow us to share more code.
1 parent 6171eae commit 8c60b6e

File tree

9 files changed

+6
-55
lines changed

9 files changed

+6
-55
lines changed

‎ql/Cargo.lock‎

Lines changed: 0 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ql/Cargo.toml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[workspace]
22
members = [
3-
"autobuilder",
43
"extractor",
5-
"generator",
64
"buramu",
75
]

‎ql/autobuilder/Cargo.toml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎ql/autobuilder/src/main.rs‎ renamed to ‎ql/extractor/src/bin/autobuilder.rs‎

File renamed without changes.

‎ql/extractor/src/main.rs‎ renamed to ‎ql/extractor/src/bin/extractor.rs‎

File renamed without changes.

‎ql/generator/src/main.rs‎ renamed to ‎ql/extractor/src/bin/generator.rs‎

File renamed without changes.

‎ql/generator/Cargo.toml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ql/scripts/create-extractor-pack.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cargo build --release
22

3-
cargo run --release -p ql-generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
3+
cargo run --release --bin generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
44
codeql query format -i ql\src\codeql_ql\ast\internal\TreeSitter.qll
55

66
if (Test-Path -Path extractor-pack) {
@@ -10,5 +10,5 @@ mkdir extractor-pack | Out-Null
1010
cp codeql-extractor.yml, ql\src\ql.dbscheme, ql\src\ql.dbscheme.stats extractor-pack
1111
cp -Recurse tools extractor-pack
1212
mkdir extractor-pack\tools\win64 | Out-Null
13-
cp target\release\ql-extractor.exe extractor-pack\tools\win64\extractor.exe
14-
cp target\release\ql-autobuilder.exe extractor-pack\tools\win64\autobuilder.exe
13+
cp target\release\extractor.exe extractor-pack\tools\win64\extractor.exe
14+
cp target\release\autobuilder.exe extractor-pack\tools\win64\autobuilder.exe

‎ql/scripts/create-extractor-pack.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ else
2020
fi
2121

2222
cargo build --release
23-
24-
cargo run --release -p ql-generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
23+
cargo run --release --bin generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
2524
$CODEQL_BINARY query format -i ql/src/codeql_ql/ast/internal/TreeSitter.qll
2625

2726
rm -rf extractor-pack
2827
mkdir -p extractor-pack
2928
cp -r codeql-extractor.yml tools ql/src/ql.dbscheme ql/src/ql.dbscheme.stats extractor-pack/
3029
mkdir -p extractor-pack/tools/${platform}
31-
cp target/release/ql-extractor extractor-pack/tools/${platform}/extractor
32-
cp target/release/ql-autobuilder extractor-pack/tools/${platform}/autobuilder
30+
cp target/release/extractor extractor-pack/tools/${platform}/extractor
31+
cp target/release/autobuilder extractor-pack/tools/${platform}/autobuilder

0 commit comments

Comments
 (0)