Skip to content

Commit 36d8974

Browse files
committed
Python: Fix dbscheme/AST autogeneration
There was an errant `ql` in the relevant paths, a leftover from the move from the internal repo. Also, we can no longer rely on an intree version of the CodeQL CLI, so from now on we'll just assume it's present in the path. (On Codespaces, `gh codeql` is a decent replacement, especially if using the `install-stub` functionality.
1 parent 2af0d78 commit 36d8974

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

python/extractor/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ $(TOKENIZER_FILE): $(TOKENIZER_DEPS)
2121

2222
MASTER_FILE = semmle/python/master.py
2323

24-
DBSCHEME_FILE = $(GIT_ROOT)/ql/python/ql/lib/semmlecode.python.dbscheme
24+
DBSCHEME_FILE = $(GIT_ROOT)/python/ql/lib/semmlecode.python.dbscheme
2525

2626
.PHONY: dbscheme
2727
dbscheme: $(MASTER_FILE)
2828
python3 -m semmle.dbscheme_gen $(DBSCHEME_FILE)
2929

30-
AST_GENERATED_DIR = $(GIT_ROOT)/ql/python/ql/lib/semmle/python/
30+
AST_GENERATED_DIR = $(GIT_ROOT)/python/ql/lib/semmle/python/
3131
AST_GENERATED_FILE = $(AST_GENERATED_DIR)AstGenerated.qll
3232

3333
.PHONY: ast
3434
ast: $(MASTER_FILE)
3535
python3 -m semmle.query_gen $(AST_GENERATED_DIR)
36-
$(GIT_ROOT)/target/intree/codeql/codeql query format --in-place $(AST_GENERATED_FILE)
36+
codeql query format --in-place $(AST_GENERATED_FILE)
3737

3838
################################################################################
3939
# Tests

0 commit comments

Comments
 (0)