Skip to content

Commit 7b68b41

Browse files
asarhaddonTurboGit
authored andcommitted
Let projects depend on specific xmlada_* instead of legacy xmlada.
The xmlada project gathers all xmlada_* library projects. Building templates_parser with more specific dependencies avoids an unneeded dependency on xmlada_schema.
1 parent ff1c0aa commit 7b68b41

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ENABLE_STATIC = true
3434
ENABLE_SHARED := $(shell $(GNAT) make -c -q -p -XTARGET=$(TARGET) \
3535
-Pconfig/setup/test_shared 2>/dev/null && echo "true")
3636

37-
ifeq ($(shell gnat ls -Pxmlada 2>&1 | grep 'project file .* not found'),)
37+
ifeq ($(shell gnat ls -Pxmlada_dom 2>&1 | grep 'project file .* not found'),)
3838
TP_XMLADA := Installed
3939
else
4040
TP_XMLADA := Disabled

config/tp_xmlada_installed.gpr

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
-- to http://www.gnu.org/licenses for a complete copy of the license. --
1717
------------------------------------------------------------------------------
1818

19-
with "xmlada";
19+
with "xmlada_unicode";
20+
with "xmlada_input";
21+
with "xmlada_sax";
22+
with "xmlada_dom";
2023

2124
abstract project TP_XMLAda is
2225
for Source_Dirs use ();

regtests/tests/0107_translations_demo/translations_demo.gpr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
------------------------------------------------------------------------------
1818

1919
with "templates_parser";
20-
with "xmlada";
2120

2221
project translations_demo is
2322

regtests/tests/0109_check_mem/check_mem.gpr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
------------------------------------------------------------------------------
1818

1919
with "templates_parser";
20-
with "xmlada";
2120

2221
project check_mem is
2322

0 commit comments

Comments
 (0)