diff --git a/ql/Cargo.lock b/ql/Cargo.lock index 3b2fdb7c89a..e071c5e71b4 100644 Binary files a/ql/Cargo.lock and b/ql/Cargo.lock differ diff --git a/ql/extractor/Cargo.toml b/ql/extractor/Cargo.toml index cb2070417ac..bc300138f96 100644 --- a/ql/extractor/Cargo.toml +++ b/ql/extractor/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "codeql-ql-extractor" +name = "codeql-extractor-ql" version = "0.1.0" authors = ["GitHub"] edition = "2018" diff --git a/ql/scripts/create-extractor-pack.ps1 b/ql/scripts/create-extractor-pack.ps1 index d142b916446..5c2d9777d71 100644 --- a/ql/scripts/create-extractor-pack.ps1 +++ b/ql/scripts/create-extractor-pack.ps1 @@ -1,6 +1,6 @@ cargo build --release -cargo run --release --bin codeql-ql-extractor -- generate --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll +cargo run --release --bin codeql-extractor-ql -- generate --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,4 +10,4 @@ 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\codeql-ql-extractor.exe extractor-pack\tools\win64\extractor.exe +cp target\release\codeql-extractor-ql.exe extractor-pack\tools\win64\extractor.exe diff --git a/ql/scripts/create-extractor-pack.sh b/ql/scripts/create-extractor-pack.sh index 2fcf79c07b3..07a5b5da0be 100755 --- a/ql/scripts/create-extractor-pack.sh +++ b/ql/scripts/create-extractor-pack.sh @@ -20,11 +20,11 @@ else fi cargo build --release -cargo run --release --bin codeql-ql-extractor -- generate --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll +cargo run --release --bin codeql-extractor-ql -- generate --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/codeql-ql-extractor extractor-pack/tools/${platform}/extractor +cp target/release/codeql-extractor-ql extractor-pack/tools/${platform}/extractor