Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3e3ab5b

Browse files
committed
Merge branch 'PGPRO' ofhttps://github.com/postgrespro/pgwininstall into PGPRO
2 parentsac9dba4 +acc8194 commit3e3ab5b

File tree

4 files changed

+36
-6
lines changed

4 files changed

+36
-6
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ wget --no-check-certificate -c http://repo.l.postgrespro.ru/depends/wineditline-
7171
CD /D%DEPENDENCIES_SRC_DIR%
7272
7z x%DOWNLOADS_DIR%\wineditline-%EDITLINE_VER%.zip
7373
CD /D wineditline-%EDITLINE_VER%\src
74+
patch -p2<%ROOT%/patches/wineditline/clipboard_paste.patch||goto :ERROR
7475
CL -I. -c history.c editline.c fn_complete.c||goto :ERROR
7576
LIB /out:edit.lib *.obj||goto :ERROR
7677
MKDIR%DEPENDENCIES_BIN_DIR%\wineditline
@@ -155,7 +156,8 @@ CD /D %DOWNLOADS_DIR%
155156
:BUILD_XML
156157
TITLE Building xml...
157158
CD /D%DOWNLOADS_DIR%
158-
wget -c ftp://xmlsoft.org/libxml2/libxml2-%XML_VER%.tar.gz -O libxml2-%XML_VER%.tar.gz
159+
REM wget -c ftp://xmlsoft.org/libxml2/libxml2-%XML_VER%.tar.gz -O libxml2-%XML_VER%.tar.gz
160+
wget -c http://repo.postgrespro.ru/depends/libxml2-%XML_VER%.tar.gz -O libxml2-%XML_VER%.tar.gz
159161
rm -rf%DEPENDENCIES_BIN_DIR%\libxml2%DEPENDENCIES_SRC_DIR%\libxml2-*
160162
MKDIR%DEPENDENCIES_BIN_DIR%\libxml2
161163
tar xf libxml2-%XML_VER%.tar.gz -C%DEPENDENCIES_SRC_UDIR%||GOTO :ERROR
@@ -181,7 +183,8 @@ CD /D %DOWNLOADS_DIR%
181183
:BUILD_XSLT
182184
TITLE Building xslt...
183185
CD /D%DOWNLOADS_DIR%
184-
wget -c ftp://xmlsoft.org/libxslt/libxslt-%XSLT_VER%.tar.gz -O libxslt-%XSLT_VER%.tar.gz
186+
REM wget -c ftp://xmlsoft.org/libxslt/libxslt-%XSLT_VER%.tar.gz -O libxslt-%XSLT_VER%.tar.gz
187+
wget -c http://repo.postgrespro.ru/depends/libxslt-%XSLT_VER%.tar.gz -O libxslt-%XSLT_VER%.tar.gz
185188
rm -rf%DEPENDENCIES_BIN_DIR%\libxslt%DEPENDENCIES_SRC_DIR%\libxslt-*
186189
MKDIR%DEPENDENCIES_BIN_DIR%\libxslt
187190
tar xf libxslt-%XSLT_VER%.tar.gz -C%DEPENDENCIES_SRC_UDIR%||GOTO :ERROR

‎build/helpers/postgres.cmd

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,22 @@ REM Copy needed executables
129129
cp -va%DEPENDENCIES_BIN_DIR%/openssl/lib/VC/openssl.exe%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin||GOTO :ERROR
130130
cp -va%DEPENDENCIES_BIN_DIR%/less/*.exe%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin||GOTO :ERROR
131131

132-
REM Copy libraries headers to "include" directory for a God sake
132+
REM Copy libraries headersto "include" directory for a God sake
133133
cp -va%DEPENDENCIES_BIN_DIR%/libintl/include/*%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include||GOTO :ERROR
134134
cp -va%DEPENDENCIES_BIN_DIR%/iconv/include/*%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include||GOTO :ERROR
135135
cp -va%DEPENDENCIES_BIN_DIR%/libxml2/include/*%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include||GOTO :ERROR
136136
cp -va%DEPENDENCIES_BIN_DIR%/libxslt/include/*%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include||GOTO :ERROR
137137
cp -va%DEPENDENCIES_BIN_DIR%/openssl/include/*%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include||GOTO :ERROR
138138
cp -va%DEPENDENCIES_BIN_DIR%/zlib/include/*%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include||GOTO :ERROR
139139
cp -va%DEPENDENCIES_BIN_DIR%/uuid/include/*%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include||GOTO :ERROR
140-
140+
REM Copy import libraries to "lib' directory
141+
cp -va%DEPENDENCIES_BIN_DIR%/libintl/lib/*.lib%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib||GOTO :ERROR
142+
cp -va%DEPENDENCIES_BIN_DIR%/iconv/lib/*.lib%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib||GOTO :ERROR
143+
cp -va%DEPENDENCIES_BIN_DIR%/libxml2/lib/libxml2.lib%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib||GOTO :ERROR
144+
cp -va%DEPENDENCIES_BIN_DIR%/libxslt/lib/*t.lib%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib||GOTO :ERROR
145+
cp -va%DEPENDENCIES_BIN_DIR%/openssl/lib/VC/*eay32.lib%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib||GOTO :ERROR
146+
cp -va%DEPENDENCIES_BIN_DIR%/zlib/lib/zdll.lib%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib||GOTO :ERROR
147+
cp -va%DEPENDENCIES_BIN_DIR%/uuid/lib/uuid.lib%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib||GOTO :ERROR
141148
rem Copy msys shell and sed
142149
CD /D%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin
143150
ifexist pgpro_upgrade 7z x%DOWNLOADS_DIR%\min_msys_%ARCH%.zip

‎build/helpers/setvars.cmd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SET OPENSSL_VER=1.0.2n
77
SETGETTEXT_VER=0.19.8
88
SETLIBSSH2_VER=1.6.0
99
SETWXWIDGETS_VER=3.0.2
10-
SETEDITLINE_VER=2.102
10+
SETEDITLINE_VER=2.205
1111
SETZSTD_RELEASE=1.1.0
1212

1313
SETPG_REPACK_VER=1.4.2
@@ -72,7 +72,7 @@ SET PGVER=%PG_DEF_VERSION%
7272
IF"%PGURL%"=="" (
7373
IF"%PRODUCT_NAME%"==""SETPGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"
7474
IF"%PRODUCT_NAME%"=="PostgreSQL"SETPGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"
75-
IF"%PRODUCT_NAME%"=="PostgresPro"SETPGURL="http://repo.l.postgrespro.ru/pgpro-%PG_MAJOR_VERSION%-beta/src/postgrespro-%PGVER%.tar.bz2"
75+
IF"%PRODUCT_NAME%"=="PostgresPro"SETPGURL="http://repo.l.postgrespro.ru/pgpro-%PG_MAJOR_VERSION%-beta/src/postgrespro-standard-%PGVER%.tar.bz2"
7676
)
7777

7878
REM Set useful directories paths so they're used in scripts
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/src/editline.c b/src/editline.c
2+
index 27b3c80..008b234 100644
3+
--- a/src/editline.c
4+
+++ b/src/editline.c
5+
@@ -1113,7 +1113,14 @@ char *readline(const char *prompt)
6+
return NULL;
7+
}
8+
if (count) {
9+
- if ((irBuffer.EventType == KEY_EVENT) && irBuffer.Event.KeyEvent.bKeyDown) {
10+
+ if ((irBuffer.EventType == KEY_EVENT) /* && irBuffer.Event.KeyEvent.bKeyDown */) {
11+
+ if (!irBuffer.Event.KeyEvent.bKeyDown && irBuffer.Event.KeyEvent.wVirtualKeyCode != VK_MENU) {
12+
+ if (!ReadConsoleInput(_el_h_in, &irBuffer, 1, &count)) {
13+
+ _el_clean_exit();
14+
+ return NULL;
15+
+ }
16+
+ continue;
17+
+ }
18+
/*
19+
the user pressed a key
20+
*/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp