FirebirdSQL · asfernandes · Jun 8, 2021 · Jun 2, 2021
diff --git 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}/$<CONFIG>)
@@ -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 _$<CONFIG>)
@@ -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 $<TARGET_FILE:${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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 }