Skip to content

Commit fe504e2

Browse files
vbwagnervbwagner
committed
Added modifications neccessary to link postgres with winlibedit and less as pager. Use postgres from PGPRO_winedit branch
1 parent aa08da3 commit fe504e2

File tree

3 files changed

+51
-1
lines changed

3 files changed

+51
-1
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,50 @@ rm -rf %DEPENDENCIES_SRC_DIR%
1010
MKDIR %DEPENDENCIES_SRC_DIR%
1111
MKDIR %DOWNLOADS_DIR%
1212

13+
:BUILD_LESS
14+
TITLE "Building less"
15+
CD /D %DOWNLOADS_DIR%
16+
wget -O less.zip --no-check-certificate -c https://github.com/vbwagner/less/archive/master.zip
17+
rm -rf %DEPENDENCIES_SRC_DIR%\less-master %DEPENDENCIES_BIN_DIR%\less
18+
MKDIR %DEPENDENCIES_SRC_DIR%\less-master
19+
CD /D %DEPENDENCIES_SRC_DIR%
20+
7z x %DOWNLOADS_DIR%\less.zip
21+
22+
CD /D %DEPENDENCIES_SRC_DIR%\less-master
23+
IF %ARCH% == X86 (
24+
nmake -f Makefile.wnm || GOTO :ERROR
25+
) ELSE (
26+
nmake -f Makefile.wnm ARCH=%ARCH%|| GOTO :ERROR
27+
)
28+
MKDIR %DEPENDENCIES_BIN_DIR%\less
29+
cp -va *.exe %DEPENDENCIES_BIN_DIR%\less
30+
31+
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\less
32+
33+
:BUILD_WINLIBEDIT
34+
TITLE Build winlibedit
35+
CD /D %DOWNLOADS_DIR%
36+
wget --no-check-certificate -c http://netcologne.dl.sourceforge.net/project/mingweditline/wineditline-%EDITLINE_VER%.zip
37+
38+
CD /D %DEPENDENCIES_SRC_DIR%
39+
7z x %DOWNLOADS_DIR%\wineditline-%EDITLINE_VER%.zip
40+
CD /D wineditline-%EDITLINE_VER%\src
41+
CL -I. -c history.c editline.c fn_complete.c || goto :ERROR
42+
LIB /out:edit.lib *.obj || goto :ERROR
43+
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline
44+
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\include
45+
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\include\editline
46+
if %ARCH% == X64 (
47+
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\lib64
48+
COPY edit.lib %DEPENDENCIES_BIN_DIR%\wineditline\lib64
49+
) else (
50+
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\lib32
51+
COPY edit.lib %DEPENDENCIES_BIN_DIR%\wineditline\lib32
52+
)
53+
COPY editline\readline.h %DEPENDENCIES_BIN_DIR%\wineditline\include\editline
54+
55+
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\wineditline
56+
1357
:BUILD_ICONV
1458
TITLE Building iconv...
1559
CD /D %DOWNLOADS_DIR%

‎build/helpers/postgres.cmd

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,14 @@ IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO python ^=^> '%PYTHON32_PATH%'
6262
>>src\tools\msvc\config.pl ECHO xslt ^=^> '%DEPENDENCIES_BIN_DIR%\libxslt',
6363
>>src\tools\msvc\config.pl ECHO iconv ^=^> '%DEPENDENCIES_BIN_DIR%\iconv',
6464
>>src\tools\msvc\config.pl ECHO zlib ^=^> '%DEPENDENCIES_BIN_DIR%\zlib',
65-
>>src\tools\msvc\config.pl ECHO icu ^=^> '%DEPENDENCIES_BIN_DIR%\icu'
65+
>>src\tools\msvc\config.pl ECHO icu ^=^> '%DEPENDENCIES_BIN_DIR%\icu,
66+
>>src\tools\msvc\config.pl ECHO libedit ^=^> '%DEPENDENCIES_BIN_DIR%\wineditline'
6667
>>src\tools\msvc\config.pl ECHO ^};
6768
>>src\tools\msvc\config.pl ECHO 1^;
6869

70+
rem Setting pager
71+
>>src\include\pg_config.h.win32 ECHO #define DEFAULT_PAGER "less -X"
72+
6973
IF %ONE_C% == YES (
7074
mv -v contrib\fulleq\fulleq.sql.in.in contrib\fulleq\fulleq.sql.in || GOTO :ERROR
7175
)
@@ -94,6 +98,7 @@ cp -va %DEPENDENCIES_BIN_DIR%/libxslt/lib/*.dll %BUILD_DIR%\distr_%ARCH%_%PGV
9498
cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
9599
cp -va %DEPENDENCIES_BIN_DIR%/zlib/lib/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
96100
cp -va %DEPENDENCIES_BIN_DIR%/icu/bin/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
101+
cp -va %DEPENDENCIES_BIN_DIR%/less/*.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
97102

98103
REM Copy libraries headers to "include" directory for a God sake
99104
cp -va %DEPENDENCIES_BIN_DIR%/libintl/include/* %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include || GOTO :ERROR

‎build/helpers/setvars.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ 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
10+
SET EDITLINE_VER=2.101
1011

1112
REM Path vars
1213
SET PERL32_PATH=C:\Perl

0 commit comments

Comments
 (0)