Skip to content

Commit 7bb527b

Browse files
committed
Merge branch 'mr/cov' into 'master'
Add a Makefile "generate" target to create the sources See merge request eng/ide/gnatstudio!858
2 parents 4b62a53 + 5174f54 commit 7bb527b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ all default:
2424
$(MAKE) -C cli BUILD=$(BUILD) $@
2525
$(MAKE) -C testsuite BUILD=$(BUILD) $@
2626

27+
generate:
28+
$(MAKE) -C gnatstudio BUILD=$(BUILD) generate
29+
2730
codepeer:
2831
$(MAKE) -C gnatstudio scil
2932
codepeer -all -lib gps.library -quiet -baseline -level 1 \

gnatstudio/Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,19 @@ gps_and_cli: all
4343

4444
include ../Makefile.gnat
4545

46-
# NOTE: we need to build gnatcoll separately, since we cannot use
47-
# gnat.adc (No_Tasking restriction) on all gnatcoll sources.
48-
all: resources
46+
all: resources generate
47+
$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \
48+
$(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
49+
50+
# Generate some sources
51+
generate:
4952
cd ../kernel/src; ${PYTHON} hooks.py
5053
cd ../kernel/generated; gnatcoll_db2ada \
5154
-api=GPS.Kernel.Properties.Database -adacreate -dbtype sqlite\
5255
-dbmodel=../src/properties_schema.txt
5356
ifeq ($(OS),Windows_NT)
5457
for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
5558
endif
56-
$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \
57-
$(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
5859

5960
resources:
6061
ifeq ($(OS),Windows_NT)

0 commit comments

Comments
 (0)