Skip to content

Commit caf3906

Browse files
committed
Add support for building with SSL support.
Also make sure AWS is uninstalled first. Part of T407-051.
1 parent 994ec99 commit caf3906

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

win32/build.cmd

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ rem
55
rem c:> win32/build c:\gnat\2014
66
rem
77

8+
rem The followinng variable can be set to std, openssl or gnutls
9+
set SOCKET=std
10+
811
set ROOTDIR=%CD%
9-
set GPROPTS=-XPRJ_BUILD=Release -XPRJ_TARGET=Windows_NT -XTARGET=win -XPRJ_XMLADA=Installed -XPRJ_LDAP=Installed -XPRJ_ASIS=Disabled -XPRJ_SOCKLIB=gnat
12+
set GPROPTS=-XPRJ_BUILD=Release -XPRJ_TARGET=Windows_NT -XTARGET=win -XPRJ_XMLADA=Installed -XPRJ_LDAP=Installed -XPRJ_ASIS=Disabled -XPRJ_SOCKLIB=gnat -XSOCKET=%SOCKET%
1013

1114
if .%1==. goto dusage
1215

@@ -46,13 +49,13 @@ echo abstract project AWS_Lib_Shared is > aws_lib_shared.gpr
4649
echo for Source_Files use (); >> aws_lib_shared.gpr
4750
echo type SSL_Library_Kind is ("relocatable", "static"); >> aws_lib_shared.gpr
4851
echo SSL_Library_Type : SSL_Library_Kind := external ("SSL_LIBRARY_TYPE", "relocatable"); >> aws_lib_shared.gpr
49-
echo LIB_Path := ""; >> aws_lib_shared.gpr
50-
echo S_SSL_Lib := ""; >> aws_lib_shared.gpr
51-
echo R_SSL_Lib := ""; >> aws_lib_shared.gpr
52-
echo S_CRY_Lib := ""; >> aws_lib_shared.gpr
53-
echo R_CRY_Lib := ""; >> aws_lib_shared.gpr
54-
echo S_TLS_Lib := ""; >> aws_lib_shared.gpr
55-
echo R_TLS_Lib := ""; >> aws_lib_shared.gpr
52+
echo LIB_Path := "./"; >> aws_lib_shared.gpr
53+
echo S_SSL_Lib := "ssl"; >> aws_lib_shared.gpr
54+
echo R_SSL_Lib := "ssl32"; >> aws_lib_shared.gpr
55+
echo S_CRY_Lib := "crypto"; >> aws_lib_shared.gpr
56+
echo R_CRY_Lib := "eay32"; >> aws_lib_shared.gpr
57+
echo S_TLS_Lib := "gnutls"; >> aws_lib_shared.gpr
58+
echo R_TLS_Lib := "gnutls"; >> aws_lib_shared.gpr
5659
echo LIBZ_Path := Project'Project_Dir & "..\..\..\lib\aws\static"; >> aws_lib_shared.gpr
5760
echo end AWS_Lib_Shared; >> aws_lib_shared.gpr
5861

@@ -70,7 +73,7 @@ echo for Source_Dirs use (); >> aws_config.gpr
7073
echo type Boolean_Type is ("true", "false"); >> aws_config.gpr
7174
echo Zlib_Exists : Boolean_Type := "false"; >> aws_config.gpr
7275
echo type SOCKET_Type is ("std", "openssl", "gnutls"); >> aws_config.gpr
73-
echo SOCKET : SOCKET_Type := "std"; >> aws_config.gpr
76+
echo SOCKET : SOCKET_Type := "%SOCKET%"; >> aws_config.gpr
7477
echo end AWS_Config; >> aws_config.gpr
7578

7679
cd ..\..
@@ -82,6 +85,10 @@ if errorlevel 1 goto error
8285
gprbuild -p %GPROPTS% -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable aws.gpr
8386
if errorlevel 1 goto error
8487

88+
rem ----------------------------------------------- UNINSTALL
89+
:uninstall
90+
gprinstall --prefix=%1 -f --uninstall %GPROPTS% aws
91+
8592
rem ----------------------------------------------- INSTALL
8693
:install
8794
gprinstall --prefix=%1 -p -f %GPROPTS% -XLIBRARY_TYPE=static -XXMLADA_BUILD=static aws.gpr

0 commit comments

Comments
 (0)