Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 191cb37

Browse files
vbwagnervbwagner
committed
Merge branch 'PGPRO_DEV' of https://github.com/postgrespro/pgwininstall into PGPRO_DEV
2 parents 7379e07 + bc923d9 commit 191cb37

7 files changed

+778
-138
lines changed

‎build/helpers/postgres.cmd

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ if "%PRODUCT_NAME%" == "PostgreSQL" (
5454
>>src\tools\msvc\config.pl ECHO ldap ^=^> 1,
5555
>>src\tools\msvc\config.pl ECHO nls ^=^> '%DEPENDENCIES_BIN_DIR%\libintl',
5656
>>src\tools\msvc\config.pl ECHO tcl ^=^> undef,
57-
IF %ARCH% == X64 (>>src\tools\msvc\config.pl ECHO perl ^=^> '%PERL64_PATH%', )
5857
IF %SDK% == SDK71 GOTO :DISABLE_PERL
59-
IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO perl ^=^> '%PERL32_PATH%', )
58+
IF %ARCH% == X86 GOTO :DISABLE_PERL
59+
IF %ARCH% == X64 (>>src\tools\msvc\config.pl ECHO perl ^=^> '%PERL64_PATH%', )
6060
GOTO :PERL_CONF_DONE
6161
:DISABLE_PERL
6262
IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO perl ^=^> undef, )
@@ -76,7 +76,7 @@ if "%PRODUCT_NAME%" == "PostgresProEnterprise" >>src\tools\msvc\config.pl ECHO z
7676
>>src\tools\msvc\config.pl ECHO 1^;
7777

7878
rem Setting pager
79-
>>src\include\pg_config.h.win32 ECHO #define DEFAULT_PAGER "less -X"
79+
>>src\include\pg_config.h.win32 ECHO #define DEFAULT_PAGER "less -XE"
8080

8181
IF %ONE_C% == YES (
8282
mv -v contrib\fulleq\fulleq.sql.in.in contrib\fulleq\fulleq.sql.in || GOTO :ERROR

‎build/helpers/postgres_nsis_installer.cmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ IF "%PRODUCT_NAME%" == "PostgresPro" (
109109
GOTO :ENDLIC
110110
)
111111
IF "%PRODUCT_NAME%" == "PostgresProEnterprise" (
112-
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define myLicenseFile_ru "license.txt"
113-
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define myLicenseFile_en "license.txt"
112+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define myLicenseFile_ru "license_ee_ru.txt"
113+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define myLicenseFile_en "license_ee_en.txt"
114114
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PRODUCT_NAME_SHORT "Postgres Pro"
115115
GOTO :ENDLIC
116116
)

‎build/helpers/setvars.cmd

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SET ZSTD_RELEASE=1.1.0
1212

1313
SET PG_REPACK_VER=1.4.2
1414
IF "%PG_MAJOR_VERSION%"=="9.5" SET PG_REPACK_VER=1.3.4
15+
IF "%PG_MAJOR_VERSION%"=="11" SET PG_REPACK_VER=1.4.3
1516

1617
REM Path vars
1718
SET PERL32_PATH=C:\Perl
@@ -24,12 +25,13 @@ SET ZIP_PATH=C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
2425
SET NSIS_PATH=C:\Program Files (x86)\NSIS
2526
SET MSYS2_PATH=C:\msys32\usr\bin;C:\msys64\usr\bin
2627
SET PATH=%PATH%;%ZIP_PATH%;%MSYS2_PATH%;%NSIS_PATH%
28+
SET PERL5LIB=.
2729

28-
IF %ARCH% == X86 SET PATH=%PERL32_BIN%;%PATH%
29-
IF %ARCH% == X64 SET PATH=%PERL64_BIN%;%PATH%
30+
IF EXIST "%PERL32_BIN%" SET PATH=%PERL32_BIN%;%PATH%
31+
IF EXIST "%PERL32_BIN%" SET PERL_EXE=%PERL32_BIN%\perl
32+
IF EXIST "%PERL64_BIN%" SET PATH=%PERL64_BIN%;%PATH%
33+
IF EXIST "%PERL64_BIN%" SET PERL_EXE=%PERL64_BIN%\perl
3034

31-
IF %ARCH% == X86 SET PERL_EXE=%PERL32_BIN%\perl
32-
IF %ARCH% == X64 SET PERL_EXE=%PERL64_BIN%\perl
3335
IF %ARCH% == X86 SET Platform=Win32
3436
IF %ARCH% == X64 SET Platform=X64
3537
IF %SDK% == SDK71 (

‎nsis/license_ee_en.txt

+180-50
Large diffs are not rendered by default.

‎nsis/license_ee_ru.txt

+208-50
Large diffs are not rendered by default.

‎nsis/license_std_en.txt

+176-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,180 @@
1-
Postgres Pro Standard License
2-
-------------------------------------------------------
1+
LICENSE AGREEMENT
2+
ON THE USE OF THE PRODUCT DBMS POSTGRES PRO
3+
AND ALL ITS VERSIONS
34

4-
Postgres Pro Standard is distributed under the terms of PostgreSQL license with additions by Postgres Professional:
5+
PLEASE REVIEW THE FOLLOWING TERMS CAREFULLY BEFORE YOU START DOWNLOADING AND/OR
6+
SETTING UP, AND/OR COPYING AND/OR INSTALLATION, AND/OR ANY USE OF THE DBMS POSTGRES
7+
PRO ON YOUR COMPUTER/SERVER/PROCESSOR. ANY USE OF DBMS POSTGRES PRO MEANS YOUR
8+
UNDERSTANDING OF THE TEXT OF THE AGREEMENT AND CONSENT, FULL AND UNCONDITIONAL
9+
ACCEPTANCE OF ALL THE TERMS OF THIS AGREEMENT.
510

6-
Portions Copyright � 2015-2018, Postgres Professional
11+
This License Agreement (hereinafter referred to as - Agreement) for the right to use DBMS POSTGRES
12+
PRO and all its versions (hereinafter referred to as - the Product) is a legal agreement between you -
13+
natural person or legal entity (hereinafter referred to as - the User) and LLC PPG (Postgres
14+
Professional) the Russian Federation, the Republic of Tatarstan, Innopolis (hereinafter referred to as
15+
- the Rights Holder). This Agreement determines the terms, procedure, restrictions and other rules
16+
for the use of the Product. This Agreement is legally valid as any other written agreement signed by
17+
you. The Rights Holder reserves the right to amend this Agreement, an updated version of this
18+
document is available at: https://postgrespro.ru.
19+
If you do not agree with the terms of the Agreement, you must, without installation of the Product,
20+
return the Product to the Rights Holder or its authorized representative or stop the installation of the
21+
Product. Herewith, the refusal to install/download the Product does not exempt you, without
22+
limitation, from the fulfillment of other terms of this Agreement, specified in Section 3.
723

8-
Portions Copyright � 1996-2018, The PostgreSQL Global Development Group
24+
1. EXCLUSIVE INTELLECTUAL PROPERTY RIGHTS
25+
1.1. The product of DBMS POSTGRES PRO (and all its versions), systems, methods, algorithms,
26+
structure, libraries, applications (additional software), components/parts of the Product (including
27+
texts and fonts), all modules, other component parts of the Product, copied and/or included in all
28+
working software of the Hardware and software system or any part thereof, any copies,
29+
documentation, authorship, logos and other information contained in the Product are objects of
30+
intellectual property and commercial secret of the Rights Holder-Company Postgres Professional (LLC
31+
PPG, Postgres Professional) and/or its affiliates, and are protected according to the current legislation
32+
of the Russian Federation on intellectual property, commercial secret, and the provisions of this
33+
Agreement.
34+
1.2. Name Postgres / Postgres, logos Postgres / Postgres are registered trademarks of LLC PPG and
35+
are protected by the Copyright Law of the Russian Federation. The Rights Holder guarantees that he
36+
is authorized to use these logos and trademarks.
37+
1.3. The use of the Product in violation of the terms of this Agreement is deemed to be a violation
38+
of the current Copyright Law of the Russian Federation and is a sufficient reason for depriving you of
39+
the rights granted with respect to the Product.
40+
1.4. The Rights Holder shall assist in protecting the User from all claims of the third parties with
41+
respect to intellectual or industrial ownership of the Product package. In the event of such a claim,
42+
the User shall inform promptly the Rights Holder of all claims made by the third party, and provide
43+
all necessary information concerning this dispute.
44+
1.5. The Rights Holder declares that at the time of the transfer of the rights to use the Product, he
45+
is not aware of the rights of the third parties that could be violated by granting a non-exclusive right
46+
of the User to use the Product under this Agreement.
47+
1.6. During the term of this Agreement, the Rights Holder is obliged to refrain from any actions that
48+
could complicate the User's implementation of the right to use the result of intellectual activity within
49+
the limits established by the Agreement.
50+
2. SUBJECT OF THE AGREEMENT
51+
2.1. The subject of this Agreement is the granting by the Rights Holder to you - the User (under
52+
compliance with all technical requirements described in the technical and user documentation, as
53+
well as all the conditions and restrictions specified in this Agreement) of non-exclusive rights to use
54+
the software product DBMS POSTGRES PRO and all its subsequent versions within and by the
55+
methods specified in this Agreement. Description and instructions for the use of the Product are
56+
included in the Product, and are also available on the website of the Rights Holder at:
57+
https://postgrespro.ru.
58+
2.2. All updates to the Product shall be submitted in accordance with the terms of the technical
59+
support of the Product. Technical support depends on the type of license used and is carried out
60+
according to the rules for providing technical support on the website of the Rights Holder
61+
https://postgrespro.ru.
62+
2.3. The terms and procedure for remuneration for granting the rights to use the Product in case of
63+
its commercial use, depending on the type of license, shall be determined in separately concluded
64+
contracts with the Rights Holder or its authorized representatives/partners.
65+
3. VOLUME OF TRANSFERABLE RIGHTS AND METHODS OF USE
66+
3.1. The user shall be granted a non-exclusive right to use the Product and the user documentation
67+
thereto with the limitation of the total number of installations, processors, processor cores or users
68+
(determined in accordance with separate agreements with the Rights Holder or with the Rights
69+
Holder's Partners), within the limits specified in this Agreement (simple (non-exclusive) license): the
70+
right to install and reproduce provided for the installation and startup of software products in
71+
accordance with the documentation accompanying the delivery of the Product and establishing the
72+
rules for its use;
73+
3.2. The right received by the User does not include the following rights:
74+
3.2.1. To transfer the received right of using the Product, including media and documentation, by
75+
legal entities or natural persons, by selling, leasing, renting, lending or other ways of disposition.
76+
3.2.2. To transfer activation and access codes (or their copies) for use of the Product to the third
77+
parties.
78+
3.2.3. To use the Product on behalf of the third party.
79+
3.2.4. To carry out the following activities:
80+
3.2.4.1.To decompile (to convert object code to source code) and to modify programs and other
81+
components of the Product.
82+
3.2.4.2.To make any changes to the object code of the programs, except those that are made by
83+
means included in the Product package and described in the documentation.
84+
3.2.4.3.To perform other actions in relation to the Product that violate Russian and international
85+
standards of the copyright and software laws.
86+
3.3. The right received by the User for the use of the Product shall be valid during the period of
87+
validity of exclusive rights to the Product and within the territory of the Russian Federation, unless
88+
otherwise specified in separate agreements with the Rights Holder or with the Rights Holder's
89+
Partners.
90+
3.4. The following ways of using the Product with the technical specifications provided by the Rights
91+
Holder on "as is" basis are:
92+
3.4.1. Use of the Product for the development of applied solutions, for conducting tests, experiments
93+
and exploring the opportunities of the Product.
94+
3.4.2. The rights to use the Product for other purposes, taking into account the limitations of the use
95+
of the Product, within the framework of separately licensed contracts concluded by the User and the
96+
Rights Holder shall be determined by the terms of these agreements.
997

10-
Portions Copyright � 1994, The Regents of the University of California
11-
12-
Permission is granted to use, copy, modify and distribute this software and its documentation for testing, software development, evaluation, education for free and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following four paragraphs appear in all copies. Use for other purposes, embedding in other products, distribution and other activities require purchasing of a separate license.
13-
14-
IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
15-
16-
THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
17-
18-
IN NO EVENT SHALL POSTGRES PROFESSIONAL BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF POSTGRES PROFESSIONAL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
19-
20-
POSTGRES PROFESSIONAL SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND POSTGRES PROFESSIONAL HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
98+
4. TRANSFER PROCEDURE
99+
4.1. Transfer of a copy of the Product to the User shall be carried out by providing access for
100+
downloading on the website of the Rights Holder. User documentation shall be transferred to the
101+
User in electronic form on the website of the Rights Holder.
102+
4.2. Any changes, additions and other actions related to the transfer, activation, access provision
103+
to the Product are carried out exclusively by the Rights Holder directly or through his authorized
104+
representatives.
105+
5. WARRANTY LIABILITIES
106+
5.1. The Rights Holder guarantees that upon the transfer of rights to the Product, the copyrights,
107+
closely-related or any other rights of the third parties shall not be violated.
108+
5.2. The product with the rights of use specified in the Agreement is provided on "as is" basis, with
109+
the absence of obligations of the Rights Holder about his/her suitability for the purposes of the User
110+
or multiple use with certain software.
111+
5.3. The Rights Holder does not provide any guarantees with respect to software and equipment of
112+
other manufacturers that may be supplied to the User with the Product either as a part of the Product
113+
or with which the Product is supplied.
114+
5.4. Additionally, the Rights Holder declares as follows:
115+
5.4.1. Additional conditions:
116+
Portions Copyright (c) 2015-2018, Postgres Professional
117+
Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
118+
Portions Copyright (c) 1994 Regents of the University of California
119+
5.4.2. In no event shall the University of California be liable to any party for direct, indirect, special,
120+
incidental, or consequential damages, including lost profits, arising out of the use of this software
121+
and its documentation, even if the University of California has been advised of the possibility of such
122+
damage.
123+
5.4.3. The University of California specifically disclaims any warranties, including, but not limited to,
124+
the implied warranties of merchantability and fitness for a particular purpose. The software provided
125+
hereunder is on an "as is" basis, and the University of California has no obligations to provide
126+
maintenance, support, updates, enhancements, or modifications.
127+
5.4.4. A limited liability company under the laws of Russian Federation �Postgres Professional�
128+
(Postgres Professional) incurs no liability for any damage, including loss of income, caused by direct
129+
or indirect, special or incidental use of this software or its documentation, even if a limited liability
130+
company under the laws of Russian Federation �Postgres Professional� was informed of the
131+
possibility of such damages.
132+
5.4.5. A limited liability company under the laws of Russian Federation �Postgres Professional�
133+
(Postgres Professional) specifically refuses to provide any guarantees, including, but not limited to,
134+
these warranties: implicit warranties of merchantability or suitability for a particular purpose. This
135+
software shall be provided on "as is" basis and a limited liability company under the laws of Russian
136+
Federation �Postgres Professional� is not obliged to provide maintenance, support, updates,
137+
expansion or changes.
138+
6. LIABILITY
139+
6.1. The Rights Holder and his affiliated persons shall not be liable or compensate for direct or
140+
indirect damages, including lost profit, loss of the User's confidential information, caused by
141+
violations and/or errors in the operation of the Product, resulting from misconduct of the User's
142+
personnel, or third parties, as well as malfunctions of the technical means and electrical equipment.
143+
6.2. The Rights Holder also shall not incur any liability and shall not give any guarantees with respect
144+
to any consumer qualities of the Product, except for those declared and listed in the user
145+
documentation, if the Product was purchased by the User not from the Rights Holder or his
146+
authorized representatives.
147+
6.3. The User is liable for recovering any damage resulting from and following from the use of the
148+
Product and the information contained therein or created by the Product, and also resulting from the
149+
interaction (or inability to interact properly) with any other equipment, complex or software provided
150+
by the Rights Holder and/or a third party.
151+
6.4. The User undertakes to compensate for any expenses to the Rights Holder, including legal
152+
costs, remuneration to lawyers/legal officers/representatives, and to protect the Rights Holder from
153+
any claims, disputes, litigation, losses, damages, costs, expenses, any other liability arising from
154+
improper, unlawful use of the Product (including any party related to the User, as well as persons
155+
authorized by the User's instruction to act in clear breach of the terms of this Agreement and
156+
applicable law).
157+
7. SPECIAL ADDITIONAL CONDITIONS
158+
7.1. The rights to use the Product are valid only if the Product is genuine. Purchased on a legal basis,
159+
the Product shall be accompanied by a unique identification number and User data specified when
160+
purchasing the Product. The user shall incur full liability for the data integrity transferred directly to
161+
the Rights Holder or his authorized representative. The User undertakes to notify the Rights Holder
162+
or his authorized representative about the discrepancies in the information provided by him, changes
163+
in his details.
164+
7.2. This Agreement, as described above, shall be deemed to be concluded and shall come into
165+
force from the moment of the beginning of the installation and/or use of the Product, and constitutes
166+
the entire agreement between the User and the Rights Holder on its terms and conditions. If any of
167+
its provisions are recognized by the competent court as invalid, illegal, the remaining provisions of
168+
the Agreement shall remain in full force and effect. All disputes and disagreements between the
169+
parties to this Agreement shall be settled through negotiations, and if the positive result of the
170+
negotiations is not achieved - by judicial procedure in accordance with the current legislation of the
171+
Russian Federation.
172+
7.3. Violation of the terms of this Agreement shall entail liability in accordance with the current
173+
legislation of the Russian Federation and this Agreement. Without prejudice to any of its rights, the
174+
Rights Holder has the right to unilaterally terminate this Agreement if the User does not comply with
175+
its terms and conditions. Cash paid by the User for the use of the Product is non-refundable.
176+
7.4. If the User has become aware of any information indicating copyright infringement of the
177+
Rights Holder (illegal resale of the Product, reference links to unauthorized sites), please send this
178+
information to: [email protected].
179+
7.5. For additional information on emerging issues regarding this Agreement, other explanations
180+
on the use of the Product, the User may contact: [email protected].

0 commit comments

Comments
 (0)