@@ -11,6 +11,12 @@ SET DEFAULT_USER=postgres
1111SET PRODUCT_PUBLISHER = " Postgres Professional Russia"
1212SET COMPANY_NAME = PostgresPro
1313SET PRODUCT_WEB_SITE = " http://postgrespro.ru"
14+
15+ IF %ARCH% == X86 (
16+ SET BITS = 32bit
17+ )else (
18+ SET BITS = 64bit
19+ )
1420
1521IF " %PRODUCT_NAME% " == " " SET PRODUCT_NAME = PostgresPro
1622
@@ -26,18 +32,18 @@ IF "%PRODUCT_NAME%" == "PostgresProEnterprise" SET PG_DEF_SERVICEID="postgrespro
2632IF %ONE_C% == YES (
2733SET PRODUCT_NAME = PostgresPro 1C
2834SET PG_DEF_SERVICEID = " postgrespro-1C-${PRODUCT_VERSION}"
29- SET PG_INS_SUFFIX = " %ARCH% bit_1C_Setup .exe"
35+ SET PG_INS_SUFFIX = " %BITS% _1C_Setup .exe"
3036SET PG_REG_KEY = " Software\Postgres Professional\${PRODUCT_NAME}\Installations\postgresql-${PRODUCT_VERSION}"
3137SET PG_REG_SERVICE_KEY = " Software\Postgres Professional\${PRODUCT_NAME}\Services\postgresql-${PRODUCT_VERSION}"
3238SET PRODUCT_DIR_REGKEY = " Software\Postgres Professional\${PRODUCT_NAME}\${PRODUCT_VERSION}"
33- SET PRODUCT_VERSION = " %PG_MAJOR_VERSION% "
39+ SET PRODUCT_VERSION = " %PG_MAJOR_VERSION% ( %BITS% ) "
3440)ELSE (
35- SET PG_INS_SUFFIX = " %ARCH% bit_Setup .exe"
41+ SET PG_INS_SUFFIX = " %BITS% _Setup .exe"
3642SET PG_REG_KEY = " %PRODUCT_DIR_REGKEY% \Installations\postgresql-%PG_MAJOR_VERSION% "
3743SET PG_REG_SERVICE_KEY = " %PRODUCT_DIR_REGKEY% \Services\postgresql-%PG_MAJOR_VERSION% "
3844SET PG_OLD_REG_KEY = " %OLD_PRODUCT_DIR_REGKEY% \Installations\postgresql-%PG_MAJOR_VERSION% "
3945SET PG_OLD_REG_SERVICE_KEY = " %OLD_PRODUCT_DIR_REGKEY% \Services\postgresql-%PG_MAJOR_VERSION% "
40- SET PRODUCT_VERSION = " %PG_MAJOR_VERSION% (%ARCH % )"
46+ SET PRODUCT_VERSION = " %PG_MAJOR_VERSION% (%BITS % )"
4147)
4248
4349SET PG_DEF_PORT = " %DEFAULT_PORT% "