8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 21:23:04 +01:00

Remove remains of help.fdb after QLI removal.

This commit is contained in:
Adriano dos Santos Fernandes 2021-10-26 13:54:22 -03:00
parent b28089743a
commit 56adbc7ab6
13 changed files with 7 additions and 36 deletions

View File

@ -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 metadata.fdb ${dir}/yachts.lnk
COMMAND ${CMAKE_COMMAND} -E copy_if_different security.fdb ${dir}/security.fdb 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 msg.fdb ${dir}/msg.fdb
COMMAND ${CMAKE_COMMAND} -E copy_if_different help.fdb ${dir}/help.fdb
COMMAND ${ARGN} -b ${dir}/ ${in} ${out} COMMAND ${ARGN} -b ${dir}/ ${in} ${out}
) )
endif() endif()

View File

@ -104,7 +104,6 @@ copyFiles() {
mkdir -p $DestDir mkdir -p $DestDir
mkdir $DestDir/bin mkdir $DestDir/bin
mkdir $DestDir/examples mkdir $DestDir/examples
mkdir $DestDir/help
mkdir $DestDir/include mkdir $DestDir/include
mkdir $DestDir/intl mkdir $DestDir/intl
mkdir $DestDir/lib mkdir $DestDir/lib

View File

@ -74,7 +74,6 @@ chown -R firebird:firebird "$FB_FW"
echo "Set the permissions correctly" echo "Set the permissions correctly"
chmod 777 "$FB_FW/Resources/" chmod 777 "$FB_FW/Resources/"
chmod 660 "$FB_FW/Resources/security5.fdb" chmod 660 "$FB_FW/Resources/security5.fdb"
chmod 444 "$FB_FW/Resources/help/help.fdb"
# Remove all older traces of Classic first # Remove all older traces of Classic first
echo "Remove all older traces of Classic first" echo "Remove all older traces of Classic first"

View File

@ -103,11 +103,6 @@ file *
end end
# #
fileset fileset
tag help
file -u 0444 -g firebird -o firebird firebird/help/help.fdb @prefix@/help/help.fdb
end
#
fileset
tag messages tag messages
file -u 0444 -g firebird -o firebird firebird/firebird.msg @prefix@/firebird.msg 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 file -u 0444 -g firebird -o firebird firebird/fr_FR.msg @prefix@/fr_FR.msg

View File

@ -104,7 +104,6 @@ copyFiles() {
mkdir -p $DestDir mkdir -p $DestDir
mkdir $DestDir/bin mkdir $DestDir/bin
mkdir $DestDir/examples mkdir $DestDir/examples
mkdir $DestDir/help
mkdir $DestDir/include mkdir $DestDir/include
mkdir $DestDir/intl mkdir $DestDir/intl
mkdir $DestDir/lib mkdir $DestDir/lib

View File

@ -82,7 +82,6 @@ copyFiles() {
mkdir -p $DestDir mkdir -p $DestDir
mkdir $DestDir/bin mkdir $DestDir/bin
mkdir $DestDir/examples mkdir $DestDir/examples
mkdir $DestDir/help
mkdir $DestDir/include mkdir $DestDir/include
mkdir $DestDir/intl mkdir $DestDir/intl
mkdir $DestDir/lib mkdir $DestDir/lib

View File

@ -133,7 +133,7 @@ DestDir=@prefix@
# The guts of the tranfer of files and other directories # The guts of the tranfer of files and other directories
# (mkdir -p <dirname> does not elicit an error message if the <dirname> exists.) # (mkdir -p <dirname> does not elicit an error message if the <dirname> exists.)
echo Installing binaries 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 do
mkdir -p $DestDir/$D || exit mkdir -p $DestDir/$D || exit
done done
@ -270,7 +270,6 @@ chmod ug=r,o= *.sample || exit
# make databases writable by firebird only # make databases writable by firebird only
# local database connections are not a good idea # local database connections are not a good idea
chmod ug=rw,o= examples/*.fdb || exit chmod ug=rw,o= examples/*.fdb || exit
chmod ug=rw,o= help/*.fdb || exit
# install the samples if they don't exist # install the samples if they don't exist
[ -f databases.conf ] || install -o firebird -g firebird -m 440 databases.conf.sample databases.conf [ -f databases.conf ] || install -o firebird -g firebird -m 440 databases.conf.sample databases.conf

View File

@ -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 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 # messages
f none @prefix@/firebird.msg=$SRCDIR/firebird.msg 0444 firebird firebird f none @prefix@/firebird.msg=$SRCDIR/firebird.msg 0444 firebird firebird

View File

@ -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 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 # messages
f none @prefix@/firebird.msg=$SRCDIR/firebird.msg 0666 firebird firebird f none @prefix@/firebird.msg=$SRCDIR/firebird.msg 0666 firebird firebird

View File

@ -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 d none @prefix@/include 0755 root root
f none @prefix@/include/blr.h=$SRCDIR/include/blr.h 0644 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 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h 0644 root root

View File

@ -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 Source: {#FilesDir}\doc\sql.extensions\*.*; DestDir: {app}\doc\sql.extensions; Components: DevAdminComponent; Flags: skipifsourcedoesntexist ignoreversion
;Other stuff ;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}\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.dll; DestDir: {app}\intl; Components: ServerComponent; Flags: sharedfile ignoreversion;
Source: {#FilesDir}\intl\fbintl.conf; DestDir: {app}\intl; Components: ServerComponent; Flags: onlyifdoesntexist Source: {#FilesDir}\intl\fbintl.conf; DestDir: {app}\intl; Components: ServerComponent; Flags: onlyifdoesntexist

View File

@ -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% 2>nul
@mkdir %FB_OUTPUT_DIR%\intl 2>nul @mkdir %FB_OUTPUT_DIR%\intl 2>nul
@mkdir %FB_OUTPUT_DIR%\tzdata 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 2>nul
@mkdir %FB_OUTPUT_DIR%\doc\sql.extensions 2>nul @mkdir %FB_OUTPUT_DIR%\doc\sql.extensions 2>nul
@mkdir %FB_OUTPUT_DIR%\include 2>nul @mkdir %FB_OUTPUT_DIR%\include 2>nul
@ -79,7 +78,6 @@ for %%v in (gpre_boot build_msg) do (
:: DATABASES :: DATABASES
@copy %FB_GEN_DIR%\dbs\security5.FDB %FB_OUTPUT_DIR%\security5.fdb >nul @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 :: DOCS
@copy %FB_ROOT_PATH%\*.md %FB_OUTPUT_DIR%\doc\ >nul @copy %FB_ROOT_PATH%\*.md %FB_OUTPUT_DIR%\doc\ >nul

View File

@ -138,7 +138,6 @@ add_custom_command(
add_custom_target(databases add_custom_target(databases
DEPENDS DEPENDS
boot_engine boot_engine
help.fdb
metadata.fdb metadata.fdb
security.fdb security.fdb
SOURCES SOURCES
@ -878,7 +877,6 @@ add_custom_target(copy_files
#ALL # uncomment this to copy files every build #ALL # uncomment this to copy files every build
# databases # 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}/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 # 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/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 COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/databases.conf ${output_dir}/databases.conf