NotificationsYou must be signed in to change notification settings
Fork18
Star19

Commit856497e

committed

update license text for standart version

1 parent108784e commit856497eCopy full SHA for 856497e

File tree

6 files changed

+151

-3

lines changed

build/helpers
- postgres_nsis_installer.cmd
nsis

6 files changed

+151

-3

lines changed

`‎build/helpers/postgres_nsis_installer.cmd`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ IF "%PRODUCT_NAME%" == "PostgreSQL" (`
`103`	`103`	`GOTO :ENDLIC`
`104`	`104`	`)`
`105`	`105`	`IF"%PRODUCT_NAME%"=="PostgresPro" (`
`106`		`->>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_ru"license.txt"`
`107`		`->>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_en"license.txt"`
	`106`	`+>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_ru"license_std_ru.txt"`
	`107`	`+>>%NSIS_RES_DIR%\postgres.def.nshECHO !define myLicenseFile_en"license_std_en.txt"`
`108`	`108`	`>>%NSIS_RES_DIR%\postgres.def.nshECHO !define PRODUCT_NAME_SHORT"Postgres Pro"`
`109`	`109`	`GOTO :ENDLIC`
`110`	`110`	`)`

`‎nsis/license_ee_en.txt`

Lines changed: 50 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,50 @@`
	`1`	`+�� (EULA)`
	`2`	`+`
	`3`	+�� (��) �� (�� ) � �� (�� ) �� (�� ). � �� "�� " (Postgres Professional) (�� ) � �� Postgres Pro Enterprise, �� /�� (�� ) �� , �� (��) �� (�� ).
	`4`	`+`
	`5`	`+�� (�� )`
	`6`	`+`
	`7`	`+�� (�� /��) �� :`
	`8`	+1) ��
	`9`	`+�� .`
	`10`	+2) �� , �� (�� ) �� (��) �� .
	`11`	`+`
	`12`	`+`
	`13`	`+1. ��`
	`14`	+��, �� , �� . �� , �� , �� . �� , �� , �� .
	`15`	`+`
	`16`	`+2. �� `
	`17`	+�� , �� . �� "��" �� , �� (��, �� , ��-�� .�.).
	`18`	`+`
	`19`	`+3. ��`
	`20`	`+�� . �� .`
	`21`	`+`
	`22`	`+4. �� `
	`23`	+�� , �� , �� , �� , ��, ��, �� -�� .
	`24`	`+`
	`25`	`+5. �� .`
	`26`	`+�� . �� .`
	`27`	`+`
	`28`	`+6. �� `
	`29`	`+�� .`
	`30`	+�� , �� , �� , � �� . �� -�� .
	`31`	`+`
	`32`	`+7. �� `
	`33`	+�� -�� . �� "�� ", �� -�� , �� , �� -�� . �� , �� , �� .
	`34`	`+`
	`35`	+�� , �� , � �� , � �� -�� . �� , � �� , �� , �� . �� -�� .
	`36`	`+`
	`37`	`+8. ��`
	`38`	+�� -�� (�� , �� , �� ), �� , � �� , �� . �� .
	`39`	`+`
	`40`	`+9. �� `
	`41`	+�� .
	`42`	`+`
	`43`	`+`
	`44`	`+10. �� `
	`45`	+�� . �� , �� .
	`46`	`+�� .`
	`47`	`+`
	`48`	`+11. �� `
	`49`	`+�� .`
	`50`	`+�� info@postgrespro.ru`

`‎nsis/license_ee_ru.txt`

Lines changed: 50 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,50 @@`
	`1`	`+�� (EULA)`
	`2`	`+`
	`3`	+�� (��) �� (�� ) � �� (�� ) �� (�� ). � �� "�� " (Postgres Professional) (�� ) � �� Postgres Pro Enterprise, �� /�� (�� ) �� , �� (��) �� (�� ).
	`4`	`+`
	`5`	`+�� (�� )`
	`6`	`+`
	`7`	`+�� (�� /��) �� :`
	`8`	+1) ��
	`9`	`+�� .`
	`10`	+2) �� , �� (�� ) �� (��) �� .
	`11`	`+`
	`12`	`+`
	`13`	`+1. ��`
	`14`	+��, �� , �� . �� , �� , �� . �� , �� , �� .
	`15`	`+`
	`16`	`+2. �� `
	`17`	+�� , �� . �� "��" �� , �� (��, �� , ��-�� .�.).
	`18`	`+`
	`19`	`+3. ��`
	`20`	`+�� . �� .`
	`21`	`+`
	`22`	`+4. �� `
	`23`	+�� , �� , �� , �� , ��, ��, �� -�� .
	`24`	`+`
	`25`	`+5. �� .`
	`26`	`+�� . �� .`
	`27`	`+`
	`28`	`+6. �� `
	`29`	`+�� .`
	`30`	+�� , �� , �� , � �� . �� -�� .
	`31`	`+`
	`32`	`+7. �� `
	`33`	+�� -�� . �� "�� ", �� -�� , �� , �� -�� . �� , �� , �� .
	`34`	`+`
	`35`	+�� , �� , � �� , � �� -�� . �� , � �� , �� , �� . �� -�� .
	`36`	`+`
	`37`	`+8. ��`
	`38`	+�� -�� (�� , �� , �� ), �� , � �� , �� . �� .
	`39`	`+`
	`40`	`+9. �� `
	`41`	+�� .
	`42`	`+`
	`43`	`+`
	`44`	`+10. �� `
	`45`	+�� . �� , �� .
	`46`	`+�� .`
	`47`	`+`
	`48`	`+11. �� `
	`49`	`+�� .`
	`50`	`+�� info@postgrespro.ru`

`‎nsis/license_std_en.txt`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,32 @@`
	`1`	`+====================`
	`2`	`+PostgreSQL License`
	`3`	`+====================`
	`4`	`+Portions Copyright � 1996-2018, The PostgreSQL Global Development Group`
	`5`	`+`
	`6`	`+Portions Copyright � 1994, The Regents of the University of California`
	`7`	`+`
	`8`	`+Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.`
	`9`	`+`
	`10`	`+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.`
	`11`	`+`
	`12`	`+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.`
	`13`	`+`
	`14`	`+==========================`
	`15`	`+Postgres Pro Std License`
	`16`	`+==========================`
	`17`	`+`
	`18`	`+Portions Copyright � 2015-2018, Postgres Professional`
	`19`	`+`
	`20`	`+Portions Copyright � 1996-2018, The PostgreSQL Global Development Group`
	`21`	`+`
	`22`	`+Portions Copyright � 1994, The Regents of the University of California`
	`23`	`+`
	`24`	`+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.`
	`25`	`+`
	`26`	`+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.`
	`27`	`+`
	`28`	`+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.`
	`29`	`+`
	`30`	`+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.`
	`31`	`+`
	`32`	`+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.`

`‎nsis/license_std_ru.txt`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,13 @@`
	`1`	`+Portions Copyright (c) 2015-2018, Postgres Professional`
	`2`	`+Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group`
	`3`	`+Portions Copyright (c) 1994 Regents of the University of California`
	`4`	`+`
	`5`	+�� , ��, �� , �� , �� , �� -�� , �� , �� . �� , �� , �� .
	`6`	`+`
	`7`	+�� , �� , �� , �� , �� .
	`8`	`+`
	`9`	+�� , ��, �� : �� . �� "�� " � �� , ��, ��, �� .
	`10`	`+`
	`11`	+�� "�� " (Postgres Professional) �� , �� , �� , �� , �� "�� " �� .
	`12`	`+`
	`13`	+�� "�� " (Postgres Professional) �� , ��, �� : �� . �� "�� " � �� "�� " �� , ��, ��, �� .

`‎nsis/postgresql.nsi`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,10 @@ Section $(componentClient) secClient`
`259`	`259`	`;File /r ${PG_INS_SOURCE_DIR}\share\.`
`260`	`260`	`;File /r ${PG_INS_SOURCE_DIR}\symbols\.`
`261`	`261`
`262`		`- File"License.txt"`
	`262`	`+;File "License.txt"`
	`263`	`+ File${myLicenseFile_ru}`
	`264`	`+ File${myLicenseFile_en}`
	`265`	`+`
`263`	`266`	`File"3rd_party_licenses.txt"`
`264`	`267`
`265`	`268`	`CreateDirectory"$INSTDIR\scripts"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit856497e

File tree

6 files changed

6 files changed

`‎build/helpers/postgres_nsis_installer.cmd`

`‎nsis/license_ee_en.txt`

`‎nsis/license_ee_ru.txt`

`‎nsis/license_std_en.txt`

`‎nsis/license_std_ru.txt`

`‎nsis/postgresql.nsi`

0 commit comments