Skip to content

Commit 0621d40

Browse files
committed
Introduce GNATformat as Ada sources formatter
Add a GNATformat check before building GNATcheck. Add a GNATformat run in the format Makefile recipe. Add GNATformat configuration in 'gnatcheck.gpr'.
1 parent 4f00d2b commit 0621d40

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ impacts:
4141
PYTHONPATH=$(IMPACTDB_DIR) ./utils/impact-db_impacts_gen.py $(IMPACTDB_DIR)
4242

4343
format:
44+
gnatformat -P lkql_checker/gnatcheck.gpr --no-subprojects
4445
$(MAVEN) -f lkql_jit spotless:apply
4546

4647
gnatcheck: lkql
48+
gnatformat -P lkql_checker/gnatcheck.gpr --no-subprojects --check
4749
gprbuild -P lkql_checker/gnatcheck.gpr -p $(GPR_ARGS) -XBUILD_MODE=$(BUILD_MODE)
4850

4951
build/bin/liblkqllang_parse: lkql/lkql.lkt
@@ -74,6 +76,7 @@ automated:
7476
rm -rf "$(PREFIX)"
7577
mkdir -p "$(PREFIX)/share" "$(PREFIX)/share/examples" "$(PREFIX)/lib"
7678
$(LKM) make -c lkql/langkit.yaml $(MANAGE_ARGS) $(ADDITIONAL_MANAGE_ARGS)
79+
gnatformat -P lkql_checker/gnatcheck.gpr --check --no-subprojects
7780
$(GPRBUILD) -Plkql_checker/gnatcheck.gpr -largs -s
7881
$(GPRINSTALL) --mode=usage -Plkql_checker/gnatcheck.gpr
7982
$(GPRINSTALL) --mode=usage -P$(LKQL_DIR)/mains.gpr
@@ -102,4 +105,3 @@ automated-cov:
102105
mkdir -p "$(PREFIX)/lib/lkql_checker"
103106
cp -p "$(BUILD_DIR)/lkql_checker/obj/$(BUILD_MODE)/"*.sid \
104107
"$(PREFIX)/lib/lkql_checker"
105-

lkql_checker/gnatcheck.gpr

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ with "liblkqllang";
33
with "gpr2";
44

55
project GNATcheck is
6-
76
type Build_Mode_Type is ("dev", "prod");
87
Build_Mode : Build_Mode_Type := external
98
("BUILD_MODE", external ("LKQL_CHECKER_BUILD_MODE", "dev"));
@@ -39,4 +38,9 @@ project GNATcheck is
3938
for Default_Switches ("Ada") use Switches;
4039
end Compiler;
4140

41+
package Format is
42+
for End_Of_Line ("Ada") use "lf";
43+
for Charset ("Ada") use "utf-8";
44+
for Width ("Ada") use "79";
45+
end Format;
4246
end GNATcheck;

0 commit comments

Comments
 (0)