Skip to content

Commit c28cf9c

Browse files
author
Alexey Slaykovsky
committed
Timezones fix
1 parent de45ab2 commit c28cf9c

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
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/postgres.cmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/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