From ca7658a2c95c0eba44753a92f4f8eb2170d58d19 Mon Sep 17 00:00:00 2001 From: Alexey Slaykovsky Date: Wed, 7 Oct 2015 12:03:25 +0300 Subject: [PATCH 1/2] No ASM --- postgresql_build.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql_build.cmd b/postgresql_build.cmd index c2401cb..2feb80c 100644 --- a/postgresql_build.cmd +++ b/postgresql_build.cmd @@ -123,7 +123,7 @@ MKDIR "c:\pg\openssl" tar xf openssl-1.0.2d.tar.gz -C "c:\pg\openssl" CD "c:\pg\openssl\openssl-*" IF "%ARCH%" == "X86" perl Configure VC-WIN32 no-asm || GOTO :ERROR -IF "%ARCH%" == "X64" perl Configure VC-WIN64A || GOTO :ERROR +IF "%ARCH%" == "X64" perl Configure VC-WIN64A no-asm || GOTO :ERROR IF "%ARCH%" == "X86" call ms\do_ms IF "%ARCH%" == "X64" call ms\do_win64a.bat nmake -f ms\ntdll.mak || GOTO :ERROR From d9ff01f2c105dd958671357f48c7d9d5dcda27ac Mon Sep 17 00:00:00 2001 From: Alexey Slaykovsky Date: Wed, 7 Oct 2015 15:33:55 +0300 Subject: [PATCH 2/2] Installer Fixes --- nsis/postgres32.nsh | 8 ++-- nsis/postgres64.nsh | 12 +++--- nsis/postgresql.nsi | 7 ++-- nsis/translates.nsi | 92 ++++++++++++++++++++++----------------------- 4 files changed, 60 insertions(+), 59 deletions(-) diff --git a/nsis/postgres32.nsh b/nsis/postgres32.nsh index d74028c..7cdc178 100644 --- a/nsis/postgres32.nsh +++ b/nsis/postgres32.nsh @@ -3,16 +3,16 @@ !define PRODUCT_VERSION "9.4 (x86)" !define PRODUCT_PUBLISHER "Postgres Professional Russia" !define PRODUCT_WEB_SITE "http://postgrespro.ru" -!define PRODUCT_DIR_REGKEY "Software\PostgresPro\PostgreSQL\9.4" +!define PRODUCT_DIR_REGKEY "SOFTWARE\PostgresPro\x86\PostgreSQL\9.4" -!define PG_REG_KEY "SOFTWARE\PostgreSQL\Installations\postgresql-9.4" -!define PG_REG_SERVICE_KEY "SOFTWARE\PostgreSQL\Services\postgresql-9.4" +!define PG_REG_KEY "SOFTWARE\PostgreSQL\x86\Installations\postgresql-9.4" +!define PG_REG_SERVICE_KEY "SOFTWARE\PostgreSQL\x86\Services\postgresql-9.4" !define PG_DEF_PORT "5432" !define PG_DEF_SUPERUSER "postgres" !define PG_DEF_SERVICEACCOUNT "NT AUTHORITY\NetworkService" -!define PG_DEF_SERVICEID "postgresql-9.4" +!define PG_DEF_SERVICEID "postgresql-x86-9.4" !define PG_DEF_VERSION "9.4.4" !define PG_DEF_VERSION_SHORT "9.4" !define PG_DEF_BRANDING "PostgreSQL 9.4 (x86)" diff --git a/nsis/postgres64.nsh b/nsis/postgres64.nsh index 771b8f5..7f275e5 100644 --- a/nsis/postgres64.nsh +++ b/nsis/postgres64.nsh @@ -1,21 +1,21 @@ ; Common basic defines !define PRODUCT_NAME "PostgreSQL" -!define PRODUCT_VERSION "9.4" +!define PRODUCT_VERSION "9.4 (x64)" !define PRODUCT_PUBLISHER "Postgres Professional Russia" !define PRODUCT_WEB_SITE "http://postgrespro.ru" -!define PRODUCT_DIR_REGKEY "Software\PostgresPro\PostgreSQL\9.4" +!define PRODUCT_DIR_REGKEY "SOFTWARE\PostgresPro\x64\PostgreSQL\9.4" -!define PG_REG_KEY "SOFTWARE\PostgreSQL\Installations\postgresql-9.4" -!define PG_REG_SERVICE_KEY "SOFTWARE\PostgreSQL\Services\postgresql-9.4" +!define PG_REG_KEY "SOFTWARE\PostgreSQL\x64\Installations\postgresql-9.4" +!define PG_REG_SERVICE_KEY "SOFTWARE\PostgreSQL\x64\Services\postgresql-9.4" !define PG_DEF_PORT "5432" !define PG_DEF_SUPERUSER "postgres" !define PG_DEF_SERVICEACCOUNT "NT AUTHORITY\NetworkService" -!define PG_DEF_SERVICEID "postgresql-9.4" +!define PG_DEF_SERVICEID "postgresql-x64-9.4" !define PG_DEF_VERSION "9.4.4" !define PG_DEF_VERSION_SHORT "9.4" -!define PG_DEF_BRANDING "PostgreSQL 9.4" +!define PG_DEF_BRANDING "PostgreSQL 9.4 (x64)" !define PG_INS_SUFFIX "64bit_Setup.exe" !define PG_INS_SOURCE_DIR "C:\pg\distr_X64_9.4.4\postgresql\*.*" diff --git a/nsis/postgresql.nsi b/nsis/postgresql.nsi index 8a1b811..5b571f1 100644 --- a/nsis/postgresql.nsi +++ b/nsis/postgresql.nsi @@ -49,7 +49,7 @@ OutFile "${PRODUCT_NAME}_${PG_DEF_VERSION}_${PG_INS_SUFFIX}" InstallDir "$PROGRAMFILES32\${PRODUCT_NAME}\${PG_DEF_VERSION_SHORT}" !endif -BrandingText "PostgresPro.ru" +BrandingText "Postgres Professional" ;Get installation folder from registry if available InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" @@ -243,7 +243,7 @@ Section "PostgreSQL Server" sec1 ClearErrors FileOpen $0 $INSTDIR\scripts\runpgsql.bat w IfErrors creatBatErr2 - FileWrite $0 'echo off$\r$\nchcp 1251$\r$\n"$INSTDIR\bin\psql.exe" -h localhost -U "$UserName_text" -d postgres -p $TextPort_text $\r$\npause' + FileWrite $0 'echo off$\r$\n"$INSTDIR\bin\psql.exe" -h localhost -U "$UserName_text" -d postgres -p $TextPort_text $\r$\npause' FileClose $0 creatBatErr2: @@ -286,7 +286,7 @@ Section "PostgreSQL Server" sec1 ; set font Lucida Console for shortcut psql ReadRegStr $0 HKCU "Console\SQL Shell (psql)" "FaceName" ${if} $0 == "" - WriteRegStr HKCU "Console\SQL Shell (psql)" "FaceName" "Lucida Console" + WriteRegStr HKCU "Console\SQL Shell (psql)" "FaceName" "Consolas" WriteRegDWORD HKCU "Console\SQL Shell (psql)" "FontWeight" "400" WriteRegDWORD HKCU "Console\SQL Shell (psql)" "FontSize" "917504" WriteRegDWORD HKCU "Console\SQL Shell (psql)" "FontFamily" "54" @@ -457,6 +457,7 @@ Section "PostgreSQL Server" sec1 Sleep 1000 nsExec::ExecToStack /TIMEOUT=60000 'sc start "$ServiceID_text"' + Sleep 5000 Pop $0 # return value/error/timeout Pop $1 # printed text, up to ${NSIS_MAX_STRLEN} diff --git a/nsis/translates.nsi b/nsis/translates.nsi index 97457e4..2b88b6a 100644 --- a/nsis/translates.nsi +++ b/nsis/translates.nsi @@ -1,112 +1,112 @@ - LangString DATADIR_MESS ${LANG_ENGLISH} "Please select a directory under which to store your data." - LangString DATADIR_MESS ${LANG_RUSSIAN} "Базы данных будут установлены в следующий каталог." + LangString DATADIR_MESS ${LANG_ENGLISH} "Please select a directory under which to store your data" + LangString DATADIR_MESS ${LANG_RUSSIAN} " " - LangString DATADIR_TITLE ${LANG_ENGLISH} "Data directory." - LangString DATADIR_TITLE ${LANG_RUSSIAN} "Каталог для установки баз данных." + LangString DATADIR_TITLE ${LANG_ENGLISH} "Data directory" + LangString DATADIR_TITLE ${LANG_RUSSIAN} " " LangString BROWSE_BUTTON ${LANG_ENGLISH} "Browse ..." - LangString BROWSE_BUTTON ${LANG_RUSSIAN} "Обзор ..." + LangString BROWSE_BUTTON ${LANG_RUSSIAN} " ..." - LangString DESC_SecMS ${LANG_ENGLISH} "Install run-time components that are required to run C++ applications." - LangString DESC_SecMS ${LANG_RUSSIAN} "Компоненты среды выполнения, необходимые для выполнения приложений." + LangString DESC_SecMS ${LANG_ENGLISH} "Install run-time components that are required to run C++ applications" + LangString DESC_SecMS ${LANG_RUSSIAN} " , " - LangString DESC_Sec1 ${LANG_ENGLISH} "Install PostgreSQL server on this computer." - LangString DESC_Sec1 ${LANG_RUSSIAN} "Установка сервера PostgreSQL на этот компьютер" + LangString DESC_Sec1 ${LANG_ENGLISH} "Install PostgreSQL server on this computer" + LangString DESC_Sec1 ${LANG_RUSSIAN} " PostgreSQL " - LangString DESC_PgAdmin ${LANG_ENGLISH} "Install pgAdmin tools on this computer." - LangString DESC_PgAdmin ${LANG_RUSSIAN} "Установка pgAdmin для управления сервером." + LangString DESC_PgAdmin ${LANG_ENGLISH} "Install pgAdmin tools on this computer" + LangString DESC_PgAdmin ${LANG_RUSSIAN} " pgAdmin " - LangString DESC_Sec1dir ${LANG_ENGLISH} "Please specify the directory where PostgreSQL will be installed." - LangString DESC_Sec1die ${LANG_RUSSIAN} "Пожалуйста, задайте директорию для установки PostgreSQL." + LangString DESC_Sec1dir ${LANG_ENGLISH} "Please specify the directory where PostgreSQL will be installed" + LangString DESC_Sec1die ${LANG_RUSSIAN} ", PostgreSQL" LangString SERVER_SET_TITLE ${LANG_ENGLISH} "Server options" - LangString SERVER_SET_TITLE ${LANG_RUSSIAN} "Параметры сервера" + LangString SERVER_SET_TITLE ${LANG_RUSSIAN} " " - LangString SERVER_SET_SUBTITLE ${LANG_ENGLISH} "Please specify options of server." - LangString SERVER_SET_SUBTITLE ${LANG_RUSSIAN} "Пожалуйста, задайте параметры сервера." + LangString SERVER_SET_SUBTITLE ${LANG_ENGLISH} "Please specify options of server" + LangString SERVER_SET_SUBTITLE ${LANG_RUSSIAN} ", " LangString SERVER_EXIST_TITLE ${LANG_ENGLISH} "Existing installation" - LangString SERVER_EXIST_TITLE ${LANG_RUSSIAN} "Уже имеется установка сервера" + LangString SERVER_EXIST_TITLE ${LANG_RUSSIAN} " " LangString SERVER_EXIST_TEXT1 ${LANG_ENGLISH} "An existing PostgresSQL installation has been found at " - LangString SERVER_EXIST_TEXT1 ${LANG_RUSSIAN} "Найдена установка сервера PostgresSQL в директории " + LangString SERVER_EXIST_TEXT1 ${LANG_RUSSIAN} " PostgresSQL " - LangString SERVER_EXIST_TEXT2 ${LANG_ENGLISH} "This instalation will be upgraded.$\n$\nIn order to upgrade, we may need to restart the server. " - LangString SERVER_EXIST_TEXT2 ${LANG_RUSSIAN} "Эта установка будет обновлена.$\n$\nВо время обновления потребуется перезапуск службы сервера. " + LangString SERVER_EXIST_TEXT2 ${LANG_ENGLISH} "This instalation will be upgraded.$\n$\nIn order to upgrade, we may need to restart the server " + LangString SERVER_EXIST_TEXT2 ${LANG_RUSSIAN} " .$\n$\n " LangString DATADIR_EXIST_TITLE ${LANG_ENGLISH} "Existing data directory" - LangString DATADIR_EXIST_TITLE ${LANG_RUSSIAN} "Уже имеется директория с данными" + LangString DATADIR_EXIST_TITLE ${LANG_RUSSIAN} " " 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." - LangString DATADIR_EXIST_TEXT1 ${LANG_RUSSIAN} "Уже имеется директория с данными $DATA_DIR , порт $TextPort_text . Эта директория будет использована для этой установки сервера." + LangString DATADIR_EXIST_TEXT1 ${LANG_RUSSIAN} " $DATA_DIR , $TextPort_text . ." - LangString DATADIR_EXIST_ERROR1 ${LANG_ENGLISH} "An existing file with name $DATA_DIR has been found. Can not create directory with this name." - LangString DATADIR_EXIST_ERROR1 ${LANG_RUSSIAN} "Эта директория и ее конфигурация будет использована для этой установки сервера." + LangString DATADIR_EXIST_ERROR1 ${LANG_ENGLISH} "An existing file with name $DATA_DIR has been found. Can not create directory with this name" + LangString DATADIR_EXIST_ERROR1 ${LANG_RUSSIAN} " " - LangString UNINSTALL_END ${LANG_ENGLISH} "Uninstallation has been ended.$\n$\nThe data directory has not been removed: " - LangString UNINSTALL_END ${LANG_RUSSIAN} "Удаление PostgreSQL сервера окончено. $\n$\Директория с данными не удалена: " + 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: " + LangString UNINSTALL_END ${LANG_RUSSIAN} " PostgreSQL .$\n$\n, , '$ServiceID_text' .$\n$\n : " LangString MESS_PASS1 ${LANG_ENGLISH} "Passwords Do Not Match!" - LangString MESS_PASS1 ${LANG_RUSSIAN} "Введенные пароль и подтвтерждение различаются!" + LangString MESS_PASS1 ${LANG_RUSSIAN} " !" LangString MESS_PASS2 ${LANG_ENGLISH} "You do not enter a password! Do you confirm the installation without a password?" - LangString MESS_PASS2 ${LANG_RUSSIAN} "Вы не ввели пароль!$\n$\nПодтверждаете установку без пароля?" + LangString MESS_PASS2 ${LANG_RUSSIAN} " !$\n$\n ?" LangString MESS_PASS3 ${LANG_ENGLISH} "You entered the password with non-Latin characters. Do you wish use that password?" - LangString MESS_PASS3 ${LANG_RUSSIAN} "Вы использовали в пароле нелатинские символы. Это может вызвать \ - проблемы с вводом пароля! Продолжить" + LangString MESS_PASS3 ${LANG_RUSSIAN} " . \ + ! " LangString DLG_PORT ${LANG_ENGLISH} "Port:" - LangString DLG_PORT ${LANG_RUSSIAN} "Порт:" + LangString DLG_PORT ${LANG_RUSSIAN} ":" LangString DLG_ADR1 ${LANG_ENGLISH} "Addresses:" - LangString DLG_ADR1 ${LANG_RUSSIAN} "Адреса:" + LangString DLG_ADR1 ${LANG_RUSSIAN} ":" LangString DLG_ADR2 ${LANG_ENGLISH} "Allow connections from any IP address:" - LangString DLG_ADR2 ${LANG_RUSSIAN} "Поддерживать подсоединения с любых IP адресов." + LangString DLG_ADR2 ${LANG_RUSSIAN} " IP :" LangString DLG_LOCALE ${LANG_ENGLISH} "Locale:" - LangString DLG_LOCALE ${LANG_RUSSIAN} "Локаль:" + LangString DLG_LOCALE ${LANG_RUSSIAN} ":" LangString DLG_SUPERUSER ${LANG_ENGLISH} "Super user:" - LangString DLG_SUPERUSER ${LANG_RUSSIAN} "Супер пользователь:" + LangString DLG_SUPERUSER ${LANG_RUSSIAN} " :" LangString DLG_PASS1 ${LANG_ENGLISH} "Password:" - LangString DLG_PASS1 ${LANG_RUSSIAN} "Пароль:" + LangString DLG_PASS1 ${LANG_RUSSIAN} ":" LangString DLG_PASS2 ${LANG_ENGLISH} "Confirm:" - LangString DLG_PASS2 ${LANG_RUSSIAN} "Подтверждение:" + LangString DLG_PASS2 ${LANG_RUSSIAN} ":" LangString DLG_OPT1 ${LANG_ENGLISH} "It is possible to optimize server performance based on the amount of memory installed $AllMem Mb. \ The server will allocate more memory. \ The parameters are written to the file $DATA_DIR\postgresql.conf" - LangString DLG_OPT1 ${LANG_RUSSIAN} "Можно провести оптимизацию производительности сервера исходя из объема установленной памяти $AllMem Mb. \ -Cерверу будет выделено больше оперативной памяти. \ -Параметры будут записаны в файл $DATA_DIR\postgresql.conf" + LangString DLG_OPT1 ${LANG_RUSSIAN} " $AllMem Mb. \ +C . \ + $DATA_DIR\postgresql.conf" LangString DLG_ENVVAR ${LANG_ENGLISH} "Set up environment variables" - LangString DLG_ENVVAR ${LANG_RUSSIAN} "Настроить переменные среды" + LangString DLG_ENVVAR ${LANG_RUSSIAN} " " LangString DLG_OPT2 ${LANG_ENGLISH} "Make optimizations" - LangString DLG_OPT2 ${LANG_RUSSIAN} "Провести оптимизацию параметров" + LangString DLG_OPT2 ${LANG_RUSSIAN} " " LangString DLG_OPT3 ${LANG_ENGLISH} "Use default settings" - LangString DLG_OPT3 ${LANG_RUSSIAN} "Использовать параметры по умолчанию" + LangString DLG_OPT3 ${LANG_RUSSIAN} " " LangString DEF_LOCALE_NAME ${LANG_ENGLISH} "Default" - LangString DEF_LOCALE_NAME ${LANG_RUSSIAN} "Настройка ОС" + LangString DEF_LOCALE_NAME ${LANG_RUSSIAN} " " LangString MESS_STOP_SERVER ${LANG_ENGLISH} "In order to upgrade, we may need to restart the server!$\n$\nContinue?" - LangString MESS_STOP_SERVER ${LANG_RUSSIAN} "Во время обновления потребуется перезапуск службы сервера!$\n$\nПродолжить?" + LangString MESS_STOP_SERVER ${LANG_RUSSIAN} " !$\n$\n?" LangString MESS_ERROR_SERVER ${LANG_ENGLISH} "An error occurred while initializing the server! Perhaps Server service failed to start." - LangString MESS_ERROR_SERVER ${LANG_RUSSIAN} "Возникла ошибка при инициализации сервера! Возможно служба сервера не смогла запуститься." + LangString MESS_ERROR_SERVER ${LANG_RUSSIAN} " ! ." pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy