Build and test packages with libpq 10.1 and OpenSSL 1.0.2m

This commit is contained in:
Daniele Varrazzo 2017-11-28 03:40:47 +00:00
parent 5f0d411d11
commit ad7fd52f30
3 changed files with 13 additions and 12 deletions

View File

@ -162,8 +162,8 @@ install:
} }
# Download OpenSSL source # Download OpenSSL source
- CD C:\Others - CD C:\Others
- IF NOT EXIST OpenSSL_1_0_2l.zip ( - IF NOT EXIST OpenSSL_1_0_2m.zip (
curl -fsSL -o OpenSSL_1_0_2l.zip https://github.com/openssl/openssl/archive/OpenSSL_1_0_2l.zip curl -fsSL -o OpenSSL_1_0_2m.zip https://github.com/openssl/openssl/archive/OpenSSL_1_0_2m.zip
) )
# To use OpenSSL >= 1.1.0, both libpq and psycopg build environments have # To use OpenSSL >= 1.1.0, both libpq and psycopg build environments have
@ -175,15 +175,15 @@ install:
# - nmake build_libs install_dev # - nmake build_libs install_dev
- IF NOT EXIST %OPENSSLTOP%\lib\ssleay32.lib ( - IF NOT EXIST %OPENSSLTOP%\lib\ssleay32.lib (
CD %BUILD_DIR% && CD %BUILD_DIR% &&
7z x C:\Others\OpenSSL_1_0_2l.zip && 7z x C:\Others\OpenSSL_1_0_2m.zip &&
CD openssl-OpenSSL_1_0_2l && CD openssl-OpenSSL_1_0_2m &&
perl Configure %TARGET% no-asm no-shared no-zlib --prefix=%OPENSSLTOP% --openssldir=%OPENSSLTOP% && perl Configure %TARGET% no-asm no-shared no-zlib --prefix=%OPENSSLTOP% --openssldir=%OPENSSLTOP% &&
CALL ms\%DO% && CALL ms\%DO% &&
nmake -f ms\nt.mak init headers lib && nmake -f ms\nt.mak init headers lib &&
COPY inc32\openssl\*.h %OPENSSLTOP%\include\openssl && COPY inc32\openssl\*.h %OPENSSLTOP%\include\openssl &&
COPY out32\*.lib %OPENSSLTOP%\lib && COPY out32\*.lib %OPENSSLTOP%\lib &&
CD %BASE_DIR% && CD %BASE_DIR% &&
RMDIR /S /Q %BUILD_DIR%\openssl-OpenSSL_1_0_2l RMDIR /S /Q %BUILD_DIR%\openssl-OpenSSL_1_0_2m
) )
# Setup directories for building PostgreSQL librarires # Setup directories for building PostgreSQL librarires
@ -197,8 +197,8 @@ install:
# Download PostgreSQL source # Download PostgreSQL source
- CD C:\Others - CD C:\Others
- IF NOT EXIST postgres-REL_10_0.zip ( - IF NOT EXIST postgres-REL_10_1.zip (
curl -fsSL -o postgres-REL_10_0.zip https://github.com/postgres/postgres/archive/REL_10_0.zip curl -fsSL -o postgres-REL_10_1.zip https://github.com/postgres/postgres/archive/REL_10_1.zip
) )
# Setup build config file (config.pl) # Setup build config file (config.pl)
@ -209,11 +209,11 @@ install:
# Prepare local include directory for building from # Prepare local include directory for building from
# Build pg_config in place # Build pg_config in place
# NOTE: Cannot set and use the same variable inside an IF # NOTE: Cannot set and use the same variable inside an IF
- SET PGBUILD=%BUILD_DIR%\postgres-REL_10_0 - SET PGBUILD=%BUILD_DIR%\postgres-REL_10_1
- IF NOT EXIST %PGTOP%\lib\libpq.lib ( - IF NOT EXIST %PGTOP%\lib\libpq.lib (
CD %BUILD_DIR% && CD %BUILD_DIR% &&
7z x C:\Others\postgres-REL_10_0.zip && 7z x C:\Others\postgres-REL_10_1.zip &&
CD postgres-REL_10_0\src\tools\msvc && CD postgres-REL_10_1\src\tools\msvc &&
ECHO $config-^>{ldap} = 0; > config.pl && ECHO $config-^>{ldap} = 0; > config.pl &&
ECHO $config-^>{openssl} = "%OPENSSLTOP:\=\\%"; >> config.pl && ECHO $config-^>{openssl} = "%OPENSSLTOP:\=\\%"; >> config.pl &&
ECHO.>> config.pl && ECHO.>> config.pl &&

1
NEWS
View File

@ -9,6 +9,7 @@ What's new in psycopg 2.7.4
- Fixed parsing of array of points as floats (:ticket:`#613`). - Fixed parsing of array of points as floats (:ticket:`#613`).
- Fixed `~psycopg2.__libpq_version__` building with libpq >= 10.1 - Fixed `~psycopg2.__libpq_version__` building with libpq >= 10.1
(:ticket:`632`). (:ticket:`632`).
- Wheel packages compiled against PostgreSQL 10.1 libpq and OpenSSL 1.0.2m.
What's new in psycopg 2.7.3.2 What's new in psycopg 2.7.3.2

View File

@ -9,10 +9,10 @@ To invalidate the cache, update this file and check it into git.
Currently used modules built in the cache: Currently used modules built in the cache:
OpenSSL OpenSSL
Version: 1.0.2l Version: 1.0.2m
PostgreSQL PostgreSQL
Version: 10.0 Version: 10.1
NOTE: to zap the cache manually you can also use: NOTE: to zap the cache manually you can also use: