Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4ba35cb

Browse files
VictorSpirinVictorSpirin
committed
Updated for openssl 1.1.1
1 parent c532a3f commit 4ba35cb

File tree

3 files changed

+26
-12
lines changed

3 files changed

+26
-12
lines changed

‎build/helpers/dependencies.cmd

+14-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ IF %SDK% == MSVC2019 (
2020
SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
2121
)
2222

23-
rem GOTO :BUILD_ICONV
23+
rem GOTO :BUILD_OPENSSL
2424

2525
if "%PRODUCT_NAME%" == "PostgreSQL" goto :SKIP_ZSTD
2626
if "%PRODUCT_NAME%" == "PostgresPro" goto :SKIP_ZSTD
@@ -245,12 +245,19 @@ rm -rf %DEPENDENCIES_BIN_DIR%\openssl %DEPENDENCIES_SRC_DIR%\openssl-*
245245
MKDIR %DEPENDENCIES_BIN_DIR%\openssl
246246
tar zxf openssl-%OPENSSL_VER%.tar.gz -C %DEPENDENCIES_SRC_UDIR%
247247
CD /D %DEPENDENCIES_SRC_DIR%\openssl-*
248-
IF %ARCH% == X86 perl Configure VC-WIN32 no-asm || GOTO :ERROR
249-
IF %ARCH% == X64 perl Configure VC-WIN64A no-asm || GOTO :ERROR
250-
IF %ARCH% == X86 call ms\do_ms
251-
IF %ARCH% == X64 call ms\do_win64a.bat
252-
set CL=/MP
253-
nmake -f ms\ntdll.mak || GOTO :ERROR
248+
IF %ARCH% == X86 perl Configure VC-WIN32 no-asm --prefix=%DEPENDENCIES_BIN_DIR%\openssl\ --openssldir=%DEPENDENCIES_BIN_DIR%\openssldir\ || GOTO :ERROR
249+
IF %ARCH% == X64 perl Configure VC-WIN64A no-asm --prefix=%DEPENDENCIES_BIN_DIR%\openssl\ --openssldir=%DEPENDENCIES_BIN_DIR%\openssldir\ || GOTO :ERROR
250+
rem IF %ARCH% == X86 call ms\do_ms
251+
rem IF %ARCH% == X64 call ms\do_win64a.bat
252+
rem set CL=/MP
253+
rem nmake -f ms\ntdll.mak || GOTO :ERROR
254+
nmake || GOTO :ERROR
255+
TITLE Installing OpenSSL...
256+
nmake install || GOTO :ERROR
257+
CD /D %DOWNLOADS_DIR%
258+
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\openssl -y
259+
GOTO :BUILD_GETTEXT
260+
254261
MKDIR %DEPENDENCIES_BIN_DIR%\openssl\lib
255262
MKDIR %DEPENDENCIES_BIN_DIR%\openssl\include
256263
cp -av out32dll/* %DEPENDENCIES_BIN_DIR%\openssl\lib || GOTO :ERROR

‎build/helpers/postgres.cmd

+10-4
Original file line numberDiff line numberDiff line change
@@ -164,13 +164,17 @@ cp -va %DEPENDENCIES_BIN_DIR%/libintl/lib/*.lib %BUILD_DIR%\distr_%ARCH%_%PGV
164164
cp -va %DEPENDENCIES_BIN_DIR%/iconv/lib/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
165165
cp -va %DEPENDENCIES_BIN_DIR%/libxml2/bin/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
166166
cp -va %DEPENDENCIES_BIN_DIR%/libxslt/lib/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
167-
cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
168-
cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/openssl.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
167+
168+
rem cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
169+
rem cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/openssl.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
170+
cp -va %DEPENDENCIES_BIN_DIR%/openssl/bin/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
171+
cp -va %DEPENDENCIES_BIN_DIR%/openssl/bin/openssl.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
172+
169173
cp -va %DEPENDENCIES_BIN_DIR%/zlib/lib/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
170174
if "%PRODUCT_NAME%" == "PostgresProEnterprise" cp -va %DEPENDENCIES_BIN_DIR%/zstd/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
171175
cp -va %DEPENDENCIES_BIN_DIR%/icu/bin/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
172176
REM Copy needed executables
173-
cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/openssl.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
177+
rem cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/openssl.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
174178
cp -va %DEPENDENCIES_BIN_DIR%/less/*.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
175179

176180
REM Copy libraries headers to "include" directory for a God sake
@@ -186,7 +190,9 @@ cp -va %DEPENDENCIES_BIN_DIR%/libintl/lib/*.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%
186190
cp -va %DEPENDENCIES_BIN_DIR%/iconv/lib/*.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
187191
cp -va %DEPENDENCIES_BIN_DIR%/libxml2/lib/libxml2.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
188192
cp -va %DEPENDENCIES_BIN_DIR%/libxslt/lib/*t.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
189-
cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/*eay32.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
193+
rem cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/*eay32.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
194+
cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/libssl.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
195+
cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/libcrypto.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
190196
cp -va %DEPENDENCIES_BIN_DIR%/zlib/lib/zdll.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
191197
cp -va %DEPENDENCIES_BIN_DIR%/uuid/lib/uuid.lib %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
192198

‎build/helpers/setvars.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ SET ICONV_VER=1.15
33
SET XSLT_VER=1.1.29
44
SET ZLIB_VER=1.2.11
55
SET XML_VER=2.9.7
6-
SET OPENSSL_VER=1.0.2n
6+
rem SET OPENSSL_VER=1.0.2n
7+
SET OPENSSL_VER=1.1.1g
78
SET GETTEXT_VER=0.19.8
89
SET LIBSSH2_VER=1.6.0
910
SET WXWIDGETS_VER=3.0.2

0 commit comments

Comments
 (0)