diff --git a/builds/cmake/BuildFunctions.cmake b/builds/cmake/BuildFunctions.cmake
index 1be5dcbb72..e6e9aea3d9 100644
--- a/builds/cmake/BuildFunctions.cmake
+++ b/builds/cmake/BuildFunctions.cmake
@@ -88,7 +88,7 @@ function(epp_process type files)
foreach(F ${${files}})
set(in ${CMAKE_CURRENT_SOURCE_DIR}/${F})
set(out ${CMAKE_CURRENT_BINARY_DIR}/${F}${epp_suffix})
-
+
get_filename_component(dir ${out} PATH)
if (MSVC OR XCODE)
set(dir ${dir}/$)
@@ -112,7 +112,6 @@ function(epp_process type files)
COMMENT "Calling GPRE master for ${F}"
#
COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
- COMMAND ${CMAKE_COMMAND} -E copy_if_different metadata.fdb ${dir}/yachts.lnk
COMMAND ${CMAKE_COMMAND} -E copy_if_different security.fdb ${dir}/security.fdb
COMMAND ${CMAKE_COMMAND} -E copy_if_different msg.fdb ${dir}/msg.fdb
COMMAND ${CMAKE_COMMAND} -E copy_if_different help.fdb ${dir}/help.fdb
@@ -263,13 +262,13 @@ function(create_command command type out)
if ("${type}" STREQUAL "boot")
set(dir ${boot_dir})
endif()
-
+
set_win32(env "PATH=${dir}\;%PATH%")
set_unix (env "PATH=${dir}/bin:$PATH")
set(env "${env}"
FIREBIRD=${dir}
)
-
+
set(cmd_name ${command})
if (MSVC OR XCODE)
set(conf _$)
@@ -288,16 +287,16 @@ function(create_command command type out)
endif()
set(cmd_name ${cmd_name}${conf}${ext})
set(cmd_name ${CMAKE_BINARY_DIR}/src/${cmd_name})
-
+
set(content)
foreach(e ${env})
set(content "${content}${pre_cmd}${export} ${e}\n")
endforeach()
-
+
set(cmd $)
set(content "${content}${pre_cmd}${cmd} ${options}")
file(GENERATE OUTPUT ${cmd_name} CONTENT "${content}")
-
+
if (UNIX)
set(cmd_name chmod u+x ${cmd_name} COMMAND ${cmd_name})
endif()
diff --git a/builds/cmake/SourceGroups.cmake b/builds/cmake/SourceGroups.cmake
index b238c6e6a6..58529882e6 100644
--- a/builds/cmake/SourceGroups.cmake
+++ b/builds/cmake/SourceGroups.cmake
@@ -48,7 +48,4 @@ source_group("JRD files\\${GEN_TXT}" "${BSRC}/jrd/${GEN}")
source_group("JRD files\\Trace" "${SSRC}/jrd/trace/${CPP}")
source_group("Lock" "${SSRC}/lock/${CPP}")
source_group("REMOTE files" "${SSRC}/remote/${CPP}")
-source_group("QLI files" "${SSRC}/qli/${CPP}")
-source_group("QLI files\\${EPP_TXT}" "${SSRC}/qli/${EPP}")
-source_group("QLI files\\${GEN_TXT}" "${BSRC}/qli/${GEN}")
source_group("UTILITIES files" "${SSRC}/utilities/${CPP}")
diff --git a/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in b/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in
index 51b55595ea..7eb9e57fac 100644
--- a/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in
+++ b/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in
@@ -137,7 +137,6 @@ copyFiles() {
cp $BuiltFBDir/bin/gstat $DestDir/bin/gstat
copyIfExists $BuiltFBDir/bin/isc4.gbak $DestDir/bin/isc4.gbak
cp $BuiltFBDir/bin/isql $DestDir/bin/isql
- cp $BuiltFBDir/bin/qli $DestDir/bin/qli
# Append libraries to scripts
addLibs $BuiltFBDir/bin changedbapassword.aix.sh $DestDir/bin
@@ -167,9 +166,6 @@ copyFiles() {
echo "Example files have not been built!"
fi
- copyIfExists $BuiltFBDir/help/help.gbak $DestDir/help
- cp $BuiltFBDir/help/help.fdb $DestDir/help
-
#cp -r $BuildSrcDir/doc $DestDir
#cp -r $BuiltFBDir/doc $DestDir
@@ -194,7 +190,7 @@ copyFiles() {
# Copy various upgrade stuff
cp $BuildRootDir/src/misc/intl.sql $DestDir/misc/
cp $BuildRootDir/src/misc/upgrade/v3.0/security_database* $DestDir/misc/upgrade/security/
-
+
# Misc config files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/
cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/
diff --git a/builds/install/arch-specific/freebsd/install.sh.in b/builds/install/arch-specific/freebsd/install.sh.in
index 6f2b37c3e9..236564ff98 100755
--- a/builds/install/arch-specific/freebsd/install.sh.in
+++ b/builds/install/arch-specific/freebsd/install.sh.in
@@ -137,7 +137,7 @@ copyFiles() {
#directories
makeDirs "@FB_BINDIR@ @FB_SBINDIR@ @FB_CONFDIR@ @FB_LIBDIR@ @FB_INCDIR@ @FB_DOCDIR@/sql.extensions @FB_SAMPLEDIR@ \
- @FB_SAMPLEDBDIR@ @FB_HELPDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ \
+ @FB_SAMPLEDBDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ \
@FB_GUARDDIR@ @FB_PLUGDIR@ @FB_TZDATADIR@"
for i in metadata security; do
@@ -159,7 +159,6 @@ copyFiles() {
copyIfExists $BuiltFBDir/bin/fbsvcmgr ${TargetDir}@FB_BINDIR@
copyIfExists $BuiltFBDir/bin/fbtracemgr ${TargetDir}@FB_BINDIR@
cp $BuiltFBDir/bin/isql ${TargetDir}@FB_BINDIR@/isql
- cp $BuiltFBDir/bin/qli ${TargetDir}@FB_BINDIR@/qli
chown root:wheel ${TargetDir}@FB_BINDIR@/*
chmod 0755 ${TargetDir}@FB_BINDIR@/*
@@ -219,13 +218,6 @@ copyFiles() {
chmod 0444 ${TargetDir}@FB_SAMPLEDBDIR@/*.fdb
fi
- #QLI help
- copyIfExists $BuiltFBDir/help/help.gbak ${TargetDir}@FB_HELPDIR@
- cp $BuiltFBDir/help/help.fdb ${TargetDir}@FB_HELPDIR@
-
- chown root:wheel ${TargetDir}@FB_HELPDIR@/*.fdb
- chmod 0444 ${TargetDir}@FB_HELPDIR@/*.fdb
-
#message file
cp $BuiltFBDir/*.msg ${TargetDir}@FB_MSGDIR@
@@ -368,9 +360,6 @@ fixFilePermissions() {
do
MakeFileFirebirdWritable $i
done
-
- cd @FB_HELPDIR@
- chmod a=r help.fdb
}
diff --git a/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in b/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in
index 9cc18e2968..41ad0d15e7 100644
--- a/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in
+++ b/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in
@@ -135,7 +135,6 @@ copyFiles() {
cp $BuiltFBDir/bin/gstat $DestDir/bin/gstat
copyIfExists $BuiltFBDir/bin/isc4.gbak $DestDir/bin/isc4.gbak
cp $BuiltFBDir/bin/isql $DestDir/bin/isql
- cp $BuiltFBDir/bin/qli $DestDir/bin/qli
# Append libraries to scripts
addLibs $BuiltFBDir/bin changedbaPassword.sh $DestDir/bin
@@ -166,9 +165,6 @@ copyFiles() {
echo "Example files have not been built!"
fi
- copyIfExists $BuiltFBDir/help/help.gbak $DestDir/help
- cp $BuiltFBDir/help/help.fdb $DestDir/help
-
#cp -r $BuildSrcDir/doc $DestDir
#cp -r $BuiltFBDir/doc $DestDir
@@ -200,7 +196,7 @@ copyFiles() {
# Copy various upgrade stuff
cp $BuildRootDir/src/misc/intl.sql $DestDir/misc/
cp $BuildRootDir/src/misc/upgrade/v3.0/security_database* $DestDir/misc/upgrade/security/
-
+
# Misc config files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/
cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/
diff --git a/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in b/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in
index c953e92ab4..f21a4bc1c0 100644
--- a/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in
+++ b/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in
@@ -109,7 +109,6 @@ copyFiles() {
cp $BuiltFBDir/bin/gstat $DestDir/bin/gstat
copyIfExists $BuiltFBDir/bin/security.gbak $DestDir/bin/security.gbak
cp $BuiltFBDir/bin/isql $DestDir/bin/isql
- cp $BuiltFBDir/bin/qli $DestDir/bin/qli
cp $BuildRootDir/gen/install/bin/SSchangeRunUser.sh $DestDir/bin
cp $BuildRootDir/gen/install/bin/SSrestoreRootRunUser.sh $DestDir/bin
@@ -134,9 +133,6 @@ copyFiles() {
done
fi
- copyIfExists $BuiltFBDir/help/help.gbak $DestDir/help
- cp $BuiltFBDir/help/help.fdb $DestDir/help
-
#cp -r $BuildSrcDir/doc $DestDir
#cp -r $BuiltFBDir/doc $DestDir
diff --git a/builds/install/arch-specific/linux/makeInstallImage.sh.in b/builds/install/arch-specific/linux/makeInstallImage.sh.in
index 4402bec89a..a29a467024 100644
--- a/builds/install/arch-specific/linux/makeInstallImage.sh.in
+++ b/builds/install/arch-specific/linux/makeInstallImage.sh.in
@@ -162,7 +162,7 @@ copyFiles() {
#directories
makeDirs "@FB_BINDIR@ @FB_SBINDIR@ @FB_CONFDIR@ @FB_LIBDIR@ @FB_INCDIR@/firebird @FB_DOCDIR@/sql.extensions \
- @FB_SAMPLEDIR@ @FB_SAMPLEDBDIR@ @FB_HELPDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ \
+ @FB_SAMPLEDIR@ @FB_SAMPLEDBDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ \
@FB_GUARDDIR@ @FB_PLUGDIR@ @FB_TZDATADIR@"
for i in udf; do
@@ -182,7 +182,6 @@ copyFiles() {
copyIfExists $BuiltFBDir/bin/fbsvcmgr ${TargetDir}@FB_BINDIR@
copyIfExists $BuiltFBDir/bin/fbtracemgr ${TargetDir}@FB_BINDIR@
cp $BuiltFBDir/bin/isql ${TargetDir}@FB_BINDIR@/isql
- cp $BuiltFBDir/bin/qli ${TargetDir}@FB_BINDIR@/qli
chmod 0755 ${TargetDir}@FB_BINDIR@/*
@@ -226,12 +225,6 @@ copyFiles() {
chmod 0755 ${TargetDir}@FB_SAMPLEDIR@/prebuilt/bin/*
fi
- #QLI help
- copyIfExists $BuiltFBDir/help/help.gbak ${TargetDir}@FB_HELPDIR@
- cp $BuiltFBDir/help/help.fdb ${TargetDir}@FB_HELPDIR@
-
- chmod 0444 ${TargetDir}@FB_HELPDIR@/*.fdb
-
#message file
cp $BuiltFBDir/*.msg ${TargetDir}@FB_MSGDIR@
diff --git a/builds/install/arch-specific/netbsd/install.sh.in b/builds/install/arch-specific/netbsd/install.sh.in
index f820fef0b0..656257a489 100644
--- a/builds/install/arch-specific/netbsd/install.sh.in
+++ b/builds/install/arch-specific/netbsd/install.sh.in
@@ -151,7 +151,6 @@ copyIfExists $BuiltFBDir/bin/gsplit $DestDir/bin/gsplit || exit
cp $BuiltFBDir/bin/gstat $DestDir/bin/gstat || exit
copyIfExists $BuiltFBDir/bin/isc4.gbak $DestDir/bin/isc4.gbk || exit
cp $BuiltFBDir/bin/isql $DestDir/bin/isql || exit
-cp $BuiltFBDir/bin/qli $DestDir/bin/qli || exit
# Copy examples only if we have them
exampleFiles=`find $BuiltFBDir/examples/ -type f -print`
@@ -165,9 +164,6 @@ else
done
fi
-copyIfExists $BuiltFBDir/help/help.gbak $DestDir/help || exit
-cp $BuiltFBDir/help/help.fdb $DestDir/help || exit
-
cp $BuiltFBDir/firebird.msg $DestDir/firebird.msg || exit
cp $BuiltFBDir/security2.fdb $DestDir/security2.fdb.sample || exit
@@ -240,7 +236,7 @@ do
chmod ug=rx,o= $i || exit
done
-chmod a=rx isql qli
+chmod a=rx isql
# SUID is needed for running server programs.
for i in fb_lock_mgr gds_drop fb_smp_server
diff --git a/builds/install/arch-specific/solaris/CS/prototype.in b/builds/install/arch-specific/solaris/CS/prototype.in
index 360c6bc1cf..d5695263d7 100644
--- a/builds/install/arch-specific/solaris/CS/prototype.in
+++ b/builds/install/arch-specific/solaris/CS/prototype.in
@@ -71,7 +71,6 @@ f none @prefix@/bin/gstat=$SRCDIR/bin/gstat 0451 firebird firebird
#f none @prefix@/bin/fbguard=$SRCDIR/bin/fbguard 0451 firebird firebird
#f none @prefix@/bin/fbmgr.bin=$SRCDIR/bin/fbmgr.bin 0451 firebird firebird
f none @prefix@/bin/fb_lock_print=$SRCDIR/bin/fb_lock_print 0451 firebird firebird
-f none @prefix@/bin/qli=$SRCDIR/bin/qli 0555 firebird firebird
# from 2.0
f none @prefix@/bin/nbackup=$SRCDIR/bin/nbackup 0451 firebird firebird
diff --git a/builds/install/arch-specific/solaris/SS/prototype.in b/builds/install/arch-specific/solaris/SS/prototype.in
index 35bd67adb8..7d652f5278 100644
--- a/builds/install/arch-specific/solaris/SS/prototype.in
+++ b/builds/install/arch-specific/solaris/SS/prototype.in
@@ -72,7 +72,6 @@ f none @prefix@/bin/fbguard=$SRCDIR/bin/fbguard 0755 firebird firebird
f none @prefix@/bin/fbserver=$SRCDIR/bin/fbserver 0755 firebird firebird
f none @prefix@/bin/fbmgr.bin=$SRCDIR/bin/fbmgr.bin 0755 firebird firebird
f none @prefix@/bin/fb_lock_print=$SRCDIR/bin/fb_lock_print 0755 firebird firebird
-f none @prefix@/bin/qli=$SRCDIR/bin/qli 6777 firebird firebird
# from 2.0
f none @prefix@/bin/nbackup=$SRCDIR/bin/nbackup 6777 firebird firebird
# from 2.1
diff --git a/builds/install/arch-specific/solx86gcc/CS/prototype.in b/builds/install/arch-specific/solx86gcc/CS/prototype.in
index f2c6fbb377..102dceb7b0 100644
--- a/builds/install/arch-specific/solx86gcc/CS/prototype.in
+++ b/builds/install/arch-specific/solx86gcc/CS/prototype.in
@@ -48,7 +48,6 @@ f none @prefix@/bin/gstat=$SRCDIR/bin/gstat 0755 root root
f none @prefix@/bin/isql=$SRCDIR/bin/isql 0755 root root
#f none @prefix@/bin/isql_static=$SRCDIR/bin/isql_static 0755 root root
#f none @prefix@/bin/modify_messages=$SRCDIR/bin/modify_messages 0755 root root
-f none @prefix@/bin/qli=$SRCDIR/bin/qli 0755 root root
f none @prefix@/bin/fb_lock_print=$SRCDIR/bin/fb_lock_print 0755 root root
d none @prefix@/examples 0755 root root
diff --git a/builds/install/arch-specific/win32/BuildExecutableInstall.bat b/builds/install/arch-specific/win32/BuildExecutableInstall.bat
index e05e94953d..5220bba9e5 100644
--- a/builds/install/arch-specific/win32/BuildExecutableInstall.bat
+++ b/builds/install/arch-specific/win32/BuildExecutableInstall.bat
@@ -431,22 +431,6 @@ copy %FB_ROOT_PATH%\builds\install\misc\databases.conf %FB_OUTPUT_DIR%\databases
@goto :EOF
-:MISC
-::==============================================
-:: Make sure that qli's help.fdb is available
-::===============================================
-@if not exist %FB_OUTPUT_DIR%\help\help.fdb (
- (@echo Copying help.fdb for qli support)
- (@copy %FB_GEN_DIR%\dbs\help.fdb %FB_OUTPUT_DIR%\help\help.fdb > nul)
- (@if %ERRORLEVEL% GEQ 1 ( (call :ERROR Could not copy qli help database ) & (goto :EOF)))
-)
-
-
-::End of MISC
-::-----------------
-@goto :EOF
-
-
:FB_MSG
::=================================================================
:: firebird.msg is generated as part of the build process
@@ -714,9 +698,6 @@ if defined WIX (
@echo Writing databases conf
@(@call :DB_CONF ) || (@echo Error calling DB_CONF && @goto :END)
@echo.
-@echo Copying miscellany such as the QLI help database
-@(@call :MISC ) || (@echo Error calling MISC & @goto :END)
-@echo.
@echo Copying firebird.msg
@(@call :FB_MSG ) || (@echo Error calling FB_MSG && @goto :END)
@echo.
diff --git a/builds/install/arch-specific/win32/FirebirdInstall.iss b/builds/install/arch-specific/win32/FirebirdInstall.iss
index b214b2ae9f..37128760ac 100644
--- a/builds/install/arch-specific/win32/FirebirdInstall.iss
+++ b/builds/install/arch-specific/win32/FirebirdInstall.iss
@@ -480,7 +480,6 @@ Source: {#FilesDir}\instreg.exe; DestDir: {app}; Components: ClientComponent; Fl
Source: {#FilesDir}\instsvc.exe; DestDir: {app}; Components: ServerComponent; MinVersion: {#MinVer}; Flags: sharedfile ignoreversion
Source: {#FilesDir}\isql.exe; DestDir: {app}; Components: DevAdminComponent; Flags: ignoreversion
Source: {#FilesDir}\nbackup.exe; DestDir: {app}; Components: DevAdminComponent; Flags: ignoreversion
-Source: {#FilesDir}\qli.exe; DestDir: {app}; Components: DevAdminComponent; Flags: ignoreversion
Source: {#FilesDir}\fbsvcmgr.exe; DestDir: {app}; Components: DevAdminComponent; Flags: ignoreversion
Source: {#FilesDir}\fbtracemgr.exe; DestDir: {app}; Components: DevAdminComponent; Flags: ignoreversion
Source: {#FilesDir}\fbclient.dll; DestDir: {app}; Components: ClientComponent; Flags: overwritereadonly sharedfile promptifolder
diff --git a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
index 959a1c8c5c..d4a74a59ed 100644
--- a/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+++ b/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
@@ -748,7 +748,7 @@ procedure SetupSharedFilesArray;
//to list them in the order they appear in the setup script
// Shared Files are defined as either:
// - Files which are absolutely necessary for a functioning installation.
-// Hence gbak and gfix are shared files, isql and qli are not
+// Hence gbak and gfix are shared files, isql is not
// - Libraries
// - License files
begin
@@ -803,7 +803,7 @@ SharedFileArray[34].Filename := ExpandConstant('{app}')+'fbtracemgr.exe';
SharedFileArray[35].Filename := ExpandConstant('{app}')+'zlib1.dll';
SharedFileArray[36].Filename := ExpandConstant('{app}')+'replication.conf';
-// FIXME
+// FIXME
// Add in WOW64 here.
end;
@@ -1135,7 +1135,7 @@ begin
//If existing install of the same majorver.minorver is
//found then we can upgrade it.
-//// **** FIX ME **** Don't use hardcoded constants here. They get overlooked.
+//// **** FIX ME **** Don't use hardcoded constants here. They get overlooked.
if ( (ProductsInstalledCount = 1) AND
#if PlatformTarget == "x64"
((ProductsInstalled AND FB30_x64 ) = FB30_x64 ) ) then begin
diff --git a/builds/install/posix-common/fb_config.in b/builds/install/posix-common/fb_config.in
index 6619bb0325..14d6529bf3 100644
--- a/builds/install/posix-common/fb_config.in
+++ b/builds/install/posix-common/fb_config.in
@@ -33,7 +33,6 @@ fb_confdir=@FB_CONFDIR@
fb_docdir=@FB_DOCDIR@
fb_sampledir=@FB_SAMPLEDIR@
fb_sampledbdir=@FB_SAMPLEDBDIR@
-fb_helpdir=@FB_HELPDIR@
fb_intldir=@FB_INTLDIR@
fb_miscdir=@FB_MISCDIR@
fb_securedbdir=@FB_SECDBDIR@
@@ -100,7 +99,6 @@ while test $# -gt 0
--confdir) echo $fb_confdir ;;
--docdir) echo $fb_docdir ;;
--sampledir) echo $fb_sampledir ;;
- --helpdir) echo $fb_helpdir ;;
--intldir) echo $fb_intldir ;;
--miscdir) echo $fb_miscdir ;;
--securedbdir) echo $fb_securedbdir ;;
diff --git a/builds/install/posix-common/posixLibrary.sh.in b/builds/install/posix-common/posixLibrary.sh.in
index f7ece7a203..4f9edf85c3 100644
--- a/builds/install/posix-common/posixLibrary.sh.in
+++ b/builds/install/posix-common/posixLibrary.sh.in
@@ -830,7 +830,7 @@ removeEmptyDirs() {
dirContentChanged=''
for rootDir in @FB_BINDIR@ @FB_SBINDIR@ @FB_LIBDIR@ @FB_INCDIR@ @FB_DOCDIR@ @FB_SAMPLEDIR@ @FB_SAMPLEDBDIR@ \
- @FB_HELPDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ @FB_GUARDDIR@ @FB_PLUGDIR@ \
+ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ @FB_GUARDDIR@ @FB_PLUGDIR@ \
@FB_TZDATADIR@ @FB_CONFDIR@; do
if [ -d $rootDir ]; then
@@ -878,7 +878,7 @@ fixFilePermissions() {
# First of all set owneship of all files to root
# Build list of interesting directories all over the FS
dirs="@FB_BINDIR@ @FB_SBINDIR@ @FB_CONFDIR@ @FB_LIBDIR@ @FB_INCDIR@/firebird @FB_DOCDIR@/sql.extensions \
- @FB_SAMPLEDIR@ @FB_SAMPLEDBDIR@ @FB_HELPDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ \
+ @FB_SAMPLEDIR@ @FB_SAMPLEDBDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ \
@FB_GUARDDIR@ @FB_PLUGDIR@ @FB_TZDATADIR@"
dirs2=`for i in $dirs; do echo $i; done|sort|uniq`
@@ -947,10 +947,6 @@ fixFilePermissions() {
do
MakeFileFirebirdWritable $i
done
-
- # Fix QLI help
- cd @FB_HELPDIR@
- chmod a=r help.fdb
}
diff --git a/builds/mac_os_x/CS/Helpers.make b/builds/mac_os_x/CS/Helpers.make
index f55971223a..aa64840fdc 100644
--- a/builds/mac_os_x/CS/Helpers.make
+++ b/builds/mac_os_x/CS/Helpers.make
@@ -22,7 +22,6 @@ LOCK_MGR= $(BUILD_DIR)/gds_lock_mgr
GFIX= $(BUILD_DIR)/gfix
ISQL= $(BUILD_DIR)/isql
GSEC= $(BUILD_DIR)/gsec
-QLI= $(BUILD_DIR)/qli
CHECK_MSGS= $(BUILD_DIR)/check_msgs
BUILD_MSGS= $(BUILD_DIR)/build_file
SEC_AUTH= $(VAR)/auth/security_db.auth
@@ -30,7 +29,6 @@ LOCAL_USER_AUTH= $(VAR)/auth/current_euid.auth
EMPTY_DB= $(DB_ROOT)/empty.gdb
MSG_DB= $(DB_ROOT)/msg.gdb
-HELP_DB= $(DB_ROOT)/help.gdb
META_DB= $(DB_ROOT)/metadata.gdb
ISC_DB= $(FIREBIRD)/isc4.gdb
ISC_GBAK= $(FIREBIRD)/isc.gbak
@@ -75,9 +73,6 @@ SECURITY_GEN_FILES= $(SECURITY_EPP_FILES:%.epp=$(GEN_ROOT)/utilities/%.cpp)
MSG_EPP_FILES= build_file.epp change_msgs.epp check_msgs.epp enter_msgs.epp load.epp modify_msgs.epp
MSG_GEN_FILES= $(MSG_EPP_FILES:%.epp=$(GEN_ROOT)/msgs/%.cpp)
-QLI_EPP_FILES= help.epp meta.epp proc.epp show.epp
-QLI_GEN_FILES= $(QLI_EPP_FILES:%.epp=$(GEN_ROOT)/qli/%.cpp)
-
GPRE_FLAGS= -r -m -z -n
all:
@@ -119,9 +114,6 @@ $(GEN_ROOT)/utilities/%.cpp: $(SRC_ROOT)/utilities/%.epp $(GPRE)
$(GEN_ROOT)/msgs/%.cpp: $(SRC_ROOT)/msgs/%.epp $(GPRE)
$(GPRE) $(GPRE_FLAGS) $< $@
-$(GEN_ROOT)/qli/%.cpp: $(SRC_ROOT)/qli/%.epp $(GPRE)
- $(GPRE) $(GPRE_FLAGS) $< $@
-
gds_lock_mgr: $(LOCK_MGR)
$(LOCK_MGR): $(PROJ_ROOT)/build/gds_lock_mgr
cp $< $@
@@ -205,13 +197,6 @@ gfix_preprocess_%:
gfix_preprocess_:
./gpre_wrapper.sh gfix_preprocess alice
-qli_preprocess_clean:
- rm -f $(QLI_GEN_FILES)
-qli_preprocess: $(QLI_GEN_FILES)
-qli_preprocess_%:
-qli_preprocess_:
- ./gpre_wrapper.sh qli_preprocess qli
-
security_preprocess_clean:
rm -f $(SECURITY_GEN_FILES)
security_preprocess: $(SECURITY_GEN_FILES)
@@ -237,10 +222,6 @@ empty_db_: $(EMPTY_DB)
$(EMPTY_DB):
rm -f $(EMPTY_DB)
$(CREATE_DB) $(EMPTY_DB)
- ln -fs $(EMPTY_DB) $(GEN_ROOT)/burp/yachts.lnk
- ln -fs $(EMPTY_DB) $(GEN_ROOT)/alice/yachts.lnk
- ln -fs $(EMPTY_DB) $(GEN_ROOT)/isql/yachts.lnk
- ln -fs $(EMPTY_DB) $(GEN_ROOT)/utilities/yachts.lnk
empty_db_%:
$(FULL_FW_FLAG):
@@ -262,24 +243,11 @@ $(PS_FW_FLAG): $(FULL_FW_FLAG) $(UPG_FW_FLAG)
touch $(PS_FW_FLAG)
darwin_pseudo_fw_clean:
-build_dbs_: $(MSG_DB) $(HELP_DB) $(META_DB)
-build_dbs_clean:
- rm -f $(MSG_DB) $(HELP_DB) $(META_DB)
-build_dbs_%:
-
$(MSG_DB): $(SRC_ROOT)/msgs/msg.gbak
$(GBAK) -MODE read_only -R $(SRC_ROOT)/msgs/msg.gbak $@
ln -fs $(MSG_DB) $(GEN_ROOT)/msgs/msg.gdb
ln -fs $(MSG_DB) $(GEN_ROOT)/msgs/master_msg_db
-$(HELP_DB): $(SRC_ROOT)/misc/help.gbak
- $(GBAK) -MODE read_only -R $(SRC_ROOT)/misc/help.gbak $@
- ln -fs $(HELP_DB) $(GEN_ROOT)/qli/help.gdb
-
-$(META_DB): $(SRC_ROOT)/misc/metadata.gbak
- $(GBAK) -MODE read_only -R $(SRC_ROOT)/misc/metadata.gbak $@
- ln -fs $(META_DB) $(GEN_ROOT)/qli/yachts.lnk
-
isc4.gdb_: $(ISC_DB) sysdba_user
$(ISC_DB) : $(SRC_ROOT)/utilities/isc4.sql $(SRC_ROOT)/utilities/isc4.gdl
( cd $(FIREBIRD); $(ISQL) -z -i $(SRC_ROOT)/utilities/isc4.sql)
@@ -334,7 +302,7 @@ fw_files_:
mkdir -p $(VAR)/auth
mkdir -p $(FB_FW)/Resources/bin
cp $(FIREBIRD)/interbase.msg $(VAR)/interbase.msg
- -cp $(GPRE) $(GBAK) $(ISQL) $(QLI) $(GSEC) $(GFIX) $(FB_FW)/Resources/bin
+ -cp $(GPRE) $(GBAK) $(ISQL) $(GSEC) $(GFIX) $(FB_FW)/Resources/bin
cp $(FIREBIRD)/isc.gbak $(VAR)
cp build/gdsintl $(VAR)/intl
chmod a+x $(VAR)/intl/*
diff --git a/builds/misc/help.gbak b/builds/misc/help.gbak
deleted file mode 100644
index 524fd36eae..0000000000
Binary files a/builds/misc/help.gbak and /dev/null differ
diff --git a/builds/misc/metadata.gbak b/builds/misc/metadata.gbak
deleted file mode 100644
index 8e5473c8f3..0000000000
Binary files a/builds/misc/metadata.gbak and /dev/null differ
diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in
index 0c60873452..cb371b4bb4 100644
--- a/builds/posix/Makefile.in
+++ b/builds/posix/Makefile.in
@@ -412,33 +412,13 @@ gpre: $(GPRE) databases
$(GPRE): $(GPRE_Objects) $(COMMON_LIB)
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
-HELP_FDB = $(FIREBIRD)/help/help.fdb
SECURITY_FDB = $(FIREBIRD)/security5.fdb
SECURITY_TMP = security.tmp
-databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB)
+databases: msg.timestamp $(SECURITY_FDB)
export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(FIREBIRD)/lib
-yachts.lnk: metadata.fdb
- -$(RM) $@
- $(LN) $^ $@
-
-metadata.fdb: $(RUN_ISQL) $(SRC_ROOT)/dbs/metadata.sql
- -$(RM) $@
- $(RUN_ISQL) -q -i $(SRC_ROOT)/dbs/metadata.sql
- $(RUN_GFIX) -mode read_only $@
- $(CHMOD) 0444 $@
-
-$(HELP_FDB): help.fdb
- -$(RM) $@
- $(CP) $^ $@
- $(CHMOD) 0444 $@
-
-help.fdb: $(BLD_ROOT)/misc/help.gbak
- $(RUN_GBAK) -MODE read_only -R $< $@
- $(CHMOD) 0444 $@
-
$(SECURITY_FDB): security.fdb
-$(RM) $@
$(CP) $^ $@
@@ -474,7 +454,6 @@ $(LIBIBUTIL_SO): $(UTIL_Objects)
#___________________________________________________________________________
# most of utilities, including network server and UDF support
-# qli is not here cause it needs special database (help.fdb), therefore needs gbak
#
.PHONY: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix gsec gsplit gstat isql nbackup
@@ -636,22 +615,17 @@ $(CODES): $(CODES_Objects) $(COMMON_LIB)
# all the rest we need to build
#
-.PHONY: qli message_file tzdata gbak_files
+.PHONY: message_file tzdata gbak_files
-FDB_FILES := $(HELP_FDB) $(ROOT)/gen/msg.fdb $(SECURITY_FDB) $(FIREBIRD)/examples/empbuild/employee.fdb
+FDB_FILES := $(ROOT)/gen/msg.fdb $(SECURITY_FDB) $(FIREBIRD)/examples/empbuild/employee.fdb
GBAK_FILES := $(FDB_FILES:.fdb=.gbak) $(FIREBIRD)/msg.gbak
GBAK_FILES := $(subst Native,$(TARGET),$(GBAK_FILES))
-rest: qli message_file tzdata
+rest: message_file tzdata
-cross_rest: qli gbak_files
+cross_rest: gbak_files
$(MAKE) $(BUILD_FILE)
-qli: $(QLI)
-
-$(QLI): $(QLI_Objects) $(COMMON_LIB)
- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
-
examples: include_generic
$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
$(MAKE) -f Makefile.plugins_examples
@@ -772,7 +746,6 @@ clean_config clean_all: clean clean_makefiles
clean_dbs:
$(RM) *.fdb *.FDB msg.timestamp
- $(RM) yachts.lnk
# The examples are a bit different, since the makefile is included in the directory
diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
index d96e89053f..8ad0bea20e 100755
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@@ -399,9 +399,6 @@ INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
SECURITY_FDB = $(FIREBIRD)/security5.fdb
-# From qli
-QLI = $(BIN)/qli$(EXEC_EXT)
-
# From isql
ISQL = $(BIN)/isql$(EXEC_EXT)
RUN_ISQL = $(RBIN)/isql$(EXEC_EXT)
diff --git a/builds/posix/make.shared.targets b/builds/posix/make.shared.targets
index ae5ee5951d..ea500f92a0 100644
--- a/builds/posix/make.shared.targets
+++ b/builds/posix/make.shared.targets
@@ -61,10 +61,6 @@ $(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp
$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
-# These need to change to $(GEN_SRC) at some stage
-#$(SRC_ROOT)/qli/meta.cpp $(SRC_ROOT)/qli/proc.cpp $(SRC_ROOT)/qli/show.cpp: yachts.lnk
-#$(SRC_ROOT)/qli/help.cpp: help.fdb
-
# Explicit dependence on generated header (parser)
$(OBJ)/dsql/Parser.o $(OBJ)/common/keywords.o $(OBJ)/dsql/dsql.o: $(SRC_ROOT)/include/gen/parse.h
diff --git a/builds/posix/make.shared.variables b/builds/posix/make.shared.variables
index 0ce493fa12..ef514d8263 100644
--- a/builds/posix/make.shared.variables
+++ b/builds/posix/make.shared.variables
@@ -169,12 +169,6 @@ ISQL_Objects:= $(call dirObjects,isql)
AllObjects += $(ISQL_Objects)
-# QLI
-QLI_Objects:= $(call dirObjects,qli)
-
-AllObjects += $(QLI_Objects)
-
-
# Legacy users management in security database
LEGACY_USERS_MANAGE_Objects:= $(call makeObjects,auth/SecurityDatabase,LegacyManagement.epp)
diff --git a/builds/posix/postfix.darwin b/builds/posix/postfix.darwin
index a0412dc303..18c6b1b4da 100644
--- a/builds/posix/postfix.darwin
+++ b/builds/posix/postfix.darwin
@@ -55,7 +55,6 @@ framework:
cp -r ../gen/$(TARGET)/firebird/plugins $(FB_FW)/Versions/A/Resources/plugins
cp ../gen/$(TARGET)/firebird/security5.fdb $(FB_FW)/Versions/A/Resources/security5.fdb
cp ../gen/$(TARGET)/firebird/firebird.msg $(FB_FW)/Versions/A/Resources/firebird.msg
- cp -r ../gen/$(TARGET)/firebird/help $(FB_FW)/Versions/A/Resources/help
cp -r ../gen/$(TARGET)/firebird/tzdata $(FB_FW)/Versions/A/Resources/tzdata
mkdir -p $(FB_FW)/Resources/doc
cp -r ../doc $(FB_FW)/Resources
@@ -68,7 +67,6 @@ framework:
cp ../gen/$(TARGET)/firebird/bin/gbak $(FB_FW)/Versions/A/Resources/bin
cp ../gen/$(TARGET)/firebird/bin/isql $(FB_FW)/Versions/A/Resources/bin
cp ../gen/$(TARGET)/firebird/bin/gpre $(FB_FW)/Versions/A/Resources/bin
- cp ../gen/$(TARGET)/firebird/bin/qli $(FB_FW)/Versions/A/Resources/bin
cp ../gen/$(TARGET)/firebird/bin/fb_lock_print $(FB_FW)/Versions/A/Resources/bin
cp ../gen/$(TARGET)/firebird/bin/gsec $(FB_FW)/Versions/A/Resources/bin
cp ../gen/$(TARGET)/firebird/bin/gstat $(FB_FW)/Versions/A/Resources/bin
diff --git a/builds/posix/prefix.mingw b/builds/posix/prefix.mingw
index 5f8dde8c9e..a73256bf9c 100644
--- a/builds/posix/prefix.mingw
+++ b/builds/posix/prefix.mingw
@@ -17,7 +17,7 @@
# Start of file prefix.mingw: $(VERSION) $(PLATFORM)
#
# 2003-Sep-27 BRS Removed IPSERVER after XNET is included
-#
+#
# -Wno-unused-variable is used due to unused gpre generated variables
PROD_FLAGS=-O2 -DMINGW -Wall -Wshadow -Wundef -Wno-long-long -Wno-unused-variable -Wno-sign-compare -Wno-parentheses -Wno-switch -fmessage-length=0 -Dlint -DWIN32_LEAN_AND_MEAN -MMD -mthreads -Wno-non-virtual-dtor
@@ -42,7 +42,7 @@ LIB_GUI:= -mwindows -lcomctl32 -lgdi32
# Add resources to some files
FilesToAddVersionInfo=$(LIBFBEMBED_SO) $(LIBFBCLIENT_SO) $(LIBFBINTL_SO) \
- $(GSTAT) $(GSEC) $(GFIX) $(QLI) $(ISQL) $(GBAK) $(GPRE)
+ $(GSTAT) $(GSEC) $(GFIX) $(ISQL) $(GBAK) $(GPRE)
# TODO: guardians also must be here
FilesToAddDialog=$(FB_SUPER_SERVER) $(FB_CLASSIC_SERVER)
FilesToAddDialog2=$(IBGUARD)
@@ -63,7 +63,7 @@ LIB=$(BIN)
# Special options for UDF link
LINK_UDF = $(LIB_LINK) $(LIB_LINK_OPTIONS) $(call LIB_LINK_SONAME,$(1).$(SHRLIB_EXT)) -L$(LIB) -lib_util
-LINK_UDF_LIBS =
+LINK_UDF_LIBS =
# Special options for trace plugin link
LINK_TRACE_LIBS = -L$(LIB) $(SO_LINK_LIBS)
diff --git a/builds/win32/make_boot.bat b/builds/win32/make_boot.bat
index 53dc4b6a01..fe2d64c9bb 100644
--- a/builds/win32/make_boot.bat
+++ b/builds/win32/make_boot.bat
@@ -19,7 +19,7 @@ set ERRLEV=0
@echo.
@echo Creating directories
:: Create the directory hierarchy.
-for %%v in ( alice auth burp dsql gpre isql jrd misc msgs qli examples yvalve utilities) do (
+for %%v in ( alice auth burp dsql gpre isql jrd misc msgs examples yvalve utilities) do (
@mkdir %FB_GEN_DIR%\%%v 2>nul
)
@@ -187,7 +187,7 @@ goto :EOF
@echo Building re2...
@mkdir %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% 2>nul
@pushd %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM%
-@cmake -G "Visual Studio %MSVC_VERSION%" -A %FB_TARGET_PLATFORM% -S %FB_ROOT_PATH%\extern\re2
+@cmake -G "Visual Studio %MSVC_VERSION%" -A %FB_TARGET_PLATFORM% -S %FB_ROOT_PATH%\extern\re2
if errorlevel 1 call :boot2 re2
@cmake --build %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% --target ALL_BUILD --config Release > re2_Release_%FB_TARGET_PLATFORM%.log
@cmake --build %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% --target ALL_BUILD --config Debug > re2_Debug_%FB_TARGET_PLATFORM%.log
@@ -312,14 +312,8 @@ goto :EOF
@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security5.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
@copy %FB_GEN_DIR%\dbs\security5.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
-@echo Restore metadata.gbak...
-@%FB_BIN_DIR%\gbak -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_GEN_DB_DIR%/dbs/metadata.fdb
-
@call create_msgs.bat db
-@%FB_BIN_DIR%\gbak -r %FB_ROOT_PATH%\builds\misc\help.gbak %FB_GEN_DB_DIR%/dbs/help.fdb
-@copy %FB_GEN_DIR%\dbs\metadata.fdb %FB_GEN_DIR%\dbs\yachts.lnk > nul
-
@goto :EOF
diff --git a/builds/win32/msvc12/Firebird.sln b/builds/win32/msvc12/Firebird.sln
index 5a7898f53a..7ee2a5611e 100644
--- a/builds/win32/msvc12/Firebird.sln
+++ b/builds/win32/msvc12/Firebird.sln
@@ -52,8 +52,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcxproj", "{DE
{F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qli", "qli.vcxproj", "{EBB8361B-49D5-43A5-8771-940DF3E308EF}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote", "remote.vcxproj", "{4BCC693D-1745-45ED-8302-E5E2F979549A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbackup", "nbackup.vcxproj", "{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}"
diff --git a/builds/win32/msvc12/qli.vcxproj b/builds/win32/msvc12/qli.vcxproj
deleted file mode 100644
index 1b08787531..0000000000
--- a/builds/win32/msvc12/qli.vcxproj
+++ /dev/null
@@ -1,254 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {EBB8361B-49D5-43A5-8771-940DF3E308EF}
-
-
-
- Application
- false
- MultiByte
- v120_xp
-
-
- Application
- false
- MultiByte
- v120_xp
-
-
- Application
- false
- MultiByte
- v120
-
-
- Application
- false
- MultiByte
- v120
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- true
- false
- false
- false
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
-
-
-
- Disabled
- WIN32;_DEBUG;_CONSOLE;DEV_BUILD;SUPERCLIENT;%(PreprocessorDefinitions)
- EditAndContinue
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
-
-
-
-
- X64
-
-
- Disabled
- WIN32;_DEBUG;_CONSOLE;DEV_BUILD;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
- MachineX64
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- true
- Speed
- WIN32;NDEBUG;_CONSOLE;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- /MACHINE:I386 %(AdditionalOptions)
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- $(OutDir)$(TargetName)$(TargetExt)
- Console
- false
-
-
-
-
-
-
- X64
-
-
- MaxSpeed
- OnlyExplicitInline
- true
- Speed
- WIN32;NDEBUG;_CONSOLE;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
- MachineX64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\src\jrd
- ..\..\..\src\jrd
- ..\..\..\src\jrd
- ..\..\..\src\jrd
-
-
-
-
- {15605f44-bffd-444f-ad4c-55dc9d704465}
- false
-
-
- {4fe03933-98cd-4879-a135-fd9430087a6b}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/builds/win32/msvc12/qli.vcxproj.filters b/builds/win32/msvc12/qli.vcxproj.filters
deleted file mode 100644
index ddcc67a905..0000000000
--- a/builds/win32/msvc12/qli.vcxproj.filters
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
- {da3cf9eb-a5b6-4478-87a3-3da5fa0c95a8}
-
-
- {ea691fcc-ce86-44c7-b53b-40b660c82329}
- h;hpp;hxx;hm;inl
-
-
- {34f2b335-6604-4188-a20b-e9916b80b05c}
-
-
- {a1a82d81-9dc5-4076-8daa-a05176116840}
-
-
- {28befd96-6561-4892-8120-10fe6777523c}
-
-
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
-
-
- Resource files
-
-
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
-
\ No newline at end of file
diff --git a/builds/win32/msvc14/Firebird.sln b/builds/win32/msvc14/Firebird.sln
index 9d4aa1f2ed..6c72197cf3 100644
--- a/builds/win32/msvc14/Firebird.sln
+++ b/builds/win32/msvc14/Firebird.sln
@@ -52,8 +52,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcxproj", "{DE
{F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qli", "qli.vcxproj", "{EBB8361B-49D5-43A5-8771-940DF3E308EF}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote", "remote.vcxproj", "{4BCC693D-1745-45ED-8302-E5E2F979549A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbackup", "nbackup.vcxproj", "{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}"
diff --git a/builds/win32/msvc14/qli.vcxproj b/builds/win32/msvc14/qli.vcxproj
deleted file mode 100644
index 193c547949..0000000000
--- a/builds/win32/msvc14/qli.vcxproj
+++ /dev/null
@@ -1,254 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {EBB8361B-49D5-43A5-8771-940DF3E308EF}
-
-
-
- Application
- false
- MultiByte
- v140_xp
-
-
- Application
- false
- MultiByte
- v140_xp
-
-
- Application
- false
- MultiByte
- v140
-
-
- Application
- false
- MultiByte
- v140
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- true
- false
- false
- false
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
-
-
-
- Disabled
- WIN32;_DEBUG;_CONSOLE;DEV_BUILD;SUPERCLIENT;%(PreprocessorDefinitions)
- EditAndContinue
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
-
-
-
-
- X64
-
-
- Disabled
- WIN32;_DEBUG;_CONSOLE;DEV_BUILD;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
- MachineX64
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- true
- Speed
- WIN32;NDEBUG;_CONSOLE;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- /MACHINE:I386 %(AdditionalOptions)
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- $(OutDir)$(TargetName)$(TargetExt)
- Console
- false
-
-
-
-
-
-
- X64
-
-
- MaxSpeed
- OnlyExplicitInline
- true
- Speed
- WIN32;NDEBUG;_CONSOLE;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
- MachineX64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\src\jrd
- ..\..\..\src\jrd
- ..\..\..\src\jrd
- ..\..\..\src\jrd
-
-
-
-
- {15605f44-bffd-444f-ad4c-55dc9d704465}
- false
-
-
- {4fe03933-98cd-4879-a135-fd9430087a6b}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/builds/win32/msvc14/qli.vcxproj.filters b/builds/win32/msvc14/qli.vcxproj.filters
deleted file mode 100644
index ddcc67a905..0000000000
--- a/builds/win32/msvc14/qli.vcxproj.filters
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
- {da3cf9eb-a5b6-4478-87a3-3da5fa0c95a8}
-
-
- {ea691fcc-ce86-44c7-b53b-40b660c82329}
- h;hpp;hxx;hm;inl
-
-
- {34f2b335-6604-4188-a20b-e9916b80b05c}
-
-
- {a1a82d81-9dc5-4076-8daa-a05176116840}
-
-
- {28befd96-6561-4892-8120-10fe6777523c}
-
-
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
-
-
- Resource files
-
-
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
-
\ No newline at end of file
diff --git a/builds/win32/msvc15/Firebird.sln b/builds/win32/msvc15/Firebird.sln
index b674391175..910519109e 100644
--- a/builds/win32/msvc15/Firebird.sln
+++ b/builds/win32/msvc15/Firebird.sln
@@ -52,8 +52,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isql", "isql.vcxproj", "{DE
{F8798A49-9D20-451E-A7BD-FEB5237103B5} = {F8798A49-9D20-451E-A7BD-FEB5237103B5}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qli", "qli.vcxproj", "{EBB8361B-49D5-43A5-8771-940DF3E308EF}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote", "remote.vcxproj", "{4BCC693D-1745-45ED-8302-E5E2F979549A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbackup", "nbackup.vcxproj", "{01A41DFA-8908-4576-A1F1-C8BC7EAE39A1}"
diff --git a/builds/win32/msvc15/qli.vcxproj b/builds/win32/msvc15/qli.vcxproj
deleted file mode 100644
index ddc0915102..0000000000
--- a/builds/win32/msvc15/qli.vcxproj
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {EBB8361B-49D5-43A5-8771-940DF3E308EF}
- 10.0.17763.0
-
-
-
- Application
- false
- MultiByte
- v141_xp
-
-
- Application
- false
- MultiByte
- v141_xp
-
-
- Application
- false
- MultiByte
- v141
-
-
- Application
- false
- MultiByte
- v141
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- true
- false
- false
- false
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- AllRules.ruleset
-
-
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
- ..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\
-
-
-
- Disabled
- WIN32;_DEBUG;_CONSOLE;DEV_BUILD;SUPERCLIENT;%(PreprocessorDefinitions)
- EditAndContinue
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
-
-
-
-
- X64
-
-
- Disabled
- WIN32;_DEBUG;_CONSOLE;DEV_BUILD;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
- MachineX64
-
-
-
-
- MaxSpeed
- OnlyExplicitInline
- true
- Speed
- WIN32;NDEBUG;_CONSOLE;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- /MACHINE:I386 %(AdditionalOptions)
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- $(OutDir)$(TargetName)$(TargetExt)
- Console
- false
-
-
-
-
-
-
- X64
-
-
- MaxSpeed
- OnlyExplicitInline
- true
- Speed
- WIN32;NDEBUG;_CONSOLE;SUPERCLIENT;%(PreprocessorDefinitions)
-
-
- comctl32.lib;ws2_32.lib;mpr.lib;version.lib;%(AdditionalDependencies)
- Console
- false
-
-
- MachineX64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ..\..\..\src\jrd
- ..\..\..\src\jrd
- ..\..\..\src\jrd
- ..\..\..\src\jrd
-
-
-
-
- {15605f44-bffd-444f-ad4c-55dc9d704465}
- false
-
-
- {4fe03933-98cd-4879-a135-fd9430087a6b}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/builds/win32/msvc15/qli.vcxproj.filters b/builds/win32/msvc15/qli.vcxproj.filters
deleted file mode 100644
index ddcc67a905..0000000000
--- a/builds/win32/msvc15/qli.vcxproj.filters
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
- {da3cf9eb-a5b6-4478-87a3-3da5fa0c95a8}
-
-
- {ea691fcc-ce86-44c7-b53b-40b660c82329}
- h;hpp;hxx;hm;inl
-
-
- {34f2b335-6604-4188-a20b-e9916b80b05c}
-
-
- {a1a82d81-9dc5-4076-8daa-a05176116840}
-
-
- {28befd96-6561-4892-8120-10fe6777523c}
-
-
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
- QLI files\GPRE cpp
-
-
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
- QLI files\GPRE epp
-
-
-
-
- Resource files
-
-
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
- Header files
-
-
-
\ No newline at end of file
diff --git a/builds/win32/preprocess.bat b/builds/win32/preprocess.bat
index 377da3d132..89289cbe84 100644
--- a/builds/win32/preprocess.bat
+++ b/builds/win32/preprocess.bat
@@ -81,7 +81,6 @@ goto :EOF
@for %%i in (dfw, dpm, dyn_util, fun, grant, ini, met, scl, Function) do @call :PREPROCESS jrd %%i -gds_cxx
@for %%i in (codes) do @call :PREPROCESS misc %%i
@for %%i in (build_file) do @call :PREPROCESS msgs %%i
-@for %%i in (help, meta, proc, show) do @call :PREPROCESS qli %%i
@for %%i in (extract, isql, show) do @call :PREPROCESS isql %%i -ocxx
@for %%i in (dba) do @call :PREPROCESS utilities/gstat %%i
@for %%i in (stats) do @call :PREPROCESS utilities %%i
diff --git a/configure.ac b/configure.ac
index c1577a43d9..d85887d1ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -678,7 +678,6 @@ XE_CONF_DIR(fbinclude, [C/C++ header files DIR (PREFIX/include)], FB_INCDIR, /in
XE_CONF_DIR(fbdoc, [documentation root DIR (PREFIX/doc)], FB_DOCDIR, /doc)
XE_CONF_DIR(fbsample, [examples DIR (PREFIX/examples)], FB_SAMPLEDIR, /examples)
XE_CONF_DIR(fbsample-db, [examples database DIR (PREFIX/examples/empbuild)], FB_SAMPLEDBDIR, /examples/empbuild)
-XE_CONF_DIR(fbhelp, [QLI help DIR (PREFIX/help)], FB_HELPDIR, /help)
XE_CONF_DIR(fbintl, [international DIR (PREFIX/intl)], FB_INTLDIR, /intl)
XE_CONF_DIR(fbmisc, [misc DIR (PREFIX/misc)], FB_MISCDIR, /misc)
XE_CONF_DIR(fbsecure-db, [security database DIR (PREFIX)], FB_SECDBDIR)
@@ -1249,7 +1248,6 @@ dnl # output
mkdir -p gen/\$fb_tgt/firebird/examples/prebuilt/plugins
mkdir -p gen/\$fb_tgt/firebird/lib
mkdir -p gen/\$fb_tgt/firebird/misc
- mkdir -p gen/\$fb_tgt/firebird/help
dnl ### TEMP ### directories for generated .cpp, .o and .d by module name
for src_dir in `cd src; ls -R -1 * | grep : | tr -d : | tr "\n" " "; cd ..`; do
diff --git a/doc/README.read_password_from_file b/doc/README.read_password_from_file
index 09ea3dbc46..7064031ff3 100644
--- a/doc/README.read_password_from_file
+++ b/doc/README.read_password_from_file
@@ -1,10 +1,10 @@
Issue:
======
- All command-line utilities which support -password parameter are
- vulnerable to password sniffing, especially when they're run from
- scripts. Since 2.1, all Firebird utilities replace argv[PASSWORD]
- with *, but better solution for hiding password from others in
- process list should be reading it from file or asking for it on
+ All command-line utilities which support -password parameter are
+ vulnerable to password sniffing, especially when they're run from
+ scripts. Since 2.1, all Firebird utilities replace argv[PASSWORD]
+ with *, but better solution for hiding password from others in
+ process list should be reading it from file or asking for it on
stdin.
Scope:
@@ -19,21 +19,20 @@ Document date: 2008-11-30
==============
- All utilities have new switch
--fetch_password
- which may be abbreviated according with utility rules.
- The exception is QLI, where -F should be used.
-
- Switch has required parameter - name of file with password. I.e.:
-isql -user sysdba -fet passfile server:employee
- will load password form file "passfile", using its first line
- as password.
-
- One can specify "stdin" as file name to make password be read
+ All utilities have new switch
+-fetch_password
+ which may be abbreviated according with utility rules.
+
+ Switch has required parameter - name of file with password. I.e.:
+isql -user sysdba -fet passfile server:employee
+ will load password form file "passfile", using its first line
+ as password.
+
+ One can specify "stdin" as file name to make password be read
from stdin. If stdin is terminal, prompt:
-Enter password:
- will be printed.
-
- For posix users - if you specify '-fetch /dev/tty' you will also
- be promted. This may be useful if you need to restore from stdin:
-bunzip2 -c emp.fbk.bz2 | gbak -c stdin /db/new.fdb -user sysdba -fetch /dev/tty
+Enter password:
+ will be printed.
+
+ For posix users - if you specify '-fetch /dev/tty' you will also
+ be promted. This may be useful if you need to restore from stdin:
+bunzip2 -c emp.fbk.bz2 | gbak -c stdin /db/new.fdb -user sysdba -fetch /dev/tty
diff --git a/doc/Using_OO_API.html b/doc/Using_OO_API.html
index 24bfd723b9..a587414222 100644
--- a/doc/Using_OO_API.html
+++ b/doc/Using_OO_API.html
@@ -2070,8 +2070,6 @@ codes:
- samples
DIR_SAMPLEDB
– samples database (employee.fdb)
-DIR_HELP
-– qli help (help.fdb)
DIR_INTL
– international libraries (fbintl)
DIR_MISC
@@ -3766,4 +3764,4 @@ release of it.