Ruby: fix prefix in create-extractor-pack scripts

Author: hmac

.github/workflows/ruby-build.yml

@@ -116,21 +116,21 @@ jobs:
           key: ruby-build
       - name: Build Query Pack
         run: |
-          rm -rf target/packs
-          codeql pack create ../misc/suite-helpers --output target/packs
-          codeql pack create ../shared/regex --output target/packs
-          codeql pack create ../shared/ssa --output target/packs
-          codeql pack create ../shared/tutorial --output target/packs
-          codeql pack create ql/lib --output target/packs
-          codeql pack create -j0 ql/src --output target/packs --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
-          PACK_FOLDER=$(readlink -f target/packs/codeql/ruby-queries/*)
+          rm -rf query-packs
+          codeql pack create ../misc/suite-helpers --output query-packs
+          codeql pack create ../shared/regex --output query-packs
+          codeql pack create ../shared/ssa --output query-packs
+          codeql pack create ../shared/tutorial --output query-packs
+          codeql pack create ql/lib --output query-packs
+          codeql pack create -j0 ql/src --output query-packs --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
+          PACK_FOLDER=$(readlink -f query-packs/codeql/ruby-queries/*)
           codeql generate query-help --format=sarifv2.1.0 --output="${PACK_FOLDER}/rules.sarif" ql/src
           (cd ql/src; find queries \( -name '*.qhelp' -o -name '*.rb' -o -name '*.erb' \) -exec bash -c 'mkdir -p "'"${PACK_FOLDER}"'/$(dirname "{}")"' \; -exec cp "{}" "${PACK_FOLDER}/{}" \;)
       - uses: actions/upload-artifact@v3
         with:
           name: codeql-ruby-queries
           path: |
-            ruby/extractor/target/packs/*
+            ruby/query-packs/*
           retention-days: 1
 
   package:

ruby/scripts/create-extractor-pack.ps1

@@ -1,8 +1,9 @@
 cd extractor
 cargo build --release
-cargo run --release --bin generator -- --dbscheme ../ql/lib/ruby.dbscheme --library ../ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
 cd ..
 
+extractor\target\release\generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
+
 codeql query format -i ql\lib\codeql/ruby\ast\internal\TreeSitter.qll
 
 rm -Recurse -Force extractor-pack
@@ -11,5 +12,5 @@ cp codeql-extractor.yml, ql\lib\ruby.dbscheme, ql\lib\ruby.dbscheme.stats extrac
 cp -Recurse tools extractor-pack
 cp -Recurse downgrades extractor-pack
 mkdir extractor-pack\tools\win64 | Out-Null
-cp extractor\target\release\ruby-extractor.exe extractor-pack\tools\win64\extractor.exe
-cp extractor\target\release\ruby-autobuilder.exe extractor-pack\tools\win64\autobuilder.exe
+cp extractor\target\release\extractor.exe extractor-pack\tools\win64\extractor.exe
+cp extractor\target\release\autobuilder.exe extractor-pack\tools\win64\autobuilder.exe

ruby/scripts/create-extractor-pack.sh

@@ -13,16 +13,14 @@ else
   exit 1
 fi
 
-pushd extractor
-"$CARGO" build --release
-"$CARGO" run --release --bin generator -- --dbscheme ../ql/lib/ruby.dbscheme --library ../ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
-popd
+(cd extractor && "$CARGO" build --release)
+extractor/target/release/generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
 
 codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
 
 rm -rf extractor-pack
 mkdir -p extractor-pack
 cp -r codeql-extractor.yml downgrades tools ql/lib/ruby.dbscheme ql/lib/ruby.dbscheme.stats extractor-pack/
 mkdir -p extractor-pack/tools/${platform}
-cp extractor/target/release/ruby-extractor extractor-pack/tools/${platform}/extractor
-cp extractor/target/release/ruby-autobuilder extractor-pack/tools/${platform}/autobuilder
+cp extractor/target/release/extractor extractor-pack/tools/${platform}/extractor
+cp extractor/target/release/autobuilder extractor-pack/tools/${platform}/autobuilder