diff --git a/builds/cmake/BuildFunctions.cmake b/builds/cmake/BuildFunctions.cmake index f94df178c7..5469c953a2 100644 --- a/builds/cmake/BuildFunctions.cmake +++ b/builds/cmake/BuildFunctions.cmake @@ -115,7 +115,6 @@ function(epp_process type files) 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 COMMAND ${ARGN} -b ${dir}/ ${in} ${out} ) endif() diff --git a/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in b/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in index 7eb9e57fac..a7941ba550 100644 --- a/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in +++ b/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in @@ -104,7 +104,6 @@ copyFiles() { mkdir -p $DestDir mkdir $DestDir/bin mkdir $DestDir/examples - mkdir $DestDir/help mkdir $DestDir/include mkdir $DestDir/intl mkdir $DestDir/lib diff --git a/builds/install/arch-specific/darwin/install-script b/builds/install/arch-specific/darwin/install-script index 48d79d9a4c..697c95ba28 100644 --- a/builds/install/arch-specific/darwin/install-script +++ b/builds/install/arch-specific/darwin/install-script @@ -74,7 +74,6 @@ chown -R firebird:firebird "$FB_FW" echo "Set the permissions correctly" chmod 777 "$FB_FW/Resources/" chmod 660 "$FB_FW/Resources/security5.fdb" - chmod 444 "$FB_FW/Resources/help/help.fdb" # Remove all older traces of Classic first echo "Remove all older traces of Classic first" diff --git a/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in b/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in index f283238f2e..155e1f811f 100644 --- a/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in +++ b/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in @@ -21,7 +21,7 @@ postremove install/scripts/postUninstall.sh architecture HP-UX_B.11_64 os_name HP-UX os_release ?.11.* -os_version ? +os_version ? # fileset tag main @@ -32,7 +32,7 @@ file -u 0644 -g firebird -o firebird buildroot@prefix@/CHANGELOG.md @prefix@/CHA file -u 0644 -g firebird -o firebird buildroot@prefix@/README.md @prefix@/README.md end # -fileset +fileset tag include directory buildroot@prefix@/include=@prefix@/include file_permissions -u 0644 -g firebird -o firebird @@ -49,9 +49,9 @@ fileset tag UDF file -u 0755 -g firebird -o firebird buildroot@prefix@/UDF/ib_udf.sl @prefix@/UDF/ib_udf.sl file -u 0755 -g firebird -o firebird buildroot@prefix@/UDF/fbudf.sl @prefix@/UDF/fbudf.sl -file -u 0644 -g firebird -o firebird buildroot@prefix@/UDF/ib_udf.sql @prefix@/UDF/ib_udf.sql -file -u 0644 -g firebird -o firebird buildroot@prefix@/UDF/ib_udf2.sql @prefix@/UDF/ib_udf2.sql -file -u 0644 -g firebird -o firebird buildroot@prefix@/UDF/fbudf.sql @prefix@/UDF/fbudf.sql +file -u 0644 -g firebird -o firebird buildroot@prefix@/UDF/ib_udf.sql @prefix@/UDF/ib_udf.sql +file -u 0644 -g firebird -o firebird buildroot@prefix@/UDF/ib_udf2.sql @prefix@/UDF/ib_udf2.sql +file -u 0644 -g firebird -o firebird buildroot@prefix@/UDF/fbudf.sql @prefix@/UDF/fbudf.sql end # fileset @@ -71,7 +71,7 @@ file_permissions -u 0644 -g firebird -o firebird file * end # -fileset +fileset tag examples file -u 0644 -g firebird -o firebird firebird/examples/README @prefix@/examples/README file -u 0644 -g firebird -o firebird firebird/examples/functions.c @prefix@/examples/functions/functions.c @@ -103,11 +103,6 @@ file * end # fileset -tag help -file -u 0444 -g firebird -o firebird firebird/help/help.fdb @prefix@/help/help.fdb -end -# -fileset tag messages file -u 0444 -g firebird -o firebird firebird/firebird.msg @prefix@/firebird.msg file -u 0444 -g firebird -o firebird firebird/fr_FR.msg @prefix@/fr_FR.msg diff --git a/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in b/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in index 41ad0d15e7..f7ece37f23 100644 --- a/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in +++ b/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in @@ -104,7 +104,6 @@ copyFiles() { mkdir -p $DestDir mkdir $DestDir/bin mkdir $DestDir/examples - mkdir $DestDir/help mkdir $DestDir/include mkdir $DestDir/intl mkdir $DestDir/lib diff --git a/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in b/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in index f21a4bc1c0..07d86c00a6 100644 --- a/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in +++ b/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in @@ -82,7 +82,6 @@ copyFiles() { mkdir -p $DestDir mkdir $DestDir/bin mkdir $DestDir/examples - mkdir $DestDir/help mkdir $DestDir/include mkdir $DestDir/intl mkdir $DestDir/lib diff --git a/builds/install/arch-specific/netbsd/install.sh.in b/builds/install/arch-specific/netbsd/install.sh.in index 656257a489..c234ee8cea 100644 --- a/builds/install/arch-specific/netbsd/install.sh.in +++ b/builds/install/arch-specific/netbsd/install.sh.in @@ -133,7 +133,7 @@ DestDir=@prefix@ # The guts of the tranfer of files and other directories # (mkdir -p does not elicit an error message if the exists.) echo Installing binaries -for D in "bin examples help include intl doc/sql.extensions UDF" +for D in "bin examples include intl doc/sql.extensions UDF" do mkdir -p $DestDir/$D || exit done @@ -270,7 +270,6 @@ chmod ug=r,o= *.sample || exit # make databases writable by firebird only # local database connections are not a good idea chmod ug=rw,o= examples/*.fdb || exit -chmod ug=rw,o= help/*.fdb || exit # install the samples if they don't exist [ -f databases.conf ] || install -o firebird -g firebird -m 440 databases.conf.sample databases.conf diff --git a/builds/install/arch-specific/solaris/CS/prototype.in b/builds/install/arch-specific/solaris/CS/prototype.in index d5695263d7..2f0ed15bd6 100644 --- a/builds/install/arch-specific/solaris/CS/prototype.in +++ b/builds/install/arch-specific/solaris/CS/prototype.in @@ -164,11 +164,6 @@ s none @prefix@/lib/libfbembed.so=@prefix@/lib/libfbembed.so.2 f none @prefix@/lib/libib_util.so=$SRCDIR/lib/libib_util.so 0555 firebird firebird -# help - -d none @prefix@/help 0751 firebird firebird -f none @prefix@/help/help.fdb=$SRCDIR/help/help.fdb 0444 firebird firebird - # messages f none @prefix@/firebird.msg=$SRCDIR/firebird.msg 0444 firebird firebird diff --git a/builds/install/arch-specific/solaris/SS/prototype.in b/builds/install/arch-specific/solaris/SS/prototype.in index 7d652f5278..4f3e4afa34 100644 --- a/builds/install/arch-specific/solaris/SS/prototype.in +++ b/builds/install/arch-specific/solaris/SS/prototype.in @@ -169,11 +169,6 @@ s none @prefix@/lib/libfbclient.so=@prefix@/lib/libfbclient.so.2 f none @prefix@/lib/libib_util.so=$SRCDIR/lib/libib_util.so 0755 firebird firebird -# help - -d none @prefix@/help 0755 firebird firebird -f none @prefix@/help/help.fdb=$SRCDIR/help/help.fdb 0444 firebird firebird - # messages f none @prefix@/firebird.msg=$SRCDIR/firebird.msg 0666 firebird firebird diff --git a/builds/install/arch-specific/solx86gcc/CS/prototype.in b/builds/install/arch-specific/solx86gcc/CS/prototype.in index 102dceb7b0..11c536db4a 100644 --- a/builds/install/arch-specific/solx86gcc/CS/prototype.in +++ b/builds/install/arch-specific/solx86gcc/CS/prototype.in @@ -103,9 +103,6 @@ f none @prefix@/examples/v5/udflib.c=$SRCDIR/examples/v5/udflib.c 0644 root root -d none @prefix@/help 0755 root root -f none @prefix@/help/help.fdb=$SRCDIR/help/help.fdb 0444 root root - d none @prefix@/include 0755 root root f none @prefix@/include/blr.h=$SRCDIR/include/blr.h 0644 root root f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0644 root root diff --git a/builds/install/arch-specific/win32/FirebirdInstall.iss b/builds/install/arch-specific/win32/FirebirdInstall.iss index 37128760ac..31a5b21954 100644 --- a/builds/install/arch-specific/win32/FirebirdInstall.iss +++ b/builds/install/arch-specific/win32/FirebirdInstall.iss @@ -527,7 +527,6 @@ Source: {#FilesDir}\doc\*.*; DestDir: {app}\doc; Components: DevAdminComponent; Source: {#FilesDir}\doc\sql.extensions\*.*; DestDir: {app}\doc\sql.extensions; Components: DevAdminComponent; Flags: skipifsourcedoesntexist ignoreversion ;Other stuff -Source: {#FilesDir}\help\*.*; DestDir: {app}\help; Components: DevAdminComponent; Flags: ignoreversion; Source: {#FilesDir}\include\*.*; DestDir: {app}\include; Components: DevAdminComponent; Flags: ignoreversion recursesubdirs createallsubdirs; Source: {#FilesDir}\intl\fbintl.dll; DestDir: {app}\intl; Components: ServerComponent; Flags: sharedfile ignoreversion; Source: {#FilesDir}\intl\fbintl.conf; DestDir: {app}\intl; Components: ServerComponent; Flags: onlyifdoesntexist diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat index 64bf37bd7b..0287368fed 100644 --- a/builds/win32/make_all.bat +++ b/builds/win32/make_all.bat @@ -42,7 +42,6 @@ if errorlevel 1 call :ERROR build failed - see make_all_%FB_TARGET_PLATFORM%.log @mkdir %FB_OUTPUT_DIR% 2>nul @mkdir %FB_OUTPUT_DIR%\intl 2>nul @mkdir %FB_OUTPUT_DIR%\tzdata 2>nul -@mkdir %FB_OUTPUT_DIR%\help 2>nul @mkdir %FB_OUTPUT_DIR%\doc 2>nul @mkdir %FB_OUTPUT_DIR%\doc\sql.extensions 2>nul @mkdir %FB_OUTPUT_DIR%\include 2>nul @@ -79,7 +78,6 @@ for %%v in (gpre_boot build_msg) do ( :: DATABASES @copy %FB_GEN_DIR%\dbs\security5.FDB %FB_OUTPUT_DIR%\security5.fdb >nul -@copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul :: DOCS @copy %FB_ROOT_PATH%\*.md %FB_OUTPUT_DIR%\doc\ >nul diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d6d685028c..ca816e3395 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -138,7 +138,6 @@ add_custom_command( add_custom_target(databases DEPENDS boot_engine - help.fdb metadata.fdb security.fdb SOURCES @@ -878,7 +877,6 @@ add_custom_target(copy_files #ALL # uncomment this to copy files every build # databases COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security5.fdb - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb # configs, text files COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf ${output_dir}/firebird.conf COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/databases.conf ${output_dir}/databases.conf