Skip to content

Commit 301ed77

Browse files
TurboGitTurboGit
committed
Setup LaL which replaces ASIS.
All ASIS setup have been replaced by LibAdaLang which will be the new library used for generating WSDL out of Ada specs. Part of S415-009.
1 parent 509796d commit 301ed77

File tree

60 files changed

+95
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+95
-95
lines changed

‎Makefile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
############################################################################
22
# Ada Web Server #
33
# #
4-
# Copyright (C) 2003-2017, AdaCore #
4+
# Copyright (C) 2003-2020, AdaCore #
55
# #
66
# This is free software; you can redistribute it and/or modify it #
77
# under terms of the GNU General Public License as published by the #
@@ -56,7 +56,7 @@ endif
5656
all: build
5757

5858
ALL_OPTIONS = $(MAKE_OPT) SOCKET="$(SOCKET)" XMLADA="$(XMLADA)" \
59-
ASIS="$(ASIS)" EXEEXT="$(EXEEXT)" LDAP="$(LDAP)" DEBUG="$(DEBUG)" \
59+
EXEEXT="$(EXEEXT)" LDAP="$(LDAP)" DEBUG="$(DEBUG)" \
6060
RM="$(RM)" CP="$(CP)" MKDIR="$(MKDIR)" SED="$(SED)" GCC="$(GCC)" \
6161
GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
6262
prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
@@ -112,14 +112,14 @@ else
112112
PRJ_LDAP=Disabled
113113
endif
114114

115-
# ASIS
115+
# LAL
116116

117-
ifeq (${ASIS}, true)
118-
PRJ_ASIS=Installed
119-
GEXT_MODULE := $(GEXT_MODULE) gasis_setup
117+
ifeq (${LAL}, true)
118+
PRJ_LAL=Installed
119+
GEXT_MODULE := $(GEXT_MODULE) lal_setup
120120
else
121-
PRJ_ASIS=Disabled
122-
GEXT_MODULE := $(GEXT_MODULE) gasis_dummy
121+
PRJ_LAL=Disabled
122+
GEXT_MODULE := $(GEXT_MODULE) lal_dummy
123123
endif
124124

125125
# Sockets
@@ -147,7 +147,7 @@ I_INC = $(TPREFIX)/include/aws
147147
GALL_OPTIONS := $(ALL_OPTIONS) \
148148
PRJ_BUILD="$(PRJ_BUILD)" \
149149
PRJ_XMLADA="$(PRJ_XMLADA)" \
150-
PRJ_ASIS="$(PRJ_ASIS)" \
150+
PRJ_LAL="$(PRJ_LAL)" \
151151
PRJ_SOCKLIB="$(PRJ_SOCKLIB)" \
152152
PRJ_LDAP="$(PRJ_LDAP)" \
153153
PRJ_TARGET="$(PRJ_TARGET)" \
@@ -164,10 +164,10 @@ ${MODULES_CHECK}: force
164164
${MAKE} -C ${@:%_check=%} check $(GALL_OPTIONS)
165165

166166
GPROPTS = -XPRJ_BUILD=$(PRJ_BUILD) -XPRJ_SOCKLIB=$(PRJ_SOCKLIB) \
167-
-XPRJ_ASIS=$(PRJ_ASIS) -XPRJ_LDAP=$(PRJ_LDAP) \
168-
-XPRJ_XMLADA=$(PRJ_XMLADA) -XTARGET=$(TARGET) \
167+
-XPRJ_LDAP=$(PRJ_LDAP) \
168+
-XPRJ_XMLADA=$(PRJ_XMLADA) -XPRJ_LAL=$(PRJ_LAL) \
169169
-XPROCESSORS=$(PROCESSORS) -XSOCKET=$(SOCKET) \
170-
-XPRJ_TARGET=$(PRJ_TARGET)
170+
-XPRJ_TARGET=$(PRJ_TARGET) -XTARGET=$(TARGET) \
171171

172172
GPR_STATIC = -XLIBRARY_TYPE=static -XXMLADA_BUILD=static
173173
GPR_SHARED = -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
@@ -276,16 +276,16 @@ check: $(MODULES_CHECK)
276276

277277
PRJDIR = $(BROOTDIR)/projects
278278

279-
gasis_dummy:
280-
echo "abstract project AWS_ASIS is" > $(PRJDIR)/aws_asis.gpr;
281-
echo " for Source_Dirs use ();" >> $(PRJDIR)/aws_asis.gpr;
282-
echo "end AWS_ASIS;" >> $(PRJDIR)/aws_asis.gpr;
279+
lal_dummy:
280+
echo "abstract project AWS_LAL is" > $(PRJDIR)/aws_lal.gpr;
281+
echo " for Source_Dirs use ();" >> $(PRJDIR)/aws_lal.gpr;
282+
echo "end AWS_LAL;" >> $(PRJDIR)/aws_lal.gpr;
283283

284-
gasis_setup:
285-
echo 'with "asis";' > $(PRJDIR)/aws_asis.gpr
286-
echo "abstract project AWS_ASIS is" >> $(PRJDIR)/aws_asis.gpr
287-
echo " for Source_Dirs use ();" >> $(PRJDIR)/aws_asis.gpr
288-
echo "end AWS_ASIS;" >> $(PRJDIR)/aws_asis.gpr
284+
lal_setup:
285+
echo 'with "libadalang";' > $(PRJDIR)/aws_lal.gpr
286+
echo "abstract project AWS_LAL is" >> $(PRJDIR)/aws_lal.gpr
287+
echo " for Source_Dirs use ();" >> $(PRJDIR)/aws_lal.gpr
288+
echo "end AWS_LAL;" >> $(PRJDIR)/aws_lal.gpr
289289

290290
gxmlada_dummy:
291291
echo "abstract project AWS_XMLADA is" > $(PRJDIR)/aws_xmlada.gpr
@@ -337,7 +337,7 @@ gen_setup:
337337
echo "ENABLE_SHARED=$(ENABLE_SHARED)" >> makefile.setup
338338
echo "ZLIB=$(ZLIB)" >> makefile.setup
339339
echo "XMLADA=$(XMLADA)" >> makefile.setup
340-
echo "ASIS=$(ASIS)" >> makefile.setup
340+
echo "LAL=$(LAL)" >> makefile.setup
341341
echo "NETLIB=$(NETLIB)" >> makefile.setup
342342
echo "SOCKET=$(SOCKET)" >> makefile.setup
343343
echo "LDAP=$(LDAP)" >> makefile.setup

‎makefile.checks

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ ifeq ($(XMLADA), )
2323
XMLADA=false
2424
endif
2525

26-
ifeq ($(ASIS), )
27-
ASIS=false
26+
ifeq ($(LAL), )
27+
LAL=false
2828
endif
2929

3030
ifneq ($(ZLIB), true)
@@ -35,8 +35,8 @@ ifeq ($(PRJ_TARGET), vxworks)
3535
ifeq ($(ENABLE_SHARED), true)
3636
$(error shared libraries not supported on cross platforms)
3737
endif
38-
ifeq ($(ASIS), true)
39-
$(error ASIS not supported on cross platforms)
38+
ifeq ($(LAL), true)
39+
$(error LAL not supported on cross platforms)
4040
endif
4141
ifeq ($(LDAP), true)
4242
$(error LDAP not supported on cross platforms)
@@ -55,9 +55,9 @@ $(error DEFAULT_LIBRARY_TYPE variable must be set to static or relocatable)
5555
endif
5656
endif
5757

58-
ifneq ($(ASIS), true)
59-
ifneq ($(ASIS), false)
60-
$(error ASIS variable must be set to true or false)
58+
ifneq ($(LAL), true)
59+
ifneq ($(LAL), false)
60+
$(error LAL variable must be set to true or false)
6161
endif
6262
endif
6363

@@ -73,9 +73,9 @@ $(error LDAP variable must be set to true or false)
7373
endif
7474
endif
7575

76-
ifeq ($(ASIS), true)
76+
ifeq ($(LAL), true)
7777
ifeq ($(XMLADA), false)
78-
$(error ASIS is set and requires XMLADA to be installed. \
78+
$(error LaL is set and requires XMLADA to be installed. \
7979
You may be missing XMLADA=true)
8080
endif
8181
endif

‎makefile.conf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ XMLADA = false
6161
endif
6262

6363
##############################################################################
64-
# ASIS optional, needed if you want to build ada2wsdl tool. This tool can be
64+
# LAL optional, needed if you want to build ada2wsdl tool. This tool can be
6565
# used to create a WSDL document from an Ada spec. Set ASIS to true to
6666
# activate ASIS support. You must also set ADA_PROJECT_PATH to point to the
6767
# ASIS project files if not installed in the standard location.
6868
#
6969
# If you activate ASIS you also need to activate XMLADA above.
7070
#
71-
# ASIS = [true|false]
71+
# LAL = [true|false]
7272
#
73-
ifeq ($(shell gnat ls -Pasis 2>&1 | grep 'project file .* not found'),)
74-
ASIS = true
73+
ifeq ($(shell gnat ls -Plibadalang 2>&1 | grep 'project file .* not found'),)
74+
LAL = true
7575
else
76-
ASIS = false
76+
LAL = false
7777
endif
7878

7979
##############################################################################

‎regtests/0103_soapcheck/test.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
!asis DEAD
1+
!lal DEAD
22
!xmlada DEAD

‎regtests/0162_wsdl_1_main/test.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
!asis DEAD
1+
!lal DEAD
22
!xmlada DEAD

‎regtests/0163_wsdl_2_main/test.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
!asis DEAD
1+
!lal DEAD
22
!xmlada DEAD

‎regtests/0164_wsdl_3_main/test.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
!asis DEAD
1+
!lal DEAD
22
!xmlada DEAD

‎regtests/0165_wsdl_4_main/test.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
!asis DEAD
1+
!lal DEAD
22
!xmlada DEAD

‎regtests/0166_wsdl_5_main/test.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
!asis DEAD
1+
!lal DEAD
22
!xmlada DEAD

‎regtests/0167_wsdl_6_main/test.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
!asis DEAD
1+
!lal DEAD
22
!xmlada DEAD

0 commit comments

Comments
 (0)