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

Skip to content

Commit 9b3a0f4

Browse files
dmpgprodmpgpro
committed
Merge branch 'PGPRO_DEV' into PGPRO
2 parents b1ef5cb + fb126cf commit 9b3a0f4

12 files changed

+867
-138
lines changed

‎build/helpers/dependencies.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ CD /D %DEPENDENCIES_SRC_DIR%
7272
7z x %DOWNLOADS_DIR%\wineditline-%EDITLINE_VER%.zip
7373
CD /D wineditline-%EDITLINE_VER%\src
7474
patch -p2 < %ROOT%/patches/wineditline/clipboard_paste.patch || goto :ERROR
75-
CL -I. -c history.c editline.c fn_complete.c || goto :ERROR
75+
CL -I. /MD -c history.c editline.c fn_complete.c || goto :ERROR
7676
LIB /out:edit.lib *.obj || goto :ERROR
7777
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline
7878
MKDIR %DEPENDENCIES_BIN_DIR%\wineditline\include
@@ -140,6 +140,7 @@ rm -rf %DEPENDENCIES_BIN_DIR%\uuid %DEPENDENCIES_SRC_DIR%\ossp_uuid
140140
MKDIR %DEPENDENCIES_BIN_DIR%\uuid
141141
7z x %DOWNLOADS_DIR%\ossp_uuid_1.6.2_win32_source_120608.7z -o%DEPENDENCIES_SRC_DIR%\ -y || GOTO :ERROR
142142
CD /D %DEPENDENCIES_SRC_DIR%\ossp_uuid
143+
patch -p1 < %ROOT%/patches/uuid/oosp_uuid.patch || goto :ERROR
143144
IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid.sln || GOTO :ERROR
144145
IF %ARCH% == X64 sed -i 's/Win32/x64/g' ossp_uuid\ossp_uuid.vcxproj || GOTO :ERROR
145146
IF %ARCH% == X64 sed -i 's/Win32/x64/g' example\example.vcxproj || GOTO :ERROR

‎build/helpers/postgres.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -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

100644100755
+26-6
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
)
@@ -122,17 +122,37 @@ GOTO :ENDLIC
122122

123123
CD /D %NSIS_RES_DIR% || GOTO :ERROR
124124
rem Genarate file lists
125-
126-
type server.files > allserver.files
125+
rem Remove old filelists first
126+
rm -f *_list.nsi
127+
rem tune pattern lists to major version and product
128+
IF "%PG_MAJOR_VERSION%" == "9.6" (
129+
sed "s/wal/xlog/" server.files > allserver.files
130+
sed "s/wal/xlog/" client.files > allclient.files
131+
echo ./bin/createlang.* >> allclient.files
132+
echo ./bin/droplang.* >> allclient.files
133+
) ELSE (
134+
cat server.files > allserver.files
135+
type client.files > allclient.files
136+
)
127137
IF NOT "%PG_MAJOR_VERSION%" == "9.6" GOTO :NO_PGPRO_UPGRADE
128138
IF "%PRODUCT_NAME%" == "PostgresPro" GOTO :ADD_PGPRO_UPGRADE
129139
IF "%PRODUCT_NAME%" == "PostgresProEnterprise" GOTO :ADD_PGPRO_UPGRADE
130140
GOTO :NO_PGPRO_UPGRADE
131141
:ADD_PGPRO_UPGRADE
132-
type server.files pgpro_upgrade.files > allserver.files
142+
type pgpro_upgrade.files >> allserver.files
133143
:NO_PGPRO_UPGRADE
134144

135-
%PYTHON64_PATH%/python %ROOT%/build/helpers/genlists.py %PG_INS_SOURCE_DIR% client.files devel.files plperl.files plpython2.files plpython3.files unneeded.files allserver.files
145+
rem pg_repack binary should be in serever section
146+
rem It is included into PostgresProEnterpise only
147+
rem pg_repack extension is included by same pattern as
148+
rem all other contrib extensions
149+
150+
IF "%PRODUCT_NAME%" == "PostgresProEnterprise" (
151+
echo ./bin/pg_repack.* >> allserver.files
152+
)
153+
154+
rem expand pattern lists to actual file lists
155+
%PYTHON64_PATH%/python %ROOT%/build/helpers/genlists.py %PG_INS_SOURCE_DIR% allclient.files devel.files plperl.files plpython2.files plpython3.files unneeded.files allserver.files || GOTO :ERROR
136156

137157
rem generate installer itself
138158
makensis postgresql.nsi || GOTO :ERROR

‎nsis/devel.files

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
./bin/pg_config.*
44
./bin/ecpg.*
55
./symbols/*.pdb
6+
./share/errcodes.txt

‎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
Large diffs are not rendered by default.

‎nsis/license_std_ru.txt

+203-13
Large diffs are not rendered by default.

‎nsis/pgpro_upgrade.files

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
./bin/sh.*
2+
./bin/mv.*
23
./bin/sed.*
34
./bin/pgpro_upgrade
5+
./share/pgpro-upgrade/*

‎nsis/postgresql.nsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Section $(componentClient) secClient
253253

254254

255255

256-
!include client_list.nsi
256+
!include allclient_list.nsi
257257
;SetOutPath "$INSTDIR\bin"
258258
;File /r ${PG_INS_SOURCE_DIR}\*.*
259259
;File /r ${PG_INS_SOURCE_DIR}\bin\*.*

‎nsis/server.files

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
./bin/pg_test_timing.*
1313
./bin/pg_upgrade.*
1414
./bin/pg_waldump.*
15+
./bin/pg_verify_checksums.*
1516
./bin/postgres.*
1617
./bin/postmaster.*
1718
./bin/zic.*

‎patches/uuid/oosp_uuid.patch

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
diff --git a/example/example.vcxproj b/example/example.vcxproj
2+
index 66d5a2a..4c1d0cf 100644
3+
--- a/example/example.vcxproj
4+
+++ b/example/example.vcxproj
5+
@@ -41,7 +41,7 @@
6+
<ClCompile>
7+
<WarningLevel>Level3</WarningLevel>
8+
<Optimization>Disabled</Optimization>
9+
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
10+
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
11+
<AdditionalIncludeDirectories>$(SolutionDir)\include</AdditionalIncludeDirectories>
12+
</ClCompile>
13+
<Link>
14+
@@ -56,7 +56,7 @@
15+
<Optimization>MaxSpeed</Optimization>
16+
<FunctionLevelLinking>true</FunctionLevelLinking>
17+
<IntrinsicFunctions>true</IntrinsicFunctions>
18+
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
19+
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
20+
<AdditionalIncludeDirectories>$(SolutionDir)\include</AdditionalIncludeDirectories>
21+
</ClCompile>
22+
<Link>
23+
diff --git a/ossp_uuid/ossp_uuid.vcxproj b/ossp_uuid/ossp_uuid.vcxproj
24+
index 357f009..36babd7 100644
25+
--- a/ossp_uuid/ossp_uuid.vcxproj
26+
+++ b/ossp_uuid/ossp_uuid.vcxproj
27+
@@ -41,7 +41,7 @@
28+
<ClCompile>
29+
<WarningLevel>Level3</WarningLevel>
30+
<Optimization>Disabled</Optimization>
31+
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
32+
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
33+
</ClCompile>
34+
<Link>
35+
<GenerateDebugInformation>true</GenerateDebugInformation>
36+
@@ -53,7 +53,7 @@
37+
<Optimization>MaxSpeed</Optimization>
38+
<FunctionLevelLinking>true</FunctionLevelLinking>
39+
<IntrinsicFunctions>true</IntrinsicFunctions>
40+
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
41+
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
42+
</ClCompile>
43+
<Link>
44+
<GenerateDebugInformation>true</GenerateDebugInformation>
45+
diff --git a/uuid_cli/uuid_cli.vcxproj b/uuid_cli/uuid_cli.vcxproj
46+
index 3c3c29a..18c12dd 100644
47+
--- a/uuid_cli/uuid_cli.vcxproj
48+
+++ b/uuid_cli/uuid_cli.vcxproj
49+
@@ -42,7 +42,7 @@
50+
<WarningLevel>Level3</WarningLevel>
51+
<Optimization>Disabled</Optimization>
52+
<AdditionalIncludeDirectories>$(SolutionDir)\ossp_uuid</AdditionalIncludeDirectories>
53+
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
54+
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
55+
</ClCompile>
56+
<Link>
57+
<GenerateDebugInformation>true</GenerateDebugInformation>
58+
@@ -57,7 +57,7 @@
59+
<FunctionLevelLinking>true</FunctionLevelLinking>
60+
<IntrinsicFunctions>true</IntrinsicFunctions>
61+
<AdditionalIncludeDirectories>$(SolutionDir)\ossp_uuid</AdditionalIncludeDirectories>
62+
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
63+
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
64+
</ClCompile>
65+
<Link>
66+
<GenerateDebugInformation>true</GenerateDebugInformation>

0 commit comments

Comments
 (0)