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

Commit138f8fd

Browse files
committed
Fixed for postgresql 32 bit build
1 parent4c0b934 commit138f8fd

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

‎build/helpers/postgres.cmd

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ IF "%SDK%" == "MSVC2019" (
9393
>>src\tools\msvc\config.plECHO nls^=^> '%DEPENDENCIES_BIN_DIR%\libintl',
9494
>>src\tools\msvc\config.plECHO tcl^=^> undef,
9595
IF%SDK%== SDK71GOTO :DISABLE_PERL
96-
IF%ARCH%== X86GOTO :DISABLE_PERL
96+
rem IF %ARCH% == X86 GOTO :DISABLE_PERL
97+
IF%ARCH%== X86 (>>src\tools\msvc\config.plECHO perl^=^> '%PERL32_PATH%', )
9798
IF%ARCH%== X64 (>>src\tools\msvc\config.plECHO perl^=^> '%PERL64_PATH%', )
9899
GOTO :PERL_CONF_DONE
99100
:DISABLE_PERL
@@ -118,6 +119,8 @@ IF "%WITHTAPTESTS%" == "1" >>src\tools\msvc\config.pl ECHO tap_tests ^=^> 1,
118119
rem Setting pager
119120
>>src\include\pg_config.h.win32ECHO #define DEFAULT_PAGER"less -XE"
120121

122+
123+
121124
IF%ONE_C%== YES (
122125
mv -v contrib\fulleq\fulleq.sql.in.in contrib\fulleq\fulleq.sql.in||GOTO :ERROR
123126
rem With PostgresPro we'll use ICU libraries without copiing them
@@ -151,8 +154,8 @@ rm -rf %BUILD_UDIR%/distr_%ARCH%_%PGVER%/postgresql/lib/test_* || GOTO :ERROR
151154
rm -rf%BUILD_UDIR%/distr_%ARCH%_%PGVER%/postgresql/symbols/test_*||GOTO :ERROR
152155

153156
REM remove python3 extensions
154-
rm -rf%BUILD_UDIR%/distr_%ARCH%_%PGVER%/postgresql/share/extension/*python3*||GOTO :ERROR
155-
rm -rf%BUILD_UDIR%/distr_%ARCH%_%PGVER%/postgresql/lib/*python3*||GOTO :ERROR
157+
remrm -rf %BUILD_UDIR%/distr_%ARCH%_%PGVER%/postgresql/share/extension/*python3*|| GOTO :ERROR
158+
remrm -rf %BUILD_UDIR%/distr_%ARCH%_%PGVER%/postgresql/lib/*python3*|| GOTO :ERROR
156159

157160
REM remove test binaries
158161
rm -f%BUILD_UDIR%/distr_%ARCH%_%PGVER%/postgresql/bin/test_plan_lru.exe||GOTO :ERROR

‎build/helpers/setvars.cmd

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,19 @@ SET PYTHON32_PATH=C:\Python27x86
2121
SETPYTHON64_PATH=C:\Python27x64
2222
SETZIP_PATH=C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
2323
SETNSIS_PATH=C:\Program Files (x86)\NSIS
24-
SETMSYS2_PATH=C:\msys32\usr\bin
25-
rem;C:\msys64\usr\bin
24+
SETMSYS2_PATH=C:\msys64\usr\bin
25+
rem C:\msys32\usr\bin
2626
SETPATH=%PATH%;%ZIP_PATH%;%MSYS2_PATH%;%NSIS_PATH%
2727
SETPERL5LIB=.
2828

29-
IFEXIST"%PERL32_BIN%"SETPATH=%PERL32_BIN%;%PATH%
30-
IFEXIST"%PERL32_BIN%"SETPERL_EXE=%PERL32_BIN%\perl
29+
IF%ARCH%== X86SETPATH=%PERL32_BIN%;%PATH%
30+
IF%ARCH%== X86SETPERL_EXE=%PERL32_BIN%\perl.exe
31+
IF%ARCH%== X86GOTO :NOT64
32+
3133
IFEXIST"%PERL64_BIN%"SETPATH=%PERL64_BIN%;%PATH%
32-
IFEXIST"%PERL64_BIN%"SETPERL_EXE=%PERL64_BIN%\perl
34+
IFEXIST"%PERL64_BIN%"SETPERL_EXE=%PERL64_BIN%\perl.exe
35+
36+
:NOT64
3337

3438
IF%SDK%== SDK71 (
3539
SETREDIST_YEAR=2010

0 commit comments

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