Skip to content

Commit 22c7d12

Browse files
Ev3ntEv3nt
authored
Merge branch 'FirebirdSQL:v5.0-release' into v5.0-release
2 parents 5e1ecff + 3e31342 commit 22c7d12

Some content is hidden

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

65 files changed

+621
-237
lines changed

‎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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
stopServerIfRunning() {
8-
checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
8+
checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
99

1010
if [ ! -z "$checkString" ]
1111
then
@@ -16,7 +16,7 @@ stopServerIfRunning() {
1616
fi
1717
fi
1818

19-
checkString=`ps -ef | egrep "(fbserver|fbguard)" |grep -v grep`
19+
checkString=`ps -ef | grep -E "(fbserver|fbguard)" |grep -v grep`
2020
if [ ! -z "$checkString" ]
2121
then
2222
# careful shutdown of server failed :)

‎builds/install/arch-specific/linux/makeInstallImage.sh.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ addLibs() {
6161
[ "$LIB" ] && echo "export LIBTOMMATH=$LIB" >>$libTarget
6262
LIB=`$OBJDUMP -p $libSdir/firebird|grep NEEDED|grep tomcrypt|awk '{print $2;}'`
6363
[ "$LIB" ] && echo "export LIBTOMCRYPT=$LIB" >>$libTarget
64-
LIB=$(echo `$OBJDUMP -p $libSdir/isql|grep NEEDED|egrep "(curses|termcap|tinfo)"|awk '{print $2;}'`)
64+
LIB=$(echo `$OBJDUMP -p $libSdir/isql|grep NEEDED|grep -E "(curses|termcap|tinfo)"|awk '{print $2;}'`)
6565
[ "$LIB" ] && echo "export LIBCURSES='$LIB'" >>$libTarget
6666
echo >>$libTarget
6767

‎builds/install/arch-specific/win32/BuildExecutableInstall.bat‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,18 @@ if "%FB2_SNAPSHOT%"=="1" (
228228
:: these version numbers. %MSVC_RUNTIME_FILE_VERSION% should represent 140.
229229
:: %MSVC_RUNTIME_LIBRARY_VERSION% is based on the Visual Studio version used.
230230
:: These variables are set in setenvvar.bat.
231-
@for %%f in ( msvcp%MSVC_RUNTIME_FILE_VERSION%.dll vcruntime%MSVC_RUNTIME_FILE_VERSION%.dll ) do (
231+
:: Note 2: 32-bit vcruntime140_1.dll does not exist, hence the test for file existence
232+
@for %%f in ( msvcp%MSVC_RUNTIME_FILE_VERSION%.dll msvcp%MSVC_RUNTIME_FILE_VERSION%_1.dll vcruntime%MSVC_RUNTIME_FILE_VERSION%.dll vcruntime%MSVC_RUNTIME_FILE_VERSION%_1.dll ) do (
233+
if exist "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f" (
232234
echo Copying "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f"
233235
copy "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f" %FB_OUTPUT_DIR%\ >nul
234236
if ERRORLEVEL 1 (
235-
call :ERROR Copying "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f" failed with error %ERRLEV% & goto :EOF
237+
call :ERROR Copying "%VCToolsRedistDir%\%VSCMD_ARG_TGT_ARCH%\Microsoft.VC%MSVC_RUNTIME_LIBRARY_VERSION%.CRT\%%f" failed with error %ERRLEV% & goto :EOF
236238
)
239+
)
237240
)
238241

242+
239243
@if "%VSCMD_ARG_TGT_ARCH%"=="x86" (
240244
echo Generating fbclient_bor.lib
241245
where /Q implib.exe
@@ -246,6 +250,7 @@ if "%FB2_SNAPSHOT%"=="1" (
246250
)
247251
)
248252

253+
249254
@if "%FBBUILD_SHIP_PDB%"=="ship_pdb" (
250255
echo Copying pdb files...
251256
copy %FB_TEMP_DIR%\%FBBUILD_BUILDTYPE%\chacha\chacha.pdb %FB_OUTPUT_DIR%\plugins\ > nul

‎builds/install/arch-specific/win32/FirebirdInstall.iss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -544,12 +544,12 @@ Source: {#WOW64Dir}\zlib1.dll; DestDir: {app}\WOW64; Components: ClientComponent
544544
;We just install the runtimes into the install dir.
545545

546546
#if Int(msvc_runtime_major_version,14) >= 14
547-
Source: {#FilesDir}\{#msvcr_filename}{#msvc_runtime_file_version}.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile;
548-
Source: {#FilesDir}\msvcp{#msvc_runtime_file_version}.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile;
547+
Source: {#FilesDir}\{#msvcr_filename}{#msvc_runtime_file_version}*.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile;
548+
Source: {#FilesDir}\msvcp{#msvc_runtime_file_version}*.dll; DestDir: {app}; Components: ClientComponent; Flags: sharedfile;
549549
#if PlatformTarget == "x64"
550550
;If we are installing on x64 we need some 32-bit libraries for compatibility with 32-bit applications
551-
Source: {#WOW64Dir}\{#msvcr_filename}{#msvc_runtime_file_version}.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile;
552-
Source: {#WOW64Dir}\msvcp{#msvc_runtime_file_version}.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile;
551+
Source: {#WOW64Dir}\{#msvcr_filename}{#msvc_runtime_file_version}*.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile;
552+
Source: {#WOW64Dir}\msvcp{#msvc_runtime_file_version}*.dll; DestDir: {app}\WOW64; Components: ClientComponent; Flags: sharedfile;
553553
#endif
554554
#endif /* #if Int(msvc_runtime_major_version,14) >= 10 */
555555

‎builds/install/posix-common/posixLibrary.sh.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ checkLibraries() {
249249
grepProcess() {
250250
processList=$1
251251
eol=\$
252-
ps $psOptions | egrep "\<($processList)($eol|[[:space:]])" | grep -v grep | grep -v -w '\-path'
252+
ps $psOptions | grep -E "\<($processList)($eol|[[:space:]])" | grep -v grep | grep -v -w '\-path'
253253
}
254254

255255

‎builds/posix/make.android.arm64‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ endif
66

77
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88

9-
CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android24-
9+
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android29-
1010
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111

1212
CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313

14-
CXX:=$(CROSS_PREFIX24)clang++
15-
CC:=$(CROSS_PREFIX24)clang
14+
CXX:=$(CROSS_PREFIX29)clang++
15+
CC:=$(CROSS_PREFIX29)clang
1616
AR:=$(CROSS_PREFIX)ar
1717
AS:=$(CROSS_PREFIX)as
1818
LD:=$(CROSS_PREFIX)ld
@@ -46,7 +46,7 @@ DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
4646

4747
CROSS_CONFIG=android.arm64
4848

49-
LDFLAGS += -static-libstdc++
49+
LDFLAGS += -static-libstdc++ -Wl,-z,max-page-size=16384
5050
DroidLibs := -lm -ldl -llog $(DECLIB) $(I128LIB)
5151
UDR_SUPPORT_LIBS :=
5252

0 commit comments

Comments
 (0)