Skip to content

Commit d0ab306

Browse files
slaykovskyslaykovsky
committed
Merge branch 'master' of github.com:postgrespro/pgwininstall
2 parents c5d4a39 + 0c5f567 commit d0ab306

File tree

6 files changed

+58
-46
lines changed

6 files changed

+58
-46
lines changed

‎Readme.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
## NSIS
22

3-
Directory contains the files needed for the installer
3+
Directory contains files needed for an installer.
44

55
## Build
66

7-
Directory contains the various build scripts
7+
Directory contains various build scripts.
88

99
### Build depends:
1010

1111
* Microsoft SDK 7.1 for build PostgreSQL and Microsoft Visual Studio 2013-2015 for build PgAdmin
12-
* Active Perl
12+
* Active Perl <= 5.12
1313
* Python 2.7, 3.5
14-
* MSYS2
15-
* 7Zip
14+
* msys2
15+
* 7-Zip
1616
* NSIS
1717

1818
## Patches
1919

20-
Directory contains the patches needed to build PostgreSQL
20+
Directory contains patches which are need to build PostgreSQL.

‎build/helpers/dependencies.cmd

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ MKDIR %DOWNLOADS_DIR%
1212

1313
:BUILD_ICONV
1414
TITLE Building iconv...
15-
CD %DOWNLOADS_DIR%
15+
CD /D %DOWNLOADS_DIR%
1616
wget --no-check-certificate -c http://ftp.gnu.org/gnu/libiconv/libiconv-%ICONV_VER%.tar.gz -O libiconv-%ICONV_VER%.tar.gz
1717
rm -rf %DEPENDENCIES_BIN_DIR%\iconv %DEPENDENCIES_SRC_DIR%\libiconv-*
1818
MKDIR %DEPENDENCIES_BIN_DIR%\iconv
1919
tar xf libiconv-%ICONV_VER%.tar.gz -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
20-
CD %DEPENDENCIES_SRC_DIR%\libiconv-%ICONV_VER%*
20+
CD /D %DEPENDENCIES_SRC_DIR%\libiconv-%ICONV_VER%*
2121
cp -v %ROOT%/patches/libiconv/libiconv-%ICONV_VER%-%SDK%.patch libiconv.patch
2222
patch -f -p0 < libiconv.patch || GOTO :ERROR
23-
IF %ARCH% == X64 msbuild libiconv.vcxproj /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
24-
IF %ARCH% == X86 msbuild libiconv.vcxproj /p:Configuration=Release /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
23+
IF %ARCH% == X64 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
24+
IF %ARCH% == X86 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
2525
cp -av include %DEPENDENCIES_BIN_DIR%\iconv || GOTO :ERROR
2626
cp -av iconv.h %DEPENDENCIES_BIN_DIR%\iconv\include || GOTO :ERROR
2727
cp -av config.h %DEPENDENCIES_BIN_DIR%\iconv\include || GOTO :ERROR
@@ -31,36 +31,37 @@ cp -av Release*/libiconv.dll %DEPENDENCIES_BIN_DIR%\iconv\lib\iconv.dll || GOTO
3131
cp -av Release*/*.lib %DEPENDENCIES_BIN_DIR%\iconv\lib || GOTO :ERROR
3232
cp -av Release*/libiconv.lib %DEPENDENCIES_BIN_DIR%\iconv\lib\iconv.lib || GOTO :ERROR
3333
cp -av lib %DEPENDENCIES_BIN_DIR%\iconv\libiconv || GOTO :ERROR
34-
CD %DOWNLOADS_DIR%
34+
CD /D %DOWNLOADS_DIR%
3535
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\iconv
3636

3737

3838
:BUILD_ZLIB
3939
TITLE Building zlib...
40-
CD %DOWNLOADS_DIR%
40+
CD /D %DOWNLOADS_DIR%
4141
wget -c http://zlib.net/zlib-%ZLIB_VER%.tar.gz -O zlib-%ZLIB_VER%.tar.gz
4242
rm -rf "%DEPENDENCIES_BIN_DIR%\zlib %DEPENDENCIES_SRC_DIR%\zlib*
4343
MKDIR "%DEPENDENCIES_BIN_DIR%\zlib
4444
tar xf zlib-%ZLIB_VER%.tar.gz -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
45-
CD %DEPENDENCIES_SRC_DIR%\zlib*
45+
CD /D %DEPENDENCIES_SRC_DIR%\zlib*
46+
set CL=/MP
4647
nmake -f win32/Makefile.msc || GOTO :ERROR
4748
MKDIR %DEPENDENCIES_BIN_DIR%\zlib\lib %DEPENDENCIES_BIN_DIR%\zlib\include
4849
cp -v *.lib %DEPENDENCIES_BIN_DIR%\zlib\lib || GOTO :ERROR
4950
cp -v *.dll %DEPENDENCIES_BIN_DIR%\zlib\lib || GOTO :ERROR
5051
cp -v *.pdb %DEPENDENCIES_BIN_DIR%\zlib\lib || GOTO :ERROR
5152
cp -v *.h %DEPENDENCIES_BIN_DIR%\zlib\include || GOTO :ERROR
52-
CD %DOWNLOADS_DIR%
53+
CD /D %DOWNLOADS_DIR%
5354
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\zlib -y
5455

5556

5657
:BUILD_UUID
5758
TITLE Building uuid...
58-
CD %DOWNLOADS_DIR%
59+
CD /D %DOWNLOADS_DIR%
5960
wget -c http://netcologne.dl.sourceforge.net/project/osspuuidwin32/src/ossp_uuid_1.6.2_win32_source_120608.7z -O ossp_uuid_1.6.2_win32_source_120608.7z
6061
rm -rf %DEPENDENCIES_BIN_DIR%\uuid %DEPENDENCIES_SRC_DIR%\ossp_uuid
6162
MKDIR %DEPENDENCIES_BIN_DIR%\uuid
6263
7z x %DOWNLOADS_DIR%\ossp_uuid_1.6.2_win32_source_120608.7z -o%DEPENDENCIES_SRC_DIR%\ -y || GOTO :ERROR
63-
CD %DEPENDENCIES_SRC_DIR%\ossp_uuid
64+
CD /D %DEPENDENCIES_SRC_DIR%\ossp_uuid
6465
IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid.sln || GOTO :ERROR
6566
IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid\ossp_uuid.vcxproj || GOTO :ERROR
6667
IF %ARCH% == X64 sed -i 's/Win32/x64/g' example\example.vcxproj || GOTO :ERROR
@@ -71,60 +72,63 @@ MKDIR %DEPENDENCIES_BIN_DIR%\uuid\lib
7172
cp -av include %DEPENDENCIES_BIN_DIR%\uuid || GOTO :ERROR
7273
IF %ARCH% == X64 cp -av x64\Release\ossp_uuid.lib %DEPENDENCIES_BIN_DIR%\uuid\lib\uuid.lib || GOTO :ERROR
7374
IF %ARCH% == X86 cp -av Release\ossp_uuid.lib %DEPENDENCIES_BIN_DIR%\uuid\lib\uuid.lib || GOTO :ERROR
74-
CD %DOWNLOADS_DIR%
75+
CD /D %DOWNLOADS_DIR%
7576
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\uuid -y
7677

7778

7879
:BUILD_XML
7980
TITLE Building xml...
80-
CD %DOWNLOADS_DIR%
81+
CD /D %DOWNLOADS_DIR%
8182
wget -c ftp://xmlsoft.org/libxml2/libxml2-%XML_VER%.tar.gz -O libxml2-%XML_VER%.tar.gz
8283
rm -rf %DEPENDENCIES_BIN_DIR%\libxml2 %DEPENDENCIES_SRC_DIR%\libxml2-
8384
MKDIR %DEPENDENCIES_BIN_DIR%\libxml2
8485
tar xf libxml2-%XML_VER%.tar.gz -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
85-
CD %DEPENDENCIES_SRC_DIR%\libxml2-*\win32
86+
CD /D %DEPENDENCIES_SRC_DIR%\libxml2-*\win32
8687
cscript configure.js compiler=msvc include=%DEPENDENCIES_BIN_DIR%\iconv\include lib=%DEPENDENCIES_BIN_DIR%\iconv\lib
8788
sed -i /NOWIN98/d Makefile.msvc
89+
set CL=/MP
8890
nmake /f Makefile.msvc || GOTO :ERROR
8991
nmake /f Makefile.msvc install || GOTO :ERROR
9092
cp -av bin %DEPENDENCIES_BIN_DIR%\libxml2 || GOTO :ERROR
9193
cp -av lib %DEPENDENCIES_BIN_DIR%\libxml2 || GOTO :ERROR
9294
cp -av include %DEPENDENCIES_BIN_DIR%\libxml2 || GOTO :ERROR
93-
CD %DOWNLOADS_DIR%
95+
CD /D %DOWNLOADS_DIR%
9496
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\libxml2 -y
9597

9698

9799
:BUILD_XSLT
98100
TITLE Building xslt...
99-
CD %DOWNLOADS_DIR%
101+
CD /D %DOWNLOADS_DIR%
100102
wget -c ftp://xmlsoft.org/libxslt/libxslt-%XSLT_VER%.tar.gz -O libxslt-%XSLT_VER%.tar.gz
101103
rm -rf %DEPENDENCIES_BIN_DIR%\libxslt %DEPENDENCIES_SRC_DIR%\libxslt-*
102104
MKDIR %DEPENDENCIES_BIN_DIR%\libxslt
103105
tar xf libxslt-%XSLT_VER%.tar.gz -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
104-
CD %DEPENDENCIES_SRC_DIR%\libxslt-*\win32
106+
CD /D %DEPENDENCIES_SRC_DIR%\libxslt-*\win32
105107
cscript configure.js compiler=msvc zlib=yes iconv=yes include=%DEPENDENCIES_BIN_DIR%\iconv\include;%DEPENDENCIES_BIN_DIR%\libxml2\include;%DEPENDENCIES_BIN_DIR%\zlib\include lib=%DEPENDENCIES_BIN_DIR%\iconv\lib;%DEPENDENCIES_BIN_DIR%\libxml2\lib;%DEPENDENCIES_BIN_DIR%\zlib\lib
106108
sed -i /NOWIN98/d Makefile.msvc
109+
set CL=/MP
107110
nmake /f Makefile.msvc || GOTO :ERROR
108111
nmake /f Makefile.msvc install || GOTO :ERROR
109112
cp -av bin %DEPENDENCIES_BIN_DIR%\libxslt || GOTO :ERROR
110113
cp -av lib %DEPENDENCIES_BIN_DIR%\libxslt || GOTO :ERROR
111114
cp -av include %DEPENDENCIES_BIN_DIR%\libxslt || GOTO :ERROR
112-
CD %DOWNLOADS_DIR%
115+
CD /D %DOWNLOADS_DIR%
113116
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\libxslt -y
114117

115118

116119
:BUILD_OPENSSL
117120
TITLE Building OpenSSL...
118-
CD %DOWNLOADS_DIR%
121+
CD /D %DOWNLOADS_DIR%
119122
wget --no-check-certificate -c https://www.openssl.org/source/openssl-%OPENSSL_VER%.tar.gz -O openssl-%OPENSSL_VER%.tar.gz
120123
rm -rf %DEPENDENCIES_BIN_DIR%\openssl %DEPENDENCIES_SRC_DIR%\openssl-*
121124
MKDIR %DEPENDENCIES_BIN_DIR%\openssl
122125
tar zxf openssl-%OPENSSL_VER%.tar.gz -C %DEPENDENCIES_SRC_DIR%
123-
CD %DEPENDENCIES_SRC_DIR%\openssl-*
126+
CD /D %DEPENDENCIES_SRC_DIR%\openssl-*
124127
IF %ARCH% == X86 perl Configure VC-WIN32 no-asm || GOTO :ERROR
125128
IF %ARCH% == X64 perl Configure VC-WIN64A no-asm || GOTO :ERROR
126129
IF %ARCH% == X86 call ms\do_ms
127130
IF %ARCH% == X64 call ms\do_win64a.bat
131+
set CL=/MP
128132
nmake -f ms\ntdll.mak || GOTO :ERROR
129133
MKDIR %DEPENDENCIES_BIN_DIR%\openssl\lib
130134
MKDIR %DEPENDENCIES_BIN_DIR%\openssl\include
@@ -134,18 +138,18 @@ MKDIR %DEPENDENCIES_BIN_DIR%\openssl\lib\VC
134138
cp -av out32dll/* %DEPENDENCIES_BIN_DIR%\openssl\lib\VC || GOTO :ERROR
135139
cp -v out32dll/ssleay32.lib %DEPENDENCIES_BIN_DIR%\openssl\lib\VC\ssleay32MD.lib || GOTO :ERROR
136140
cp -v out32dll/libeay32.lib %DEPENDENCIES_BIN_DIR%\openssl\lib\VC\libeay32MD.lib || GOTO :ERROR
137-
CD %DOWNLOADS_DIR%
141+
CD /D %DOWNLOADS_DIR%
138142
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\openssl -y
139143

140144

141145
:BUILD_GETTEXT
142146
TITLE Building gettext...
143-
CD %DOWNLOADS_DIR%
147+
CD /D %DOWNLOADS_DIR%
144148
wget --no-check-certificate -c http://ftp.gnu.org/gnu/gettext/gettext-%GETTEXT_VER%.tar.gz -O gettext-%GETTEXT_VER%.tar.gz
145149
rm -rf %DEPENDENCIES_BIN_DIR%\libintl %DEPENDENCIES_SRC_DIR%\gettext-*
146150
MKDIR %DEPENDENCIES_BIN_DIR%\libintl
147151
tar xf gettext-%GETTEXT_VER%.tar.gz -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
148-
CD %DEPENDENCIES_SRC_DIR%\gettext-*
152+
CD /D %DEPENDENCIES_SRC_DIR%\gettext-*
149153
cp -v %ROOT%/patches/gettext/gettext-%GETTEXT_VER%-%SDK%.patch gettext.patch
150154
patch -f -p0 < gettext.patch || GOTO :ERROR
151155
IF %ARCH% == X64 msbuild libintl.vcxproj /m /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
@@ -156,31 +160,31 @@ cp -v Release*/*.lib %DEPENDENCIES_BIN_DIR%\libintl\lib || GOTO :ERROR
156160
cp -v libintl.h %DEPENDENCIES_BIN_DIR%\libintl\include\libintl.h || GOTO :ERROR
157161
MKDIR %DEPENDENCIES_BIN_DIR%\libintl\bin
158162
>%DEPENDENCIES_BIN_DIR%\libintl\bin\msgfmt.cmd ECHO msgfmt %%^*
159-
CD %DOWNLOADS_DIR%
163+
CD /D %DOWNLOADS_DIR%
160164
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\libintl -y
161165

162166

163167
:BUILD_LIBSSH2
164168
TITLE Building libssh2...
165-
CD %DOWNLOADS_DIR%
169+
CD /D %DOWNLOADS_DIR%
166170
wget --no-check-certificate -c http://www.libssh2.org/download/libssh2-%LIBSSH2_VER%.tar.gz -O libssh2-%LIBSSH2_VER%.tar.gz
167171
rm -rf %DEPENDENCIES_BIN_DIR%\libssh2 %DEPENDENCIES_SRC_DIR%/libssh2-*
168172
MKDIR %DEPENDENCIES_BIN_DIR%\libssh2
169173
tar xf libssh2-%LIBSSH2_VER%.tar.gz -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
170174
cp -va %DEPENDENCIES_SRC_DIR%/libssh2-*/include %DEPENDENCIES_BIN_DIR%\libssh2\include || GOTO :ERROR
171175
cp -va %DEPENDENCIES_SRC_DIR%/libssh2-*/win32/libssh2_config.h %DEPENDENCIES_BIN_DIR%\libssh2\include || GOTO :ERROR
172-
CD %DOWNLOADS_DIR%
176+
CD /D %DOWNLOADS_DIR%
173177
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\libssh2 -y
174178

175179

176180
:BUILD_ICU
177181
TITLE Building icu...
178-
CD %DOWNLOADS_DIR%
182+
CD /D %DOWNLOADS_DIR%
179183
wget --no-check-certificate -c http://download.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.zip -O icu4c-56_1-src.zip
180184
rm -rf %DEPENDENCIES_BIN_DIR%\icu %DEPENDENCIES_SRC_DIR%\icu
181185
MKDIR %DEPENDENCIES_BIN_DIR%\icu
182186
7z x icu4c-56_1-src.zip -o%DEPENDENCIES_SRC_DIR% -y
183-
CD %DEPENDENCIES_SRC_DIR%\icu
187+
CD /D %DEPENDENCIES_SRC_DIR%\icu
184188
IF %ARCH% == X86 msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
185189
IF %ARCH% == X64 msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=x64 /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
186190
IF %ARCH% == X64 (
@@ -191,7 +195,7 @@ IF %ARCH% == X64 (
191195
cp -va %DEPENDENCIES_SRC_DIR%\icu\lib %DEPENDENCIES_BIN_DIR%\icu\lib || GOTO :ERROR
192196
)
193197
cp -va %DEPENDENCIES_SRC_DIR%\icu\include %DEPENDENCIES_BIN_DIR%\icu\include || GOTO :ERROR
194-
CD %DOWNLOADS_DIR%
198+
CD /D %DOWNLOADS_DIR%
195199
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\icu
196200

197201

‎build/helpers/pgadmin.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ IF EXIST %DOWNLOADS_DIR%\pgsql_%ARCH%_%PGVER%.zip (
2020

2121
:BUILD_WXWIDGETS
2222
TITLE Building wxWidgets...
23-
CD %DOWNLOADS_DIR%
23+
CD /D %DOWNLOADS_DIR%
2424
wget --no-check-certificate -c https://sourceforge.net/projects/wxwindows/files/%WXWIDGETS_VER%/wxWidgets-%WXWIDGETS_VER%.tar.bz2 -O wxWidgets-%WXWIDGETS_VER%.tar.bz2
2525
rm -rf %DEPENDENCIES_BIN_DIR%\wxwidgets %DEPENDENCIES_SRC_DIR%\wxWidgets-*
2626
MKDIR %DEPENDENCIES_BIN_DIR%\wxwidgets
2727
tar xf wxWidgets-%WXWIDGETS_VER%.tar.bz2 -C %DEPENDENCIES_SRC_DIR% || GOTO :ERROR
28-
CD %DEPENDENCIES_SRC_DIR%\wxWidgets-*
28+
CD /D %DEPENDENCIES_SRC_DIR%\wxWidgets-*
2929

3030
cp -v %ROOT%/patches/wxWidgets/wxWidgets-%WXWIDGETS_VER%-%SDK%.patch wxWidgets.patch
3131
IF NOT EXIST wxWidgets.patch GOTO :DONE_WXWIDGETS_PATCH
@@ -68,12 +68,12 @@ cp -va %DEPENDENCIES_SRC_DIR%/wxWidgets-3*/include %DEPENDENCIES_BIN_DIR%\wxwid
6868

6969
:BUILD_PGADMIN
7070
TITLE Building PgAdmin3...
71-
CD %DOWNLOADS_DIR%
71+
CD /D %DOWNLOADS_DIR%
7272
wget --no-check-certificate -c https://github.com/postgres/pgadmin3/archive/%PGADMIN_TAG%.zip -O pgadmin3-%PGADMIN_VERSION%.zip
7373
rm -rf %BUILD_DIR%\pgadmin
7474
MKDIR %BUILD_DIR%\pgadmin
7575
7z x pgadmin3-%PGADMIN_VERSION%.zip -o%BUILD_DIR%\pgadmin -y
76-
CD %BUILD_DIR%\pgadmin\pgadmin3-*
76+
CD /D %BUILD_DIR%\pgadmin\pgadmin3-*
7777
SET OPENSSL=%DEPENDENCIES_BIN_DIR%\openssl
7878
SET WXWIN=%DEPENDENCIES_BIN_DIR%\wxwidgets
7979
SET PGBUILD=%DEPENDENCIES_BIN_DIR%

‎build/helpers/postgres.cmd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ IF EXIST %DOWNLOADS_DIR%\%DEPS_ZIP% (
1313

1414
:BUILD_POSTGRESQL
1515
TITLE Building PostgreSQL...
16-
CD %DOWNLOADS_DIR%
16+
CD /D %DOWNLOADS_DIR%
1717
wget --no-check-certificate %PGURL% -O postgresql-%PGVER%.tar.bz2 || GOTO :ERROR
1818
rm -rf %BUILD_DIR%\postgresql
1919
MKDIR %BUILD_DIR%\postgresql
2020
tar xf postgresql-%PGVER%.tar.bz2 -C %BUILD_DIR%\postgresql
21-
CD %BUILD_DIR%\postgresql\*%PGVER%*
21+
CD /D %BUILD_DIR%\postgresql\*%PGVER%*
2222

2323
IF %ONE_C% == YES (
2424
cp -va %ROOT%/patches/postgresql/%PGVER%/series.for1c .
@@ -79,9 +79,10 @@ rm -rf %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql
7979
MKDIR %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql
8080
CD %BUILD_DIR%\postgresql\*%PGVER%*\src\tools\msvc
8181

82-
REM That's really makes no sence for me...
8382
REM xcopy /Y %DEPENDENCIES_BIN_DIR%\libintl\lib\*.dll %BUILD_DIR%\postgresql\*%PGVER%*\ || GOTO :ERROR
8483
REM xcopy /Y %DEPENDENCIES_BIN_DIR%\iconv\lib\*.dll %BUILD_DIR%\postgresql\*%PGVER%*\ || GOTO :ERROR
84+
cp -va %DEPENDENCIES_BIN_DIR%\libintl\lib\*.dll %BUILD_DIR%\postgresql\postgresql-%PGVER%\ || GOTO :ERROR
85+
cp -va %DEPENDENCIES_BIN_DIR%\iconv\lib\*.dll %BUILD_DIR%\postgresql\postgresql-%PGVER%\ || GOTO :ERROR
8586

8687
perl install.pl %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql || GOTO :ERROR
8788
cp -va %DEPENDENCIES_BIN_DIR%/libintl/lib/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR

‎build/helpers/setvars.cmd

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ SET ICONV_VER=1.14
33
SET XSLT_VER=1.1.28
44
SET ZLIB_VER=1.2.8
55
SET XML_VER=2.7.3
6-
SET OPENSSL_VER=1.0.2f
6+
SET OPENSSL_VER=1.0.2g
77
SET GETTEXT_VER=0.19.4
88
SET LIBSSH2_VER=1.6.0
99
SET WXWIDGETS_VER=3.0.2
@@ -27,24 +27,31 @@ IF %SDK% == SDK71 (
2727
SET REDIST_YEAR=2010
2828
SET PlatformToolset=v100
2929
CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv" /%ARCH% || GOTO :ERROR
30+
ECHO ON
3031
)
3132

3233
IF %SDK% == MSVC2013 (
3334
SET REDIST_YEAR=2013
3435
SET PlatformToolset=v120
3536
IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall" x86 || GOTO :ERROR
37+
ECHO ON
3638
IF %ARCH% == X64 CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall" amd64 || GOTO :ERROR
39+
ECHO ON
3740
)
3841

3942
IF %SDK% == MSVC2015 (
4043
SET REDIST_YEAR=2015
4144
SET PlatformToolset=v140
4245
IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" x86 || GOTO :ERROR
46+
ECHO ON
4347
IF %ARCH% == X64 CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" amd64 || GOTO :ERROR
48+
ECHO ON
4449
)
4550

4651
REM As we use Msys2 for build we need to install useful packages we will use
47-
pacman --noconfirm --sync flex bison tar wget patch git
52+
@ECHO "Current PATH is:"
53+
PATH
54+
pacman --noconfirm --sync --needed flex bison tar wget patch git
4855

4956
ECHO %PG_PATCH_VERSION% | grep "^[0-9]." > nul && (
5057
SET PG_DEF_VERSION=%PG_MAJOR_VERSION%.%PG_PATCH_VERSION%

‎build/run.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@ECHO OFF
22

3-
REM What you need to build PostgreSQL and PgAdmin
4-
REM 1. Microsoft Windows SDK 7.1 and MSVC 2013-2013 for PgAdmin
3+
REM What do you need to build PostgreSQL and PgAdmin
4+
REM 1. Microsoft Windows SDK 7.1 and Visual Studio 2015 for PgAdmin
55
REM 2. Active Perl <= 5.14
66
REM 3. Python 2.7, 3.5
77
REM 4. MSYS2
@@ -45,7 +45,7 @@ REM Set ONE_C for 1C Patching
4545
IF "%ONE_C%"=="" SET ONE_C=NO
4646

4747
REM Set build architecture: X86 or X64
48-
IF "%ARCH%"=="" SET ARCH=X64
48+
IF "%ARCH%"=="" SET ARCH=X86
4949
IF "%ARCH%"=="x86" SET ARCH=X86
5050
IF "%ARCH%"=="x64" SET ARCH=X64
5151

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy