QL: Update scripts for merged extractor

This commit is contained in:
Harry Maclean
2023-04-07 11:33:49 +08:00
parent eff4729577
commit c13999100b
6 changed files with 8 additions and 8 deletions

View File

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

View File

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

View File

@@ -1,5 +1,5 @@
@echo off @echo off
type NUL && "%CODEQL_EXTRACTOR_QL_ROOT%\tools\%CODEQL_PLATFORM%\autobuilder" type NUL && "%CODEQL_EXTRACTOR_QL_ROOT%\tools\%CODEQL_PLATFORM%\extractor" autobuild
exit /b %ERRORLEVEL% exit /b %ERRORLEVEL%

View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/autobuilder" exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/extractor" autobuild

View File

@@ -1,6 +1,7 @@
@echo off @echo off
type NUL && "%CODEQL_EXTRACTOR_QL_ROOT%\tools\win64\extractor.exe" ^ type NUL && "%CODEQL_EXTRACTOR_QL_ROOT%\tools\win64\extractor.exe" ^
extract ^
--file-list "%1" ^ --file-list "%1" ^
--source-archive-dir "%CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR%" ^ --source-archive-dir "%CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR%" ^
--output-dir "%CODEQL_EXTRACTOR_QL_TRAP_DIR%" --output-dir "%CODEQL_EXTRACTOR_QL_TRAP_DIR%"

View File

@@ -3,6 +3,7 @@
set -eu set -eu
exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/extractor" \ exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/extractor" \
extract \
--file-list "$1" \ --file-list "$1" \
--source-archive-dir "$CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR" \ --source-archive-dir "$CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR" \
--output-dir "$CODEQL_EXTRACTOR_QL_TRAP_DIR" --output-dir "$CODEQL_EXTRACTOR_QL_TRAP_DIR"