QL: Update scripts for merged extractor

hmac · hmac · commit c13999100b59 · 2023-04-07T15:49:17.000+08:00
diff --git 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 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
 
 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 -Recurse tools extractor-pack
 mkdir extractor-pack\tools\win64 | Out-Null
-cp target\release\extractor.exe extractor-pack\tools\win64\extractor.exe
-cp target\release\autobuilder.exe extractor-pack\tools\win64\autobuilder.exe
+cp target\release\codeql-ql-extractor.exe extractor-pack\tools\win64\extractor.exe
diff --git a/ql/scripts/create-extractor-pack.sh b/ql/scripts/create-extractor-pack.sh
@@ -20,12 +20,11 @@ else
 fi
 
 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
 
 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/extractor extractor-pack/tools/${platform}/extractor
-cp target/release/autobuilder extractor-pack/tools/${platform}/autobuilder
+cp target/release/codeql-ql-extractor extractor-pack/tools/${platform}/extractor
diff --git a/ql/tools/autobuild.cmd b/ql/tools/autobuild.cmd
@@ -1,5 +1,5 @@
 @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%
diff --git a/ql/tools/autobuild.sh b/ql/tools/autobuild.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/autobuilder"
+exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/extractor" autobuild
 
diff --git a/ql/tools/index-files.cmd b/ql/tools/index-files.cmd
@@ -1,6 +1,7 @@
 @echo off
 
 type NUL && "%CODEQL_EXTRACTOR_QL_ROOT%\tools\win64\extractor.exe" ^
+        extract ^
         --file-list "%1" ^
         --source-archive-dir "%CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR%" ^
         --output-dir "%CODEQL_EXTRACTOR_QL_TRAP_DIR%"
diff --git a/ql/tools/index-files.sh b/ql/tools/index-files.sh
@@ -3,6 +3,7 @@
 set -eu
 
 exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/extractor" \
+        extract \
         --file-list "$1" \
         --source-archive-dir "$CODEQL_EXTRACTOR_QL_SOURCE_ARCHIVE_DIR" \
         --output-dir "$CODEQL_EXTRACTOR_QL_TRAP_DIR"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/autobuilder"`
	`3`	`+exec "${CODEQL_EXTRACTOR_QL_ROOT}/tools/${CODEQL_PLATFORM}/extractor" autobuild`
`4`	`4`