Skip to content

Commit 3850e2b

Browse files
rzharkovrzharkov
committed
[test] Some changes made: URLs and no-check-certificate fixed.
1 parent 5e56561 commit 3850e2b

File tree

6 files changed

+28
-10
lines changed

6 files changed

+28
-10
lines changed

‎build/build_pgpro.cmd

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SET ARCH=X64
2+
rem SET CONFIG=Debug
3+
SET SDK=MSVC2013
4+
SET PG_MAJOR_VERSION=11
5+
SET PG_PATCH_VERSION=2
6+
rem SET PRODUCT_NAME=PostgresPro
7+
SET PRODUCT_NAME=PostgresProEnterprise
8+
SET NOLOAD_SRC=1
9+
rem SET PGURL=http://repo.l.postgrespro.ru/pgproee-10-beta/src/postgrespro-enterprise-10.3.2.tar.bz2
10+
call run.cmd %1

‎build/build_vanila.cmd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
SET ARCH=X64
2+
SET SDK=MSVC2013
3+
SET PG_MAJOR_VERSION=11
4+
SET PG_PATCH_VERSION=4
5+
SET PRODUCT_NAME=PostgreSQL
6+
rem SET PGURL=http://repo.postgrespro.ru/1c-10-beta/src/postgrespro-1c-10.3.tar.bz2
7+
call run.cmd %1

‎build/helpers/dependencies.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ CD /D %DOWNLOADS_DIR%
135135
:BUILD_UUID
136136
TITLE Building uuid...
137137
CD /D %DOWNLOADS_DIR%
138-
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
138+
wget -c --no-check-certificate 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
139139
rm -rf %DEPENDENCIES_BIN_DIR%\uuid %DEPENDENCIES_SRC_DIR%\ossp_uuid
140140
MKDIR %DEPENDENCIES_BIN_DIR%\uuid
141141
7z x %DOWNLOADS_DIR%\ossp_uuid_1.6.2_win32_source_120608.7z -o%DEPENDENCIES_SRC_DIR%\ -y || GOTO :ERROR

‎build/helpers/postgres.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ if exist pgpro_upgrade 7z x %DOWNLOADS_DIR%\min_msys_%ARCH%.zip
188188
rem download and build pg_repack extension
189189
SET WGET=wget -N --no-check-certificate
190190

191-
set PG_REPACK_URL=https://repo.postgrespro.ru/pgproee-%PG_MAJOR_VERSION%-beta/src/pg_repack-%PG_REPACK_VER%.tar.bz2
191+
set PG_REPACK_URL=http://repo.l.postgrespro.ru/pgproee-%PG_MAJOR_VERSION%-beta/src/pg_repack-%PG_REPACK_VER%.tar.gz
192192
if "%PRODUCT_NAME%" == "PostgresProEnterprise" (
193193
CD /D %DOWNLOADS_DIR%
194194
%WGET% %PG_REPACK_URL% || goto :ERROR
@@ -222,12 +222,12 @@ CD /D %BUILD_DIR%\postgresql
222222
mkdir help-ru
223223
mkdir help-en
224224
CD help-ru
225-
7z x %DOWNLOADS_DIR%\help-sources-ru.zip
225+
7z x -y %DOWNLOADS_DIR%\help-sources-ru.zip
226226
CD help-ru
227227
"C:\Program Files (x86)\HTML Help Workshop\hhc" htmlhelp.hhp
228228
cp htmlhelp.chm %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\doc\postgresql-ru.chm
229229
CD ..\help-en
230-
7z x %DOWNLOADS_DIR%\help-sources-en.zip
230+
7z x -y %DOWNLOADS_DIR%\help-sources-en.zip
231231
CD help-en
232232
"C:\Program Files (x86)\HTML Help Workshop\hhc" htmlhelp.hhp
233233
cp htmlhelp.chm %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\doc\postgresql-en.chm

‎build/helpers/postgres_installer.cmd

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ REM Download VC Redistibutable packages
1212
TITLE Downloading VC Redistibutable packages
1313
MKDIR "%BUILD_DIR%\vcredist"
1414
IF %REDIST_YEAR% == 2010 (
15-
wget -c https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe -O "%BUILD_DIR%\vcredist\vcredist_x86_2010.exe" || GOTO :ERROR
16-
wget -c https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe -O "%BUILD_DIR%\vcredist\vcredist_x64_2010.exe" || GOTO :ERROR
15+
wget -c https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe --no-check-certificate -O "%BUILD_DIR%\vcredist\vcredist_x86_2010.exe" || GOTO :ERROR
16+
wget -c https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE650EFEBA5/vcredist_x64.exe --no-check-certificate -O "%BUILD_DIR%\vcredist\vcredist_x64_2010.exe" || GOTO :ERROR
1717
)
1818

1919
IF %REDIST_YEAR% == 2013 (
20-
wget -c https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe -O "%BUILD_DIR%\vcredist\vcredist_x86_2013.exe" || GOTO :ERROR
21-
wget -c https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe -O "%BUILD_DIR%\vcredist\vcredist_x64_2013.exe" || GOTO :ERROR
20+
wget -c https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe --no-check-certificate -O "%BUILD_DIR%\vcredist\vcredist_x86_2013.exe" || GOTO :ERROR
21+
wget -c https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe --no-check-certificate -O "%BUILD_DIR%\vcredist\vcredist_x64_2013.exe" || GOTO :ERROR
2222
)
2323

2424
IF %REDIST_YEAR% == 2015 (
25-
wget -c https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe -O "%BUILD_DIR%\vcredist\vcredist_x86_2015.exe" || GOTO :ERROR
26-
wget -c https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe -O "%BUILD_DIR%\vcredist\vcredist_x64_2015.exe" || GOTO :ERROR
25+
wget -c https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe --no-check-certificate -O "%BUILD_DIR%\vcredist\vcredist_x86_2015.exe" || GOTO :ERROR
26+
wget -c https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe --no-check-certificate -O "%BUILD_DIR%\vcredist\vcredist_x64_2015.exe" || GOTO :ERROR
2727
)
2828

2929
REM Make directory for installers

‎build/helpers/setvars.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ IF EXIST "%PERL64_BIN%" SET PERL_EXE=%PERL64_BIN%\perl
3434

3535
IF %ARCH% == X86 SET Platform=Win32
3636
IF %ARCH% == X64 SET Platform=X64
37+
3738
IF %SDK% == SDK71 (
3839
SET REDIST_YEAR=2010
3940
SET PlatformToolset=v100

0 commit comments

Comments
 (0)