Skip to content

Commit 0997b43

Browse files
author
Artyom Abakumov
committed
Merge remote-tracking branch 'origin/master' into replicator_duplicate_code
2 parents 8f16fe2 + 58d28af commit 0997b43

File tree

412 files changed

+5184
-5060
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

412 files changed

+5184
-5060
lines changed

‎.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
run: |
180180
for /r %%i in (*.bat) do unix2dos "%%i"
181181
choco uninstall --no-progress --yes innosetup
182-
choco install --no-progress --yes innosetup --version=6.1.2
182+
choco install --no-progress --yes innosetup --version=6.4.0
183183
184184
- name: Build
185185
shell: cmd

‎.vscode/c_cpp_properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
],
1414
"compilerPath": "/usr/bin/clang",
1515
"cStandard": "c17",
16-
"cppStandard": "c++17",
16+
"cppStandard": "c++20",
1717
"intelliSenseMode": "linux-clang-x64"
1818
}
1919
],

‎CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,16 @@ if (MINGW)
204204
set(CMAKE_SHARED_MODULE_PREFIX)
205205
set(CMAKE_STATIC_LIBRARY_PREFIX)
206206

207-
add_definitions(-D_WIN32_WINNT=0x0600)
208-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++17")
207+
# 0x0601 is Windows 7 - see also comments in autoconfig_msvc.h
208+
add_definitions(-D_WIN32_WINNT=0x0601)
209+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++20")
209210
endif()
210211

211212
if (UNIX)
212213
set(OS_DIR posix)
213214

214215
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
215-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4 -std=c++17")
216+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4 -std=c++20")
216217

217218
if (NOT CMAKE_CROSSCOMPILING)
218219
set(LIB_readline readline)

‎builds/docker/linux/arm32-arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ RUN cd ~/build && \
185185
tar xvf icu4c-${ARG_ICU_VERSION}-src.tgz --strip 1 -C icu4c-${ARG_ICU_VERSION}-src && \
186186
mkdir icu4c-${ARG_ICU_VERSION}-build-x86_64 && \
187187
cd icu4c-${ARG_ICU_VERSION}-build-x86_64 && \
188-
CXXFLAGS='-std=c++17 -static-libstdc++' ../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
188+
CXXFLAGS='-std=c++20 -static-libstdc++' ../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
189189
Linux \
190190
--host=x86_64-pc-linux-gnu && \
191191
make -j${ARG_CPUCOUNT}
192192

193193
RUN cd ~/build && \
194194
mkdir icu4c-${ARG_ICU_VERSION}-build && \
195195
cd icu4c-${ARG_ICU_VERSION}-build && \
196-
CXXFLAGS='-std=c++17 -static-libstdc++' ../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
196+
CXXFLAGS='-std=c++20 -static-libstdc++' ../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
197197
Linux \
198198
--host=${ARG_TARGET_ARCH} \
199199
--with-cross-build=/home/ctng/build/icu4c-${ARG_ICU_VERSION}-build-x86_64 \

‎builds/docker/linux/x86-x64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ RUN cd ~/build && \
183183
tar xvf icu4c-${ARG_ICU_VERSION}-src.tgz --strip 1 -C icu4c-${ARG_ICU_VERSION}-src && \
184184
mkdir icu4c-${ARG_ICU_VERSION}-build && \
185185
cd icu4c-${ARG_ICU_VERSION}-build && \
186-
CXXFLAGS='-std=c++17 -static-libstdc++' setarch $ARG_SET_ARCH ../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
186+
CXXFLAGS='-std=c++20 -static-libstdc++' setarch $ARG_SET_ARCH ../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
187187
Linux \
188188
--host=${ARG_TARGET_ARCH} \
189189
--prefix=/home/ctng/x-tools/${ARG_TARGET_ARCH}/${ARG_TARGET_ARCH}/sysroot/usr/local \

‎builds/docker/windows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN `
4343
`
4444
choco install --no-progress --yes git --version=2.33.1 && `
4545
choco install --no-progress --yes 7zip.install --version=19.0 && `
46-
choco install --no-progress --yes innosetup --version=6.1.2 && `
46+
choco install --no-progress --yes innosetup --version=6.4.0 && `
4747
choco install --no-progress --yes wixtoolset --version=3.11.2 && `
4848
`
4949
refreshenv && `

‎builds/install/arch-specific/aix/misc/aixLibrary.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ getInitScriptLocation() {
8585
# stop super server if it is running
8686

8787
stopSuperServerIfRunning() {
88-
checkString=`ps -eaf | egrep "\b(fbserver|fbguard)\b" |grep -v grep`
88+
checkString=`ps -eaf | grep -E "\b(fbserver|fbguard)\b" |grep -v grep`
8989

9090
if [ ! -z "$checkString" ]
9191
then

‎builds/install/arch-specific/freebsd/freebsdLibrary.sh.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ getInitScriptLocation() {
107107
# stop super server if it is running
108108

109109
stopSuperServerIfRunning() {
110-
checkString=`ps -af | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
110+
checkString=`ps -af | grep -E "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
111111

112112
if [ ! -z "$checkString" ]
113113
then
@@ -120,7 +120,7 @@ stopSuperServerIfRunning() {
120120
do
121121
$init_d stop
122122
sleep 1
123-
checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
123+
checkString=`ps -eaf | grep -E "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
124124
if [ -z "$checkString" ]
125125
then
126126
return
@@ -211,7 +211,7 @@ startService() {
211211
then
212212
"$InitFile" start
213213

214-
checkString=`ps -af | egrep "\b(fbserver|fb_smp_server)\b" |grep -v grep`
214+
checkString=`ps -af | grep -E "\b(fbserver|fb_smp_server)\b" |grep -v grep`
215215
if [ -z "$checkString" ]
216216
then
217217
# server didn't start - possible reason bad shell /bin/false for user "firebird"

‎builds/install/arch-specific/hpux/misc/hpuxLibrary.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ getInitScriptLocation() {
7979
# stop super server if it is running
8080

8181
stopSuperServerIfRunning() {
82-
checkString=`ps -eaf | egrep "\b(fbserver|fbguard)\b" |grep -v grep`
82+
checkString=`ps -eaf | grep -E "\b(fbserver|fbguard)\b" |grep -v grep`
8383

8484
if [ ! -z "$checkString" ]
8585
then

‎builds/install/arch-specific/hpux/super/preInstall.sh.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
stopServerIfRunning() {
2323

24-
checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
24+
checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
2525

2626
if [ ! -z "$checkString" ]
2727
then
@@ -42,7 +42,7 @@
4242
stopServerIfRunning
4343

4444

45-
checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
45+
checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
4646

4747
if [ ! -z "$checkString" ]
4848
then
@@ -54,7 +54,7 @@
5454

5555

5656

57-
checkString=`ps -ef | egrep "(fb_inet_server|fb_smp_server)" |grep -v grep`
57+
checkString=`ps -ef | grep -E "(fb_inet_server|fb_smp_server)" |grep -v grep`
5858

5959
if [ ! -z "$checkString" ]
6060
then
@@ -67,7 +67,7 @@
6767

6868
# Stop lock manager if it is the only thing running.
6969

70-
for i in `ps -ef | egrep "fb_lock_mgr" | awk '{print $2}' `
70+
for i in `ps -ef | grep -E "fb_lock_mgr" | awk '{print $2}' `
7171
do
7272
kill $i
7373
done

0 commit comments

Comments
 (0)