diff --git a/Makefile b/Makefile
index 389e9c0..2351218 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,6 @@ build-doc:
echo ""
echo "=== Build doc"
${MAKE} -C docs html latexpdf
- ${MAKE} -C templates_parser/docs html latexpdf
run_regtests:
echo ""
@@ -84,7 +83,7 @@ force:
MODULES = config include ssl src gps regtests demos
-MODULES_SETUP = ${MODULES:%=%_setup} templates_parser_setup
+MODULES_SETUP = ${MODULES:%=%_setup}
MODULES_INSTALL = ${MODULES:%=%_install}
@@ -143,6 +142,7 @@ endif
# Install directories
I_INC = $(TPREFIX)/include/aws
+I_LIB ?= ${TPREFIX}/lib
GALL_OPTIONS := $(ALL_OPTIONS) \
PRJ_BUILD="$(PRJ_BUILD)" \
@@ -180,7 +180,7 @@ GPR_DEFAULT = -XLIBRARY_TYPE=$(DEFAULT_LIBRARY_TYPE) \
# build
build-native:
- $(GPRBUILD) -p $(GPROPTS) $(GPR_STATIC) tools/tools.gpr
+ $(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) tools/tools.gpr
ifeq (${ENABLE_SHARED}, true)
$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) aws.gpr
endif
@@ -243,14 +243,11 @@ GPRINST_OPTS=-p -f --prefix=$(TPREFIX) \
install-native: install-clean
$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_DEFAULT) \
+ --link-lib-subdir=${I_LIB} --lib-subdir=${I_LIB}/aws/ --sources-subdir=${I_INC} \
--build-name=$(DEFAULT_LIBRARY_TYPE) aws.gpr
$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) $(GPR_STATIC) --mode=usage \
--build-name=$(DEFAULT_LIBRARY_TYPE) \
--install-name=aws tools/tools.gpr
-ifeq (${ENABLE_SHARED}, true)
- $(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) \
- $(GPR_OTHER) --build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
-endif
install-cross: install-clean
$(GPRINSTALL) $(GPROPTS) $(GPRINST_OPTS) \
@@ -346,7 +343,5 @@ gen_setup:
echo "TARGET=$(TARGET)" >> makefile.setup
echo "GSOAP=false" >> makefile.setup
-setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
+setup: gen_setup setup_dir setup_modules setup_config $(GEXT_MODULE)
-setup_tp:
- $(MAKE) -C templates_parser setup $(GALL_OPTIONS)
diff --git a/aws.gpr b/aws.gpr
index dc43545..1a486cd 100644
--- a/aws.gpr
+++ b/aws.gpr
@@ -17,23 +17,20 @@
------------------------------------------------------------------------------
with "shared";
-with "include/zlib/zlib.gpr";
+with "zlib_ada";
+with "templates_parser";
+with "xmlada";
+with "directories";
aggregate library project AWS is
for Project_Files use ("include/include.gpr", "src/src.gpr", "ssl/ssl.gpr");
- case ZLib.Zlib_Activated is
- when "Yes" =>
- for Project_Files
- use Project'Project_Files & ("include/zlib/zlib.gpr");
- when "No" =>
- null;
- end case;
-
for Library_Name use "aws";
for Library_Kind use Shared.Library_Type;
for Library_Dir use Shared'Library_Dir & "/aws";
+ for Library_Options use ("-L", "-lzlib_ada", "-ltemplates_parser");
+ for Library_Version use "lib" & Project'Library_Name & "-2020.so";
case Shared.Library_Type is
when "static" =>
@@ -76,6 +73,7 @@ aggregate library project AWS is
package Install is
-- examples
+ for Lib_Subdir use Directories.Lib & "/aws/";
for Artifacts ("share/examples/aws/images")
use ("demos/runme/aws_*.png");
for Artifacts ("share/examples/aws/templates")
@@ -83,8 +81,6 @@ aggregate library project AWS is
-- support files (templates)
- for Artifacts ("share/examples/aws/templates")
- use ("templates_parser/tools/templates.tads");
for Artifacts ("share/examples/aws/web_elements")
use ("web_elements/menu_css", "web_elements/notebook",
"web_elements/rounded_boxes", "web_elements/icons",
@@ -103,10 +99,6 @@ aggregate library project AWS is
for Artifacts ("share/doc/aws") use ("docs/build/html");
for Artifacts ("share/doc/aws/pdf") use ("docs/build/latex/*.pdf");
- for Artifacts ("share/doc/aws/templates_parser")
- use ("templates_parser/docs/build/html");
- for Artifacts ("share/doc/aws/templates_parser/pdf")
- use ("templates_parser/docs/build/latex/*.pdf");
-- gps plug-ins
diff --git a/include/include.gpr b/include/include.gpr
index c885f15..3a04e87 100644
--- a/include/include.gpr
+++ b/include/include.gpr
@@ -18,7 +18,7 @@
with "../shared";
-with "zlib/zlib";
+with "zlib_ada";
library project Include is
diff --git a/src/src.gpr b/src/src.gpr
index 3c8f485..174b21a 100644
--- a/src/src.gpr
+++ b/src/src.gpr
@@ -21,13 +21,14 @@ with "../.build/projects/aws_xmlada";
with "../shared";
with "../include/include";
with "../ssl/ssl";
+with "templates_parser";
library project Src is
for Languages use ("Ada", "Project file", "Makefile");
for Source_Dirs use
- ("core", "extended", "../templates_parser/src", "../config/src",
+ ("core", "extended", "../config/src",
"../config/ssl", "../" & Shared.Target_Dir & "/setup/src", ".");
-- XMLAda Installed, add xsrc and soap directories
@@ -35,7 +36,7 @@ library project Src is
case Shared.XMLAda is
when "Installed" =>
for Source_Dirs use project'Source_Dirs &
- ("xsrc", "soap", "../templates_parser/xsrc");
+ ("xsrc", "soap");
when "Disabled" =>
null;
end case;
@@ -124,17 +125,6 @@ library project Src is
for Implementation_Suffix ("Makefile") use ".txt";
for Implementation_Exceptions ("Makefile") use ("Makefile");
- -- Templates Parser
-
- for Specification ("Templates_Parser.Configuration")
- use "templates_parser-configuration__aws.ads";
-
- for Implementation ("Templates_Parser.Input")
- use "templates_parser-input__aws.adb";
-
- for Implementation ("Templates_Parser_Tasking")
- use "templates_parser_tasking__standard_tasking.adb";
-
-- SOCKLIB
for Implementation ("AWS.Net.Std")
diff --git a/ssl/ssl.gpr b/ssl/ssl.gpr
index d55a2e1..886b6da 100644
--- a/ssl/ssl.gpr
+++ b/ssl/ssl.gpr
@@ -39,6 +39,7 @@ library project SSL is
for Library_Dir use "../" & Shared'Library_Dir & "/ssl";
for Library_Name use "aws_ssl";
+ for Library_Version use "lib" & Project'Library_Name & "-2020.so";
for Library_Kind use Shared.Library_Type;
for Leading_Library_Options use Shared.Leading_Library_Options;
diff --git a/tools/tools.gpr b/tools/tools.gpr
index d720928..202de1e 100644
--- a/tools/tools.gpr
+++ b/tools/tools.gpr
@@ -20,15 +20,16 @@ with "../.build/projects/aws_asis";
with "../shared";
with "../aws";
with "../win32/win32";
+with "templates_parser";
project Tools is
for Languages use ("Ada", "Project file");
- for Source_Dirs use (".", "../templates_parser/tools");
+ for Source_Dirs use ("." );
- for Main use ("awsres.adb", "aws_password.adb", "templates2ada.adb",
- "webxref.adb", "templatespp.adb");
+ for Main use ("awsres.adb", "aws_password.adb",
+ "webxref.adb");
case Shared.XMLAda is
when "Installed" =>
@@ -77,7 +78,7 @@ project Tools is
package Binder is
for Default_Switches ("Ada")
- use Shared.Builder'Default_Switches ("Ada") & ("-static");
+ use Shared.Builder'Default_Switches ("Ada") & ("-shared");
end Binder;
-------------