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

Commit6f4d186

Browse files
committed
Fix merge error
2 parents7e604a0 +4bd6410 commit6f4d186

File tree

13 files changed

+171
-49
lines changed

13 files changed

+171
-49
lines changed

‎build/helpers/pgadmin.cmd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ IF NOT EXIST libssh2.patch GOTO :DONE_PGADMIN_LIBSSH2_PATCH
8686
patch -f -p0< libssh2.patch||GOTO :ERROR
8787
:DONE_PGADMIN_LIBSSH2_PATCH
8888

89+
REM Update RU po
90+
wget --no-check-certificate -c https://repo.postgrespro.ru/depends/pgadmin3-1.22.1.po -O i18n/ru_RU/pgadmin3.po
91+
wget --no-check-certificate -c https://repo.postgrespro.ru/depends/pgadmin3-ru_RU.tar.bz2 -O docs/ru_RU.tar.bz2
92+
tar xf docs/ru_RU.tar.bz2 -C docs/ru_RU||GOTO :ERROR
93+
rm -f docs/ru_RU.tar.bz2
94+
8995
IF%ARCH%== X64 sed -i 's/Win32/x64/g' xtra\png2c\png2c.vcxproj
9096
IF%ARCH%== X64 sed -i 's/Win32/x64/g' pgadmin\pgAdmin3.vcxproj
9197
sed -i"/<Bscmake>/,/<\/Bscmake>/d" pgadmin\pgAdmin3.vcxproj

‎build/helpers/postgres.cmd

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ IF %ONE_C% == YES (
3030
)
3131
)
3232

33-
cp -va%ROOT%/patches/postgresql/%PGVER%/series .
34-
IFNOTEXIST seriesGOTO :DONE_POSTGRESQL_PATCH
35-
FOR /F%%IIN (series)do (
36-
ECHO%%I
37-
cp -va%ROOT%/patches/postgresql/%PGVER%/%%I .
38-
patch -p1<%%I||GOTO :ERROR
33+
if"%PRODUCT_NAME%"=="PostgreSQL" (
34+
cp -va%ROOT%/patches/postgresql/%PG_MAJOR_VERSION%/series .
35+
IFNOTEXIST seriesGOTO :DONE_POSTGRESQL_PATCH
36+
FOR /F%%IIN (series)do (
37+
ECHO%%I
38+
cp -va%ROOT%/patches/postgresql/%PG_MAJOR_VERSION%/%%I .
39+
patch -p1<%%I||GOTO :ERROR
40+
)
3941
)
4042

4143
:DONE_POSTGRESQL_PATCH
@@ -122,8 +124,15 @@ rem cp -va html/* %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\doc
122124

123125
rem download help sources
124126
CD /D%DOWNLOADS_DIR%
125-
wget --no-check-certificate -c http://repo.postgrespro.ru/pgpro-9.5-beta/src/help-sources-en.zip||GOTO :ERROR
126-
wget --no-check-certificate -c http://repo.postgrespro.ru/pgpro-9.5-beta/src/help-sources-ru.zip||GOTO :ERROR
127+
SETWGET=wget --no-check-certificate
128+
SETDOCURL=http://repo.postgrespro.ru/doc
129+
130+
if"%PRODUCT_NAME%"=="PostgresPro"%WGET% -O help-sources-en.zip%DOCURL%/pgpro/9.5/en/help-sources.zip||GOTO :ERROR
131+
if"%PRODUCT_NAME%"=="PostgresPro"%WGET% -O help-sources-ru.zip%DOCURL%/pgpro/9.5/ru/help-sources.zip||GOTO :ERROR
132+
if"%PRODUCT_NAME%"=="PostgresProEnterprise"%WGET% -O help-sources-en.zip%DOCURL%/pgproee/9.5/en/help-sources.zip||GOTO :ERROR
133+
if"%PRODUCT_NAME%"=="PostgresProEnterprise"%WGET% -O help-sources-ru.zip%DOCURL%/pgproee/9.5/ru/help-sources.zip||GOTO :ERROR
134+
if"%PRODUCT_NAME%"=="PostgreSQL"%WGET% -O help-sources-en.zip%DOCURL%/pgsql/9.5/en/help-sources.zip||GOTO :ERROR
135+
if"%PRODUCT_NAME%"=="PostgreSQL"%WGET% -O help-sources-ru.zip%DOCURL%/pgsql/9.5/ru/help-sources.zip||GOTO :ERROR
127136

128137
rem building help files
129138
CD /D%BUILD_DIR%\postgresql

‎build/helpers/postgres_nsis_installer.cmd

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ IF "%PRODUCT_NAME%" == "" SET PRODUCT_NAME=PostgresPro
1717
SETPRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%
1818
SETOLD_PRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PG_MAJOR_VERSION%
1919

20+
REM Set Service-Id
21+
SETPG_DEF_SERVICEID="postgresql-%ARCH%-%PG_MAJOR_VERSION%"
22+
IF"%PRODUCT_NAME%"=="PostgreSQL"SETPG_DEF_SERVICEID="postgresql-%ARCH%-%PG_MAJOR_VERSION%"
23+
IF"%PRODUCT_NAME%"=="PostgresPro"SETPG_DEF_SERVICEID="postgrespro-%ARCH%-%PG_MAJOR_VERSION%"
24+
IF"%PRODUCT_NAME%"=="PostgresProEnterprise"SETPG_DEF_SERVICEID="postgrespro-enterprise-%ARCH%-%PG_MAJOR_VERSION%"
25+
2026
IF%ONE_C%== YES (
2127
SETPRODUCT_NAME=PostgresPro 1C
2228
SETPG_DEF_SERVICEID="postgrespro-1C-${PRODUCT_VERSION}"
@@ -26,7 +32,6 @@ IF %ONE_C% == YES (
2632
SETPRODUCT_DIR_REGKEY="Software\Postgres Professional\${PRODUCT_NAME}\${PRODUCT_VERSION}"
2733
SETPRODUCT_VERSION="%PG_MAJOR_VERSION%"
2834
)ELSE (
29-
SETPG_DEF_SERVICEID="postgresql-%ARCH%-%PG_MAJOR_VERSION%"
3035
SETPG_INS_SUFFIX="%ARCH%bit_Setup.exe"
3136
SETPG_REG_KEY="%PRODUCT_DIR_REGKEY%\Installations\postgresql-%PG_MAJOR_VERSION%"
3237
SETPG_REG_SERVICE_KEY="%PRODUCT_DIR_REGKEY%\Services\postgresql-%PG_MAJOR_VERSION%"

‎build/run.cmd

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ IF DEFINED USG (
4343

4444
REM Set PostgreSQL version
4545
IF"%PG_MAJOR_VERSION%"==""SETPG_MAJOR_VERSION=9.5
46-
IF"%PG_PATCH_VERSION%"==""SETPG_PATCH_VERSION=4
46+
IF"%PG_PATCH_VERSION%"==""SETPG_PATCH_VERSION=5
4747

4848
REM Set PgAdmin3 Version
4949
SETPGADMIN_VERSION=1.22.1
@@ -69,65 +69,74 @@ FOR %%i in ("%~dp0..") do set "ROOT=%%~fi"
6969
IF"%~1"=="1" (
7070
TITLE Building dependencies
7171
IF"%SDK%"==""SETSDK=SDK71
72-
CMD.EXE /C%ROOT%\build\helpers\dependencies.cmd
72+
CMD.EXE /C%ROOT%\build\helpers\dependencies.cmd||GOTO :ERROR
7373
)
7474

7575
IF"%~1"=="2" (
7676
TITLE Building PostgreSQL
7777
IF"%SDK%"==""SETSDK=SDK71
78-
CMD.EXE /C%ROOT%\build\helpers\postgres.cmd
78+
CMD.EXE /C%ROOT%\build\helpers\postgres.cmd||GOTO :ERROR
7979
)
8080

8181
IF"%~1"=="12" (
8282
TITLE Building PostgresPro
8383
IF"%SDK%"==""SETSDK=SDK71
8484
IF"%PRODUCT_NAME%"==""SETPRODUCT_NAME=PostgresPro
85-
SETPG_PATCH_VERSION=4.1
86-
CMD.EXE /C%ROOT%\build\helpers\postgres.cmd
85+
SETPG_PATCH_VERSION=5.1
86+
CMD.EXE /C%ROOT%\build\helpers\postgres.cmd||GOTO :ERROR
8787
)
8888

8989
IF"%~1"=="3" (
9090
TITLE Building PostgreSQL installer
9191
IF"%SDK%"==""SETSDK=SDK71
92-
CMD.EXE /C%ROOT%\build\helpers\postgres_installer.cmd
92+
CMD.EXE /C%ROOT%\build\helpers\postgres_installer.cmd||GOTO :ERROR
9393
)
9494

9595
IF"%~1"=="13" (
9696
TITLE Building PostgresPro installer
9797
IF"%SDK%"==""SETSDK=SDK71
9898
IF"%PRODUCT_NAME%"==""SETPRODUCT_NAME=PostgresPro
99-
SETPG_PATCH_VERSION=4.1
100-
CMD.EXE /C%ROOT%\build\helpers\postgres_installer.cmd
99+
SETPG_PATCH_VERSION=5.1
100+
CMD.EXE /C%ROOT%\build\helpers\postgres_installer.cmd||GOTO :ERROR
101101
)
102102

103103
IF"%~1"=="4" (
104104
TITLE Building PgAdmin
105105
IF"%SDK%"==""SETSDK=SDK71
106-
CMD.EXE /C%ROOT%\build\helpers\pgadmin.cmd
106+
CMD.EXE /C%ROOT%\build\helpers\pgadmin.cmd||GOTO :ERROR
107107
)
108108

109109
IF"%~1"=="5" (
110110
TITLE Building PgAdmin installer
111111
IF"%SDK%"==""SETSDK=SDK71
112-
CMD.EXE /C%ROOT%\build\helpers\pgadmin_installer.cmd
112+
CMD.EXE /C%ROOT%\build\helpers\pgadmin_installer.cmd||GOTO :ERROR
113113
)
114114

115115
IF"%~1"=="6" (
116116
TITLE Making Archives
117-
CMD.EXE /C%ROOT%\build\helpers\make_zip.cmd
117+
CMD.EXE /C%ROOT%\build\helpers\make_zip.cmd||GOTO :ERROR
118118
)
119119

120120
IF"%~1"=="7" (
121121
TITLE Build PGBouncer
122-
CMD.EXE /C%ROOT%\build\helpers\pgbouncer.cmd
122+
CMD.EXE /C%ROOT%\build\helpers\pgbouncer.cmd||GOTO :ERROR
123123
)
124124

125125
IF"%~1"=="8" (
126126
TITLE Build psqlODBC
127-
CMD.EXE /C%ROOT%\build\helpers\pgodbc.cmd
127+
CMD.EXE /C%ROOT%\build\helpers\pgodbc.cmd||GOTO :ERROR
128128
)
129129

130130
IF"%~1"=="9" (
131131
TITLE Build psqlODBC installer
132-
CMD.EXE /C%ROOT%\build\helpers\pgodbc_nsis_installer.cmd
132+
CMD.EXE /C%ROOT%\build\helpers\pgodbc_nsis_installer.cmd||GOTO :ERROR
133133
)
134+
135+
GOTO :DONE
136+
137+
:ERROR
138+
ECHO Failed with error #%errorlevel%.
139+
EXIT /b%errorlevel%
140+
141+
:DONE
142+
ECHO Done.

‎nsis/installation-notes-ru.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@
3232
</style>
3333
</head>
3434
<bodylang="ru-RU"dir="ltr">
35-
<h1>Установка<spanlang="en-US">Posgre Pro</span> для<spanlang="en-US">Windows</span></h1>
35+
<h1>Установка<spanlang="en-US">Postgres Pro (PostgreSQL)</span> для<spanlang="en-US">Windows</span></h1>
3636
<h2class="western">Замечания по установке</h2>
3737
<h3class="western">Поддерживаемые операционные системы</h3>
3838
<p>Данная версия<spanlang="en-US">Postgres Pro</span>сервера может
3939
быть установлена на компьютеры с ОС<spanlang="en-US">Windows XP SP3
40-
</span>и выше. 64-разрядная версия<spanlang="en-US">PosgreSQL
41-
</span>сервера может быть установлена только на 64 разрядную версию
42-
<spanlang="en-US">Windows.</span></p>
40+
</span>и выше. 64-разрядная версия сервера может быть установлена
41+
только на 64 разрядную версию<spanlang="en-US">Windows.</span></p>
4342
<h3class="western">Параметры установки</h3>
4443
<p>Вначале предлагается задать параметры установки сервера. Можно
4544
выбрать компоненты, которые будут установлены.</p>
@@ -160,7 +159,7 @@
160159
будут закрыты. Папка с данными не удаляется. Перезагрузка компьютера
161160
не требуется.</span></p>
162161
<palign="center">Подготовлено<ahref="http://postgrespro.ru/">Postgres
163-
Профессиоальный</a>
162+
Профессиональный</a>
164163
</p>
165164
</body>
166165
</html>

‎nsis/postgresql.nsi

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,11 @@ Section $(PostgreSQLString) sec1
249249
${Else}
250250
StrCpy$Chcp_text""
251251
${Endif}
252-
252+
253+
${if}${PRODUCT_NAME}=="PostgreSQL"
254+
StrCpy$Chcp_text""
255+
${endif}
256+
253257
DetailPrint"Set codepage $Codepage_text"
254258

255259
FileOpen$0$INSTDIR\scripts\runpgsql.bat w
@@ -332,7 +336,7 @@ Section $(PostgreSQLString) sec1
332336
pop$0
333337
CreateDirectory"$SMPROGRAMS\$StartMenuFolder\Documentation"
334338

335-
${if}${PRODUCT_NAME}!="PostgreSQL"
339+
${if}${PG_MAJOR_VERSION}!="9.4"
336340
!insertmacro CreateInternetShortcut \
337341
"$SMPROGRAMS\$StartMenuFolder\Documentation\Installation notes" \
338342
"$INSTDIR\doc\installation-notes.html" \

‎nsis/translates.nsi

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
LangString PostgreSQLString${LANG_ENGLISH}"PostgreSQL server"
2-
LangString PostgreSQLString${LANG_RUSSIAN}"PostgreSQL ñåðâåð"
2+
LangString PostgreSQLString${LANG_RUSSIAN}"Ñåðâåð PostgreSQL"
33

44
LangString DATADIR_MESS${LANG_ENGLISH}"Please select a directory under which to store your data"
55
LangString DATADIR_MESS${LANG_RUSSIAN}"Áàçû äàííûõ áóäóò óñòàíîâëåíû â ñëåäóþùèé êàòàëîã"
66

77
LangString DATADIR_TITLE${LANG_ENGLISH}"Data directory"
8-
LangString DATADIR_TITLE${LANG_RUSSIAN}"Êàòàëîãäëÿ óñòàíîâêè áàçäàííûõ"
8+
LangString DATADIR_TITLE${LANG_RUSSIAN}"Êàòàëîã äàííûõ"
99

1010
LangString BROWSE_BUTTON${LANG_ENGLISH}"Browse ..."
1111
LangString BROWSE_BUTTON${LANG_RUSSIAN}"Îáçîð ..."
1212

1313
LangString DESC_SecMS${LANG_ENGLISH}"Install run-time components that are required to run C++ applications"
14-
LangString DESC_SecMS${LANG_RUSSIAN}"Êîìïîíåíòû ñðåäû âûïîëíåíèÿ, íåîáõîäèìûå äëÿ âûïîëíåíèÿ ïðèëîæåíèé"
14+
LangString DESC_SecMS${LANG_RUSSIAN}"Êîìïîíåíòû ñðåäû âûïîëíåíèÿ, íåîáõîäèìûå äëÿ âûïîëíåíèÿ ïðèëîæåíèé C++"
1515

1616
LangString DESC_Sec1${LANG_ENGLISH}"Install PostgreSQL server on this computer"
1717
LangString DESC_Sec1${LANG_RUSSIAN}"Óñòàíîâêà ñåðâåðà PostgreSQL íà ýòîò êîìïüþòåð"
@@ -20,7 +20,7 @@ LangString PostgreSQLString ${LANG_RUSSIAN} "PostgreSQL
2020
LangString DESC_PgAdmin${LANG_RUSSIAN}"Óñòàíîâêà pgAdmin äëÿ óïðàâëåíèÿ ñåðâåðîì"
2121

2222
LangString DESC_Sec1dir${LANG_ENGLISH}"Please specify the directory where PostgreSQL will be installed"
23-
LangString DESC_Sec1die${LANG_RUSSIAN}"Ïîæàëóéñòà, çàäàéòåäèðåêòîðèþ äëÿ óñòàíîâêè PostgreSQL"
23+
LangString DESC_Sec1die${LANG_RUSSIAN}"Ïîæàëóéñòà, çàäàéòåêàòàëîã, êóäà áóäåò óñòàíîâëåí PostgreSQL"
2424

2525
LangString SERVER_SET_TITLE${LANG_ENGLISH}"Server options"
2626
LangString SERVER_SET_TITLE${LANG_RUSSIAN}"Ïàðàìåòðû ñåðâåðà"
@@ -29,36 +29,36 @@ LangString PostgreSQLString ${LANG_RUSSIAN} "PostgreSQL
2929
LangString SERVER_SET_SUBTITLE${LANG_RUSSIAN}"Ïîæàëóéñòà, çàäàéòå ïàðàìåòðû ñåðâåðà"
3030

3131
LangString SERVER_EXIST_TITLE${LANG_ENGLISH}"Existing installation"
32-
LangString SERVER_EXIST_TITLE${LANG_RUSSIAN}"Óæå èìååòñÿ óñòàíîâêà ñåðâåðà"
32+
LangString SERVER_EXIST_TITLE${LANG_RUSSIAN}"Ñóùåñòâóþùàÿ èíñòàëëÿöèÿ"
3333

3434
LangString SERVER_EXIST_TEXT1${LANG_ENGLISH}"An existing PostgresSQL installation has been found at"
35-
LangString SERVER_EXIST_TEXT1${LANG_RUSSIAN}"Íàéäåíàóñòàíîâêà ñåðâåðà PostgresSQL âäèðåêòîðèè"
35+
LangString SERVER_EXIST_TEXT1${LANG_RUSSIAN}"Íàéäåíàèíñòàëëÿöèÿ ñåðâåðà PostgresSQL âêàòàëîãå"
3636

3737
LangString SERVER_EXIST_TEXT2${LANG_ENGLISH}"This instalation will be upgraded.$\n$\nIn order to upgrade, we may need to restart the server"
38-
LangString SERVER_EXIST_TEXT2${LANG_RUSSIAN}"Ýòà óñòàíîâêà áóäåò îáíîâëåíà.$\n$\nÂî âðåìÿ îáíîâëåíèÿïîòðåáóåòñÿ ïåðåçàïóñê ñëóæáû ñåðâåðà"
38+
LangString SERVER_EXIST_TEXT2${LANG_RUSSIAN}"Ýòà óñòàíîâêà áóäåò îáíîâëåíà.$\n$\nÄëÿ çàâåðøåíèÿ îáíîâëåíèÿìîæåò ïîòðåáîâàòüñÿ ïåðåçàïóñòèòü ñåðâåð"
3939

4040
LangString DATADIR_EXIST_TITLE${LANG_ENGLISH}"Existing data directory"
41-
LangString DATADIR_EXIST_TITLE${LANG_RUSSIAN}"Óæå èìååòñÿäèðåêòîðèÿ ñ äàííûìè"
41+
LangString DATADIR_EXIST_TITLE${LANG_RUSSIAN}"Óæå èìååòñÿêàòàëîã ñ äàííûìè"
4242

4343
LangString DATADIR_EXIST_TEXT1${LANG_ENGLISH}"An existing data directory installation has been found at $DATA_DIR , port $TextPort_text . This directory will be used for this installation."
44-
LangString DATADIR_EXIST_TEXT1${LANG_RUSSIAN}"Óæå èìååòñÿäèðåêòîðèÿ ñ äàííûìè $DATA_DIR , ïîðò $TextPort_text .Ýòà äèðåêòîðèÿ áóäåòèñïîëüçîâàíà äëÿýòîé óñòàíîâêè ñåðâåðà."
44+
LangString DATADIR_EXIST_TEXT1${LANG_RUSSIAN}"Óæå èìååòñÿêàòàëîã ñ äàííûìè $DATA_DIR , ïîðò $TextPort_text .Ýòîò êàòàëîã áóäåòèñïîëüçîâàí äëÿäàííîé èíñòàëëÿöèè ñåðâåðà."
4545

4646
LangString DATADIR_EXIST_ERROR1${LANG_ENGLISH}"An existing file with name $DATA_DIR has been found. Can not create directory with this name"
47-
LangString DATADIR_EXIST_ERROR1${LANG_RUSSIAN}"Ýòà äèðåêòîðèÿ è åå êîíôèãóðàöèÿ áóäåò èñïîëüçîâàíà äëÿ ýòîé óñòàíîâêè ñåðâåðà"
47+
LangString DATADIR_EXIST_ERROR1${LANG_RUSSIAN}"Íàéäåí ôàéë ñ èìåíåì $DATA_DIR. Ñîçäàòü êàòàëîã ñ ýòèì èìåíåì íåâîçìîæíî"
4848

4949
LangString UNINSTALL_END${LANG_ENGLISH}"Uninstallation has been ended.$\n$\nPerhaps you need to restart your computer as service '$ServiceID_text' exists.$\n$\nThe data directory has not been removed:"
50-
LangString UNINSTALL_END${LANG_RUSSIAN}"ÓäàëåíèåPostgreSQL ñåðâåðà îêîí÷åíî.$\n$\nÂîçìîæíî, âàìíóæíî áóäåòïåðåçàãðóçèòü êîìïüþòåð,åñëè ñåðâèñ'$ServiceID_text' ñóùåñòâóåò.$\n$\nÄèðåêòîðèÿ ñ äàííûìè íåóäàëåíà:"
50+
LangString UNINSTALL_END${LANG_RUSSIAN}"Óäàëåíèåçàâåðøåíî.$\n$\nÂîçìîæíî, âàìïîòðåáóåòñÿïåðåçàãðóçèòü êîìïüþòåð,òàê êàê ñóùåñòâóåò ñëóæáà'$ServiceID_text'.$\n$\nÊàòàëîã ñ äàííûìè íåóäàë¸í:"
5151

5252

5353
LangString MESS_PASS1${LANG_ENGLISH}"Passwords Do Not Match!"
54-
LangString MESS_PASS1${LANG_RUSSIAN}"Ââåäåííûå ïàðîëü èïîäòâòåðæäåíèå ðàçëè÷àþòñÿ!"
54+
LangString MESS_PASS1${LANG_RUSSIAN}"Ââåäåííûå ïàðîëü èïîäòâåðæäåíèå ðàçëè÷àþòñÿ!"
5555

5656
LangString MESS_PASS2${LANG_ENGLISH}"You do not enter a password! Do you confirm the installation without a password?"
5757
LangString MESS_PASS2${LANG_RUSSIAN}"Âû íå ââåëè ïàðîëü!$\n$\nÏîäòâåðæäàåòå óñòàíîâêó áåç ïàðîëÿ?"
5858

5959
LangString MESS_PASS3${LANG_ENGLISH}"You entered the password with non-Latin characters. Do you wish use that password?"
6060
LangString MESS_PASS3${LANG_RUSSIAN}"Âû èñïîëüçîâàëè â ïàðîëå íåëàòèíñêèå ñèìâîëû. Ýòî ìîæåò âûçâàòü \
61-
ïðîáëåìû ñ ââîäîì ïàðîëÿ! Ïðîäîëæèòü"
61+
ïðîáëåìû ñ ââîäîì ïàðîëÿ! Ïðîäîëæèòü?"
6262

6363

6464
LangString DLG_PORT${LANG_ENGLISH}"Port:"
@@ -68,13 +68,13 @@ LangString PostgreSQLString ${LANG_RUSSIAN} "PostgreSQL
6868
LangString DLG_ADR1${LANG_RUSSIAN}"Àäðåñà:"
6969

7070
LangString DLG_ADR2${LANG_ENGLISH}"Allow connections from any IP address:"
71-
LangString DLG_ADR2${LANG_RUSSIAN}"Ïîääåðæèâàòü ïîäñîåäèíåíèÿ ñ ëþáûõ IPàäðåñîâ:"
71+
LangString DLG_ADR2${LANG_RUSSIAN}"Ðàçðåøàòü ïîäêëþ÷åíèÿ ñ ëþáûõ IP-àäðåñîâ:"
7272

7373
LangString DLG_LOCALE${LANG_ENGLISH}"Locale:"
7474
LangString DLG_LOCALE${LANG_RUSSIAN}"Ëîêàëü:"
7575

7676
LangString DLG_SUPERUSER${LANG_ENGLISH}"Super user:"
77-
LangString DLG_SUPERUSER${LANG_RUSSIAN}"Ñóïåð ïîëüçîâàòåëü:"
77+
LangString DLG_SUPERUSER${LANG_RUSSIAN}"Ñóïåð- ïîëüçîâàòåëü:"
7878

7979
LangString DLG_PASS1${LANG_ENGLISH}"Password:"
8080
LangString DLG_PASS1${LANG_RUSSIAN}"Ïàðîëü:"
@@ -86,8 +86,8 @@ LangString PostgreSQLString ${LANG_RUSSIAN} "PostgreSQL
8686
The server will allocate more memory. \
8787
The parameters are written to the file $DATA_DIR\postgresql.conf"
8888

89-
LangString DLG_OPT1${LANG_RUSSIAN}"Ìîæíî ïðîâåñòè îïòèìèçàöèþ ïðîèçâîäèòåëüíîñòè ñåðâåðà èñõîäÿ èçîáúåìà óñòàíîâëåííîé ïàìÿòè $AllMemMb. \
90-
Cåðâåðó áóäåò âûäåëåíî áîëüøå îïåðàòèâíîé ïàìÿòè. \
89+
LangString DLG_OPT1${LANG_RUSSIAN}"Ìîæíî ïðîâåñòè îïòèìèçàöèþ ïðîèçâîäèòåëüíîñòè ñåðâåðà, èñõîäÿ èçîáú¸ìà óñòàíîâëåííîé ïàìÿòè $AllMemÌÁ. \
90+
Ñåðâåðó áóäåò âûäåëåíî áîëüøå îïåðàòèâíîé ïàìÿòè. \
9191
Ïàðàìåòðû áóäóò çàïèñàíû â ôàéë $DATA_DIR\postgresql.conf"
9292

9393
LangString DLG_ENVVAR${LANG_ENGLISH}"Set up environment variables"
@@ -107,7 +107,7 @@ C
107107

108108

109109
LangString MESS_STOP_SERVER${LANG_ENGLISH}"Previous installation was found.$\n$\nIn order to upgrade the service needs to restart!$\n$\nContinue?"
110-
LangString MESS_STOP_SERVER${LANG_RUSSIAN}"Îáíàðóæåíà ïðåäûäóùàÿ èíñòàëëÿöèÿ.$\n$\nÄëÿòîãî, ÷òîáû îáíîâèòüñÿ,ïîòðåáóåòñÿïåðåçàïóñòèòü ñåðâèñ.$\n$\nÏðîäîëæèòü?"
110+
LangString MESS_STOP_SERVER${LANG_RUSSIAN}"Îáíàðóæåíà ïðåäûäóùàÿ èíñòàëëÿöèÿ.$\n$\nÄëÿîáíîâëåíèÿ ñëóæáûïîòðåáóåòñÿïåðåçàãðóçêà.$\n$\nÏðîäîëæèòü?"
111111

112112
LangString MESS_ERROR_SERVER${LANG_ENGLISH}"An error occurred while initializing the server! Perhaps Server service failed to start."
113-
LangString MESS_ERROR_SERVER${LANG_RUSSIAN}"Âîçíèêëà îøèáêà ïðèèíèöèàëèçàöèè ñåðâåðà! Âîçìîæíî ñëóæáà ñåðâåðà íå ñìîãëà çàïóñòèòüñÿ."
113+
LangString MESS_ERROR_SERVER${LANG_RUSSIAN}"Ïðèèíèöèàëèçàöèè ñåðâåðà ïðîèçîøëà îøèáêà! Âîçìîæíî, ñëóæáà ñåðâåðà íå ñìîãëà çàïóñòèòüñÿ."

‎patches/postgresql/9.4/perl522.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
2+
index d7638b4..ccf1f76 100644
3+
--- a/src/tools/msvc/MSBuildProject.pm
4+
+++ b/src/tools/msvc/MSBuildProject.pm
5+
@@ -345,6 +345,9 @@ EOF
6+
$d =~ s/__CFGNAME__/$cfgname/g;
7+
print $f " <ModuleDefinitionFile>$d</ModuleDefinitionFile>\n";
8+
}
9+
+if ($self->{name} =~ /plperl/ and $self->{platform} eq 'Win32') {
10+
+print $f " <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\n";
11+
+}
12+
print $f <<EOF;
13+
</Link>
14+
<ResourceCompile>
15+
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
16+
index 21faa58..7012bfa 100644
17+
--- a/src/tools/msvc/Mkvcbuild.pm
18+
+++ b/src/tools/msvc/Mkvcbuild.pm
19+
@@ -572,8 +578,8 @@ sub mkvcbuild
20+
}
21+
$plperl->AddReference($postgres);
22+
my @perl_libs =
23+
- grep { /perl\d+.lib$/ }
24+
- glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');
25+
+ grep { /perl\d+\.(lib|a)$/ }
26+
+ glob($solution->{options}->{perl} . '\lib\CORE\*.*');
27+
if (@perl_libs == 1)
28+
{
29+
$plperl->AddLibrary($perl_libs[0]);

‎patches/postgresql/9.4/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
perl522.patch
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
2+
index d7638b4..ccf1f76 100644
3+
--- a/src/tools/msvc/MSBuildProject.pm
4+
+++ b/src/tools/msvc/MSBuildProject.pm
5+
@@ -345,6 +345,9 @@ EOF
6+
$d =~ s/__CFGNAME__/$cfgname/g;
7+
print $f " <ModuleDefinitionFile>$d</ModuleDefinitionFile>\n";
8+
}
9+
+if ($self->{name} =~ /plperl/ and $self->{platform} eq 'Win32') {
10+
+print $f " <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\n";
11+
+}
12+
print $f <<EOF;
13+
</Link>
14+
<ResourceCompile>
15+
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
16+
index 21faa58..7012bfa 100644
17+
--- a/src/tools/msvc/Mkvcbuild.pm
18+
+++ b/src/tools/msvc/Mkvcbuild.pm
19+
@@ -572,8 +578,8 @@ sub mkvcbuild
20+
}
21+
$plperl->AddReference($postgres);
22+
my @perl_libs =
23+
- grep { /perl\d+.lib$/ }
24+
- glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');
25+
+ grep { /perl\d+\.(lib|a)$/ }
26+
+ glob($solution->{options}->{perl} . '\lib\CORE\*.*');
27+
if (@perl_libs == 1)
28+
{
29+
$plperl->AddLibrary($perl_libs[0]);

‎patches/postgresql/9.5.5/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
perl522.patch

0 commit comments

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