Added modifications neccessary to link postgres with winlibedit and less as pager. Use postgres from PGPRO_winedit branch

vbwagner · vbwagner · commit fe504e28d23b · 2016-03-20T22:17:01.000+03:00
diff --git a/build/helpers/dependencies.cmd b/build/helpers/dependencies.cmd
@@ -10,6 +10,50 @@ rm -rf %DEPENDENCIES_SRC_DIR%
 MKDIR %DEPENDENCIES_SRC_DIR%
 MKDIR %DOWNLOADS_DIR%
 
+:BUILD_LESS
+TITLE "Building less"
+CD /D %DOWNLOADS_DIR%
+wget -O less.zip --no-check-certificate -c https://github.com/vbwagner/less/archive/master.zip
+rm -rf %DEPENDENCIES_SRC_DIR%\less-master %DEPENDENCIES_BIN_DIR%\less
+MKDIR %DEPENDENCIES_SRC_DIR%\less-master
+CD /D %DEPENDENCIES_SRC_DIR%
+7z x %DOWNLOADS_DIR%\less.zip
+
+CD /D %DEPENDENCIES_SRC_DIR%\less-master
+IF %ARCH% == X86 (
+   nmake -f Makefile.wnm || GOTO :ERROR
+) ELSE (
+   nmake -f Makefile.wnm  ARCH=%ARCH%|| GOTO :ERROR
+)
+MKDIR %DEPENDENCIES_BIN_DIR%\less
+cp -va *.exe %DEPENDENCIES_BIN_DIR%\less
+
+7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\less
+
+:BUILD_WINLIBEDIT
+TITLE Build winlibedit
+CD /D %DOWNLOADS_DIR%
+wget --no-check-certificate -c http://netcologne.dl.sourceforge.net/project/mingweditline/wineditline-%EDITLINE_VER%.zip
+
+CD /D %DEPENDENCIES_SRC_DIR%
+7z x %DOWNLOADS_DIR%\wineditline-%EDITLINE_VER%.zip
+CD /D wineditline-%EDITLINE_VER%\src
+CL -I. -c history.c editline.c fn_complete.c || goto :ERROR
+LIB /out:edit.lib *.obj || goto :ERROR
+MKDIR %DEPENDENCIES_BIN_DIR%\wineditline
+MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\include 
+MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\include\editline
+if %ARCH% == X64 (
+   MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\lib64
+   COPY edit.lib %DEPENDENCIES_BIN_DIR%\wineditline\lib64
+) else (
+   MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\lib32
+   COPY edit.lib %DEPENDENCIES_BIN_DIR%\wineditline\lib32
+)
+COPY editline\readline.h %DEPENDENCIES_BIN_DIR%\wineditline\include\editline
+
+7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\wineditline
+
 :BUILD_ICONV
 TITLE Building iconv...
 CD /D %DOWNLOADS_DIR%
diff --git a/build/helpers/postgres.cmd b/build/helpers/postgres.cmd
@@ -62,10 +62,14 @@ IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO python  ^=^> '%PYTHON32_PATH%'
 >>src\tools\msvc\config.pl ECHO xslt    ^=^> '%DEPENDENCIES_BIN_DIR%\libxslt',
 >>src\tools\msvc\config.pl ECHO iconv   ^=^> '%DEPENDENCIES_BIN_DIR%\iconv',
 >>src\tools\msvc\config.pl ECHO zlib    ^=^> '%DEPENDENCIES_BIN_DIR%\zlib',
->>src\tools\msvc\config.pl ECHO icu     ^=^> '%DEPENDENCIES_BIN_DIR%\icu'
+>>src\tools\msvc\config.pl ECHO icu     ^=^> '%DEPENDENCIES_BIN_DIR%\icu,
+>>src\tools\msvc\config.pl ECHO libedit ^=^> '%DEPENDENCIES_BIN_DIR%\wineditline'
 >>src\tools\msvc\config.pl ECHO ^};
 >>src\tools\msvc\config.pl ECHO 1^;
 
+rem Setting pager
+>>src\include\pg_config.h.win32 ECHO #define DEFAULT_PAGER "less -X"
+
 IF %ONE_C% == YES (
   mv -v contrib\fulleq\fulleq.sql.in.in contrib\fulleq\fulleq.sql.in || GOTO :ERROR
 )
@@ -94,6 +98,7 @@ cp -va %DEPENDENCIES_BIN_DIR%/libxslt/lib/*.dll    %BUILD_DIR%\distr_%ARCH%_%PGV
 cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
 cp -va %DEPENDENCIES_BIN_DIR%/zlib/lib/*.dll       %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
 cp -va %DEPENDENCIES_BIN_DIR%/icu/bin/*.dll        %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
+cp -va %DEPENDENCIES_BIN_DIR%/less/*.exe           %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
 
 REM Copy libraries headers to "include" directory for a God sake
 cp -va %DEPENDENCIES_BIN_DIR%/libintl/include/*  %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include || GOTO :ERROR
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -7,6 +7,7 @@ SET OPENSSL_VER=1.0.2g
 SET GETTEXT_VER=0.19.4
 SET LIBSSH2_VER=1.6.0
 SET WXWIDGETS_VER=3.0.2
+SET EDITLINE_VER=2.101
 
 REM Path vars
 SET PERL32_PATH=C:\Perl
