Skip to content

Commit b66640f

Browse files
committed
Merge branch 'topic/84' into 'master'
kp.json: generate file at build time Closes #84 See merge request eng/libadalang/langkit-query-language!513
2 parents 1332076 + f99d92f commit b66640f

File tree

4 files changed

+14
-123
lines changed

4 files changed

+14
-123
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,8 @@ asis/
5858
user_manual/build/
5959
lkql_checker/doc/build/
6060

61+
# Generated files
62+
lkql_checker/share/lkql/kp/kp.json
63+
6164
*.stdout
6265
*.stderr

Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ NPM_INSTALL_CACHE=true
1414
NPMRC=
1515
BUILD_DIR=/undefined
1616
LKQL_DIR=$(BUILD_DIR)/lkql
17-
IMPACTDB_DIR=/undefined
17+
# Default impact-db directory as set in an ancr devenv
18+
IMPACTDB_DIR=$(PWD)/../impact-db
1819
GPRBUILD=gprbuild -j$(PROCS) -p -XBUILD_MODE=$(BUILD_MODE)
1920
GPRINSTALL=gprinstall --prefix=$(PREFIX) -p -XBUILD_MODE=$(BUILD_MODE)
2021
BUILD_FOR_JIT=false
2122
LKM=$(PYTHON) -m langkit.scripts.lkm
23+
KP_JSON=lkql_checker/share/lkql/kp/kp.json
2224

2325
ifeq ($(BUILD_FOR_JIT),true)
2426
MANAGE_ARGS=--build-dir=$(LKQL_DIR) --build-mode=$(BUILD_MODE) \
@@ -41,13 +43,13 @@ doc:
4143
cd lkql_checker/doc && make generate html-all
4244

4345
impacts:
44-
PYTHONPATH=$(IMPACTDB_DIR) ./utils/impact-db_impacts_gen.py $(IMPACTDB_DIR)
46+
[ -f $(KP_JSON) ] || PYTHONPATH=$(IMPACTDB_DIR) ./utils/impact-db_impacts_gen.py $(IMPACTDB_DIR)
4547

4648
format:
4749
gnatformat -P lkql_checker/gnatcheck.gpr --no-subprojects
4850
$(MAVEN) -f lkql_jit spotless:apply $(MAVEN_ARGS)
4951

50-
gnatcheck: lkql
52+
gnatcheck: lkql impacts
5153
gprbuild -P lkql_checker/gnatcheck.gpr -p $(GPR_ARGS) -XBUILD_MODE=$(BUILD_MODE)
5254

5355
build/bin/liblkqllang_parse: lkql/lkql.lkt
@@ -61,14 +63,18 @@ build/bin/liblkqllang_parse: lkql/lkql.lkt
6163
test:
6264
testsuite/testsuite.py -Edtmp
6365

64-
clean: clean_lkql clean_lkql_jit
66+
clean: clean_lkql clean_lkql_jit clean_lkql_checker
6567

6668
clean_lkql:
6769
rm lkql/build -rf
6870

6971
clean_lkql_jit:
7072
cd lkql_jit && $(MAVEN) clean
7173

74+
clean_lkql_checker:
75+
cd lkql_checker && gprclean
76+
[ -f $(KP_JSON) ] && rm $(KP_JSON)
77+
7278
build_lkql_jit: lkql
7379
$(MAVEN) -f lkql/build/java/ install
7480
$(MAVEN) -f lkql_jit/ clean install $(MAVEN_ARGS)

lkql_checker/share/lkql/kp/kp.json

Lines changed: 0 additions & 119 deletions
This file was deleted.

lkql_checker/src/rules_factory.adb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ package body Rules_Factory is
134134
begin
135135
for Rules_Dir of Rules_Dirs loop
136136
declare
137+
-- This file is automatically generated from the impactdb database
137138
JSON_Filename : constant Virtual_File := Rules_Dir / "kp.json";
138139
File_Content : GNAT.Strings.String_Access;
139140
Result : JSON_Value;

0 commit comments

Comments
 (0)