Merge branch 'po/lal'

* po/lal:
  Ensure tests are using different ports.
  Minor code clean-up and reformatting.
  Code refactoring to avoid specific option to build.
  New implementation of ada2wsdl based on LaL.
  Minor output reformatting.
  Ensure we do use a different port than other tests.
  Setup LaL which replaces ASIS.

Author: TurboGit

Makefile

@@ -1,7 +1,7 @@
 ############################################################################
 #                              Ada Web Server                              #
 #                                                                          #
-#                     Copyright (C) 2003-2017, AdaCore                     #
+#                     Copyright (C) 2003-2020, AdaCore                     #
 #                                                                          #
 #  This is free software;  you can redistribute it  and/or modify it       #
 #  under terms of the  GNU General Public License as published  by the     #
@@ -56,7 +56,7 @@ endif
 all: build
 
 ALL_OPTIONS	= $(MAKE_OPT) SOCKET="$(SOCKET)" XMLADA="$(XMLADA)" \
-	ASIS="$(ASIS)" EXEEXT="$(EXEEXT)" LDAP="$(LDAP)" DEBUG="$(DEBUG)" \
+	EXEEXT="$(EXEEXT)" LDAP="$(LDAP)" DEBUG="$(DEBUG)" \
 	RM="$(RM)" CP="$(CP)" MKDIR="$(MKDIR)" SED="$(SED)" GCC="$(GCC)" \
 	GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
 	prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
@@ -112,14 +112,14 @@ else
 PRJ_LDAP=Disabled
 endif
 
-#  ASIS
+#  LAL
 
-ifeq (${ASIS}, true)
-PRJ_ASIS=Installed
-GEXT_MODULE := $(GEXT_MODULE) gasis_setup
+ifeq (${LAL}, true)
+PRJ_LAL=Installed
+GEXT_MODULE := $(GEXT_MODULE) lal_setup
 else
-PRJ_ASIS=Disabled
-GEXT_MODULE := $(GEXT_MODULE) gasis_dummy
+PRJ_LAL=Disabled
+GEXT_MODULE := $(GEXT_MODULE) lal_dummy
 endif
 
 #  Sockets
@@ -147,7 +147,7 @@ I_INC	= $(TPREFIX)/include/aws
 GALL_OPTIONS := $(ALL_OPTIONS) \
 	PRJ_BUILD="$(PRJ_BUILD)" \
 	PRJ_XMLADA="$(PRJ_XMLADA)" \
-	PRJ_ASIS="$(PRJ_ASIS)" \
+	PRJ_LAL="$(PRJ_LAL)" \
 	PRJ_SOCKLIB="$(PRJ_SOCKLIB)" \
 	PRJ_LDAP="$(PRJ_LDAP)" \
 	PRJ_TARGET="$(PRJ_TARGET)" \
@@ -164,10 +164,10 @@ ${MODULES_CHECK}: force
 	${MAKE} -C ${@:%_check=%} check $(GALL_OPTIONS)
 
 GPROPTS = -XPRJ_BUILD=$(PRJ_BUILD) -XPRJ_SOCKLIB=$(PRJ_SOCKLIB) \
-		-XPRJ_ASIS=$(PRJ_ASIS) -XPRJ_LDAP=$(PRJ_LDAP) \
-		-XPRJ_XMLADA=$(PRJ_XMLADA) -XTARGET=$(TARGET) \
+		-XPRJ_LDAP=$(PRJ_LDAP) \
+		-XPRJ_XMLADA=$(PRJ_XMLADA) -XPRJ_LAL=$(PRJ_LAL) \
 		-XPROCESSORS=$(PROCESSORS) -XSOCKET=$(SOCKET) \
-		-XPRJ_TARGET=$(PRJ_TARGET)
+		-XPRJ_TARGET=$(PRJ_TARGET) -XTARGET=$(TARGET) \
 
 GPR_STATIC = -XLIBRARY_TYPE=static -XXMLADA_BUILD=static
 GPR_SHARED = -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
@@ -276,16 +276,16 @@ check: $(MODULES_CHECK)
 
 PRJDIR = $(BROOTDIR)/projects
 
-gasis_dummy:
-	echo "abstract project AWS_ASIS is" > $(PRJDIR)/aws_asis.gpr;
-	echo "   for Source_Dirs use ();" >> $(PRJDIR)/aws_asis.gpr;
-	echo "end AWS_ASIS;" >> $(PRJDIR)/aws_asis.gpr;
+lal_dummy:
+	echo "abstract project AWS_LAL is" > $(PRJDIR)/aws_lal.gpr;
+	echo "   for Source_Dirs use ();" >> $(PRJDIR)/aws_lal.gpr;
+	echo "end AWS_LAL;" >> $(PRJDIR)/aws_lal.gpr;
 
-gasis_setup:
-	echo 'with "asis";' > $(PRJDIR)/aws_asis.gpr
-	echo "abstract project AWS_ASIS is" >> $(PRJDIR)/aws_asis.gpr
-	echo "   for Source_Dirs use ();" >> $(PRJDIR)/aws_asis.gpr
-	echo "end AWS_ASIS;" >> $(PRJDIR)/aws_asis.gpr
+lal_setup:
+	echo 'with "libadalang";' > $(PRJDIR)/aws_lal.gpr
+	echo "abstract project AWS_LAL is" >> $(PRJDIR)/aws_lal.gpr
+	echo "   for Source_Dirs use ();" >> $(PRJDIR)/aws_lal.gpr
+	echo "end AWS_LAL;" >> $(PRJDIR)/aws_lal.gpr
 
 gxmlada_dummy:
 	echo "abstract project AWS_XMLADA is" > $(PRJDIR)/aws_xmlada.gpr
@@ -337,7 +337,7 @@ gen_setup:
 	echo "ENABLE_SHARED=$(ENABLE_SHARED)" >> makefile.setup
 	echo "ZLIB=$(ZLIB)" >> makefile.setup
 	echo "XMLADA=$(XMLADA)" >> makefile.setup
-	echo "ASIS=$(ASIS)" >> makefile.setup
+	echo "LAL=$(LAL)" >> makefile.setup
 	echo "NETLIB=$(NETLIB)" >> makefile.setup
 	echo "SOCKET=$(SOCKET)" >> makefile.setup
 	echo "LDAP=$(LDAP)" >> makefile.setup

docs/source/using_wsdl.rst

@@ -41,15 +41,15 @@ Creating WSDL documents
 
 .. index:: ada2wsdl
 
-Note that this tool is based on `ASIS`.
+Note that this tool is based on `LibAdaLang`.
 
 .. _Using_ada2wsdl:
 
 Using ada2wsdl
 --------------
 
 `ada2wsdl` can be used on any Ada spec file to generated a
-`WSDL` document. The Ada spec is parsed using `ASIS`.
+`WSDL` document. The Ada spec is parsed using `LibAdaLang`.
 
 .. highlight:: sh
 
@@ -494,10 +494,6 @@ ada2wsdl
 *-lit*
   Generate literal's style binding (default is encoded)
 
-*-I path*
-  Add path option for the `ASIS` compilation step. This option can
-  appear any number of time on the command line.
-
 *-n name*
   Specify the schema name space root name. The default value is "soapaws".
 

makefile.checks

@@ -23,8 +23,8 @@ ifeq  ($(XMLADA), )
 XMLADA=false
 endif
 
-ifeq  ($(ASIS), )
-ASIS=false
+ifeq  ($(LAL), )
+LAL=false
 endif
 
 ifneq  ($(ZLIB), true)
@@ -35,8 +35,8 @@ ifeq ($(PRJ_TARGET), vxworks)
 ifeq ($(ENABLE_SHARED), true)
 $(error shared libraries not supported on cross platforms)
 endif
-ifeq ($(ASIS), true)
-$(error ASIS not supported on cross platforms)
+ifeq ($(LAL), true)
+$(error LAL not supported on cross platforms)
 endif
 ifeq ($(LDAP), true)
 $(error LDAP not supported on cross platforms)
@@ -55,9 +55,9 @@ $(error DEFAULT_LIBRARY_TYPE variable must be set to static or relocatable)
 endif
 endif
 
-ifneq ($(ASIS), true)
-ifneq ($(ASIS), false)
-$(error ASIS variable must be set to true or false)
+ifneq ($(LAL), true)
+ifneq ($(LAL), false)
+$(error LAL variable must be set to true or false)
 endif
 endif
 
@@ -73,9 +73,9 @@ $(error LDAP variable must be set to true or false)
 endif
 endif
 
-ifeq ($(ASIS), true)
+ifeq ($(LAL), true)
 ifeq ($(XMLADA), false)
-$(error ASIS is set and requires XMLADA to be installed. \
+$(error LaL is set and requires XMLADA to be installed. \
 	You may be missing XMLADA=true)
 endif
 endif

makefile.conf

@@ -61,19 +61,19 @@ XMLADA = false
 endif
 
 ##############################################################################
-# ASIS optional, needed if you want to build ada2wsdl tool. This tool can be
-# used to create a WSDL document from an Ada spec. Set ASIS to true to
-# activate ASIS support. You must also set ADA_PROJECT_PATH to point to the
-# ASIS project files if not installed in the standard location.
+# LAL optional, needed if you want to build ada2wsdl tool. This tool can be
+# used to create a WSDL document from an Ada spec. Set LAL to true to
+# activate LAL support. You must also set ADA_PROJECT_PATH to point to the
+# LAL project files if not installed in the standard location.
 #
-# If you activate ASIS you also need to activate XMLADA above.
+# If you activate LAL you also need to activate XMLADA above.
 #
-# ASIS = [true|false]
+# LAL = [true|false]
 #
-ifeq ($(shell gnat ls -Pasis 2>&1 | grep 'project file .* not found'),)
-ASIS = true
+ifeq ($(shell gnat ls -Plibadalang 2>&1 | grep 'project file .* not found'),)
+LAL = true
 else
-ASIS = false
+LAL = false
 endif
 
 ##############################################################################

regtests/0103_soapcheck/test.opt

@@ -1,2 +1,2 @@
-!asis DEAD
+!lal DEAD
 !xmlada DEAD

regtests/0103_soapcheck/test.py

@@ -1,7 +1,7 @@
 from test_support import *
 
 exec_cmd('ada2wsdl',
-         ['-q', '-f', '-I.', '-Psoapcheck', 'pck.ads', '-o', 'pck.wsdl'])
+         ['-q', '-f', '-Psoapcheck', 'pck.ads', '-o', 'pck.wsdl'])
 exec_cmd('wsdl2aws',
          ['-q', '-f', '-cb', '-spec', 'pck', 'pck.wsdl'])
 

regtests/0162_wsdl_1_main/test.opt

@@ -1,2 +1,2 @@
-!asis DEAD
+!lal DEAD
 !xmlada DEAD

regtests/0162_wsdl_1_main/test.py

@@ -1,7 +1,7 @@
 from test_support import *
 
 exec_cmd('ada2wsdl',
-         ['-q', '-f', '-I.', '-Pwsdl_1_main',
+         ['-q', '-f', '-Pwsdl_1_main',
           '-a', 'http://localhost:7701', 'wsdl_1.ads', '-o', 'wsdl_1.wsdl'])
 exec_cmd('wsdl2aws',
          ['-q', '-f', '-cb', '-types', 'wsdl_1', 'wsdl_1.wsdl'])

regtests/0163_wsdl_2_main/test.opt

@@ -1,2 +1,2 @@
-!asis DEAD
+!lal DEAD
 !xmlada DEAD

regtests/0163_wsdl_2_main/test.py

@@ -1,7 +1,7 @@
 from test_support import *
 
 exec_cmd('ada2wsdl',
-         ['-q', '-f', '-I.', '-Pwsdl_2_main',
+         ['-q', '-f', '-Pwsdl_2_main',
           '-a', 'http://localhost:7702', 'wsdl_2.ads', '-o', 'wsdl_2.wsdl'])
 exec_cmd('wsdl2aws',
          ['-q', '-f', '-cb', '-types', 'wsdl_2', 'wsdl_2.wsdl'])