From 046277daabee22e6c88bd1379d1cf39512f56320 Mon Sep 17 00:00:00 2001 From: Dmitry Yemanov Date: Sat, 26 Mar 2016 15:29:44 +0300 Subject: [PATCH] Fix scripts and cleanup old stuff (docs related). Better CHANGELOG rendering. --- CHANGELOG.md | 14 +- .../aix/classic/makeInstallImage.sh.in | 4 +- .../arch-specific/freebsd/install.sh.in | 3 +- .../hpux/classic/firebirdCS.psf.in | 3 +- .../hpux/classic/makeinstallImage.sh.in | 3 +- .../hpux/super/makeinstallImage.sh.in | 3 +- .../linux/makeInstallImage.sh.in | 3 +- .../arch-specific/netbsd/install.sh.in | 5 +- .../arch-specific/solaris/CS/prototype.in | 4 +- .../arch-specific/solaris/SS/prototype.in | 4 +- .../win32/BuildExecutableInstall.bat | 14 +- builds/win32/make_all.bat | 3 +- doc/README.user | 18 -- doc/install_win32.txt | 177 ------------------ src/CMakeLists.txt | 4 +- src/misc/smallog.cpp | 124 ------------ src/misc/src_bundle.sh | 2 +- 17 files changed, 28 insertions(+), 360 deletions(-) delete mode 100644 doc/README.user delete mode 100644 doc/install_win32.txt delete mode 100644 src/misc/smallog.cpp diff --git a/CHANGELOG.md b/CHANGELOG.md index d2e5ec06fd..ab1ba6ef69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,20 @@ # v4.0 Alpha 1 (unreleased) -* Bugfix [CORE-5141](http://tracker.firebirdsql.org/browse/CORE-5141): Field definition allows several NOT NULL clauses +## Bugfixes + +* [CORE-5141](http://tracker.firebirdsql.org/browse/CORE-5141): Field definition allows several NOT NULL clauses Contributor(s): Dimitry Sibiryakov -* Bugfix [CORE-4985](http://tracker.firebirdsql.org/browse/CORE-4985): Non-privileged user can implicitly count records in a restricted table +* [CORE-4985](http://tracker.firebirdsql.org/browse/CORE-4985): Non-privileged user can implicitly count records in a restricted table Contributor(s): Dmitry Yemanov -* Bugfix [CORE-4701](http://tracker.firebirdsql.org/browse/CORE-4701): Index and blob garbage collection don't take into accout data in undo log +* [CORE-4701](http://tracker.firebirdsql.org/browse/CORE-4701): Index and blob garbage collection don't take into accout data in undo log Contributor(s): Dimitry Sibiryakov -* Bugfix [CORE-4424](http://tracker.firebirdsql.org/browse/CORE-4424): Rollback to wrong savepoint if several exception handlers on the same level are executed +* [CORE-4424](http://tracker.firebirdsql.org/browse/CORE-4424): Rollback to wrong savepoint if several exception handlers on the same level are executed Contributor(s): Dimitry Sibiryakov -* Improvement [CORE-5119](http://tracker.firebirdsql.org/browse/CORE-5119): Support autocommit mode in SET TRANSACTION statement +## Improvements + +* [CORE-5119](http://tracker.firebirdsql.org/browse/CORE-5119): Support autocommit mode in SET TRANSACTION statement Contributor(s): Dmitry Yemanov diff --git a/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in b/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in index 24f612d902..c65c5cac81 100644 --- a/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in +++ b/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in @@ -196,10 +196,8 @@ copyFiles() { # Copy various documentation ls $BuildRootDir/doc/*.pdf >/dev/null 2>&1 && cp $BuildRootDir/doc/*.pdf $DestDir/doc - cp $BuildRootDir/doc/README.* $DestDir/doc cp $BuildRootDir/doc/sql.extensions/README* $DestDir/doc/sql.extensions - cp $BuildRootDir/doc/WhatsNew $DestDir/WhatsNew - cp $BuildRootDir/doc/README.user $DestDir/README + cp $BuildRootDir/*.md $DestDir # Copy various upgrade stuff cp $BuildRootDir/src/misc/intl.sql $DestDir/misc/ diff --git a/builds/install/arch-specific/freebsd/install.sh.in b/builds/install/arch-specific/freebsd/install.sh.in index bbaad3b95b..f387b1eb58 100755 --- a/builds/install/arch-specific/freebsd/install.sh.in +++ b/builds/install/arch-specific/freebsd/install.sh.in @@ -277,8 +277,7 @@ copyFiles() { #doc cp $BuildRootDir/doc/README.* ${TargetDir}@FB_DOCDIR@ cp $BuildRootDir/doc/sql.extensions/README* ${TargetDir}@FB_DOCDIR@/sql.extensions - cp $BuildRootDir/doc/WhatsNew ${TargetDir}@FB_CONFDIR@/WhatsNew - cp $BuildRootDir/doc/README.user ${TargetDir}@FB_CONFDIR@/README + cp $BuildRootDir/*.md ${TargetDir}@FB_CONFDIR@ chown -R root:wheel ${TargetDir}@FB_MISCDIR@ for i in `find ${TargetDir}@FB_MISCDIR@ -print`; do diff --git a/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in b/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in index a5d93fec7e..4a01c05fca 100644 --- a/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in +++ b/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in @@ -28,7 +28,8 @@ tag main file -u 0660 -g firebird -o firebird buildroot@prefix@/security2.fdb @prefix@/security2.fdb file -u 0644 -g firebird -o firebird buildroot@prefix@/firebird.conf @prefix@/firebird.conf file -u 0644 -g firebird -o firebird buildroot@prefix@/databases.conf @prefix@/databases.conf -file -u 0644 -g firebird -o firebird buildroot@prefix@/WhatsNew @prefix@/WhatsNew +file -u 0644 -g firebird -o firebird buildroot@prefix@/CHANGELOG.md @prefix@/CHANGELOG.md +file -u 0644 -g firebird -o firebird buildroot@prefix@/README.md @prefix@/README.md end # fileset diff --git a/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in b/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in index 5c2863350f..7d0e0f3e41 100644 --- a/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in +++ b/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in @@ -195,8 +195,7 @@ copyFiles() { ls $BuildRootDir/doc/*.pdf >/dev/null 2>&1 && cp $BuildRootDir/doc/*.pdf $DestDir/doc cp $BuildRootDir/doc/README.* $DestDir/doc cp $BuildRootDir/doc/sql.extensions/README* $DestDir/doc/sql.extensions - cp $BuildRootDir/doc/WhatsNew $DestDir/WhatsNew - cp $BuildRootDir/doc/README.user $DestDir/README + cp $BuildRootDir/*.md $DestDir # Copy various upgrade stuff cp $BuildRootDir/src/misc/intl.sql $DestDir/misc/ diff --git a/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in b/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in index 657b0ec01b..35b65f0395 100644 --- a/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in +++ b/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in @@ -164,8 +164,7 @@ copyFiles() { cp $BuildRootDir/doc/*.pdf $DestDir/doc cp $BuildRootDir/doc/README.* $DestDir/doc cp $BuildRootDir/doc/sql.extensions/README* $DestDir/doc/sql.extensions - cp $BuildRootDir/doc/WhatsNew $DestDir/WhatsNew - cp $BuildRootDir/doc/README.user $DestDir/README + cp $BuildRootDir/*.md $DestDir # Miscellaneous config and stratup files cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/firebird.conf diff --git a/builds/install/arch-specific/linux/makeInstallImage.sh.in b/builds/install/arch-specific/linux/makeInstallImage.sh.in index ca42a6d949..498e0b3542 100644 --- a/builds/install/arch-specific/linux/makeInstallImage.sh.in +++ b/builds/install/arch-specific/linux/makeInstallImage.sh.in @@ -278,8 +278,7 @@ copyFiles() { cp $BuildRootDir/doc/*.pdf ${TargetDir}@FB_DOCDIR@ cp $BuildRootDir/doc/README.* ${TargetDir}@FB_DOCDIR@ cp $BuildRootDir/doc/sql.extensions/README* ${TargetDir}@FB_DOCDIR@/sql.extensions - cp $BuildRootDir/doc/WhatsNew ${TargetDir}@FB_CONFDIR@/WhatsNew - cp $BuildRootDir/doc/README.user ${TargetDir}@FB_CONFDIR@/README + cp $BuildRootDir/*.md ${TargetDir}@FB_CONFDIR@ chown -R root:root ${TargetDir}@FB_MISCDIR@ for i in `find ${TargetDir}@FB_MISCDIR@ -print`; do diff --git a/builds/install/arch-specific/netbsd/install.sh.in b/builds/install/arch-specific/netbsd/install.sh.in index e5f4f62054..42c1a83e78 100644 --- a/builds/install/arch-specific/netbsd/install.sh.in +++ b/builds/install/arch-specific/netbsd/install.sh.in @@ -189,8 +189,7 @@ cp $BuildRootDir/src/extlib/fbudf/fbudf.sql $DestDir/UDF/ || exit # Note that this copies files from outside the build tree. echo Installing documentation cp $BuildRootDir/doc/README.* $DestDir/doc || exit -cp $BuildRootDir/doc/WhatsNew $DestDir || exit -cp $BuildRootDir/doc/README.user $DestDir/README || exit +cp $BuildRootDir/*.md $DestDir || exit SQLEXTENSIONS=`find $BuildRootDir/doc/sql.extensions ! -type d | grep -v CVS` cp ${SQLEXTENSIONS} $DestDir/doc/sql.extensions || exit @@ -227,7 +226,7 @@ done chown -R root:wheel @prefix@/lib || exit # make the following read-only -chmod -R a=r @prefix@/WhatsNew || exit +chmod -R a=r @prefix@/*.md || exit for i in `find @prefix@/doc -type f -print` do chmod a=r $i || exit diff --git a/builds/install/arch-specific/solaris/CS/prototype.in b/builds/install/arch-specific/solaris/CS/prototype.in index 32c7cae42a..18dee5271f 100644 --- a/builds/install/arch-specific/solaris/CS/prototype.in +++ b/builds/install/arch-specific/solaris/CS/prototype.in @@ -20,7 +20,8 @@ v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebi v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0444 firebird firebird v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in 0444 firebird firebird v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird -f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird +f none @prefix@/CHANGELOG.md=$SRCDIR/../../CHANGELOG.md 0644 firebird firebird +f none @prefix@/README.md=$SRCDIR/../../README.md 0644 firebird firebird d none @prefix@/bin 0751 firebird firebird @@ -248,7 +249,6 @@ f none @prefix@/doc/README.perforamance_monitoring=$SRCDIR/../../doc/README.perf f none @prefix@/doc/README.raw_devices=$SRCDIR/../../doc/README.raw_devices 0644 firebird firebird f none @prefix@/doc/README.sha1=$SRCDIR/../../doc/README.sha1 0644 firebird firebird f none @prefix@/doc/README.trusted_authentication=$SRCDIR/../../doc/README.trusted_authentication 0644 firebird firebird -f none @prefix@/doc/README.user=$SRCDIR/../../doc/README.user 0644 firebird firebird f none @prefix@/doc/README.user.embedded=$SRCDIR/../../doc/README.user.embedded 0644 firebird firebird f none @prefix@/doc/README.user.troubleshooting=$SRCDIR/../../doc/README.user.troubleshooting 0644 firebird firebird f none @prefix@/doc/README.Win32LibraryInstallation=$SRCDIR/../../doc/README.Win32LibraryInstallation.txt 0644 firebird firebird diff --git a/builds/install/arch-specific/solaris/SS/prototype.in b/builds/install/arch-specific/solaris/SS/prototype.in index b836338d37..006994e17d 100644 --- a/builds/install/arch-specific/solaris/SS/prototype.in +++ b/builds/install/arch-specific/solaris/SS/prototype.in @@ -20,7 +20,8 @@ v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebi v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0644 firebird firebird v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in 0544 firebird firebird v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird -f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird +f none @prefix@/CHANGELOG.md=$SRCDIR/../../CHANGELOG.md 0644 firebird firebird +f none @prefix@/README.md=$SRCDIR/../../README.md 0644 firebird firebird d none @prefix@/bin 0755 firebird firebird @@ -257,7 +258,6 @@ f none @prefix@/doc/README.perforamance_monitoring=$SRCDIR/../../doc/README.perf f none @prefix@/doc/README.raw_devices=$SRCDIR/../../doc/README.raw_devices 0644 firebird firebird f none @prefix@/doc/README.sha1=$SRCDIR/../../doc/README.sha1 0644 firebird firebird f none @prefix@/doc/README.trusted_authentication=$SRCDIR/../../doc/README.trusted_authentication 0644 firebird firebird -f none @prefix@/doc/README.user=$SRCDIR/../../doc/README.user 0644 firebird firebird f none @prefix@/doc/README.user.embedded=$SRCDIR/../../doc/README.user.embedded 0644 firebird firebird f none @prefix@/doc/README.user.troubleshooting=$SRCDIR/../../doc/README.user.troubleshooting 0644 firebird firebird f none @prefix@/doc/README.Win32LibraryInstallation=$SRCDIR/../../doc/README.Win32LibraryInstallation.txt 0644 firebird firebird diff --git a/builds/install/arch-specific/win32/BuildExecutableInstall.bat b/builds/install/arch-specific/win32/BuildExecutableInstall.bat index ef4816e0b7..ff2ceadffd 100644 --- a/builds/install/arch-specific/win32/BuildExecutableInstall.bat +++ b/builds/install/arch-specific/win32/BuildExecutableInstall.bat @@ -284,7 +284,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" ( @echo Started copying docs... @rmdir /S /Q %FB_OUTPUT_DIR%\doc 2>nul @mkdir %FB_OUTPUT_DIR%\doc -@copy %FB_ROOT_PATH%\ChangeLog %FB_OUTPUT_DIR%\doc\ChangeLog.txt >nul +@copy %FB_ROOT_PATH%\*.md %FB_OUTPUT_DIR%\doc\ > nul @copy %FB_ROOT_PATH%\doc\*.* %FB_OUTPUT_DIR%\doc\ > nul @if %ERRORLEVEL% GEQ 1 ( call :ERROR COPY of main documentation tree failed with error %ERRORLEVEL% @@ -318,16 +318,6 @@ mkdir %FB_OUTPUT_DIR%\misc\upgrade\ib_udf 2>nul @echo Copying other documentation... @copy %FB_GEN_DIR%\readmes\installation_readme.txt %FB_OUTPUT_DIR%\doc\installation_readme.txt > nul -@copy %FB_OUTPUT_DIR%\doc\WhatsNew %FB_OUTPUT_DIR%\doc\WhatsNew.txt > nul -@del %FB_OUTPUT_DIR%\doc\WhatsNew - - -:: If we are not doing a final release then include stuff that is -:: likely to be of use to testers, especially as our release notes -:: may be incomplete or non-existent -@if /I "%FBBUILD_PROD_STATUS%"=="DEV" ( - @copy %FB_ROOT_PATH%\ChangeLog %FB_OUTPUT_DIR%\doc\ChangeLog.txt > nul -) @mkdir %FB_OUTPUT_DIR%\doc\sql.extensions 2>nul @@ -348,7 +338,7 @@ if defined FB_EXTERNAL_DOCS ( :: Clean out text notes that are either not relevant to Windows or :: are only of use to engine developers. -@for %%v in ( README.makefiles README.user README.user.embedded README.user.troubleshooting README.build.mingw.html README.build.msvc.html fb2-todo.txt cleaning-todo.txt install_win32.txt README.coding.style emacros-cross_ref.html firebird_conf.txt *.*~) do ( +@for %%v in ( README.makefiles README.user.embedded README.user.troubleshooting README.build.mingw.html README.build.msvc.html fb2-todo.txt cleaning-todo.txt install_win32.txt README.coding.style emacros-cross_ref.html firebird_conf.txt *.*~) do ( @del %FB_OUTPUT_DIR%\doc\%%v 2>nul ) diff --git a/builds/win32/make_all.bat b/builds/win32/make_all.bat index ea5f664807..9e791e34c0 100644 --- a/builds/win32/make_all.bat +++ b/builds/win32/make_all.bat @@ -77,8 +77,7 @@ findstr /V "@UDF_COMMENT@" %FB_ROOT_PATH%\builds\install\misc\firebird.conf.in > @copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul :: DOCS -@copy %FB_ROOT_PATH%\ChangeLog %FB_OUTPUT_DIR%\doc\ChangeLog.txt >nul -@copy %FB_ROOT_PATH%\doc\WhatsNew %FB_OUTPUT_DIR%\doc\WhatsNew.txt >nul +@copy %FB_ROOT_PATH%\*.md %FB_OUTPUT_DIR%\doc\ >nul :: READMES @copy %FB_ROOT_PATH%\doc\README.* %FB_OUTPUT_DIR%\doc >nul diff --git a/doc/README.user b/doc/README.user deleted file mode 100644 index c6356c62c8..0000000000 --- a/doc/README.user +++ /dev/null @@ -1,18 +0,0 @@ -Firebird - -Welcome to Firebird. - -Firebird is a relational database offering many ANSI SQL-92 features that -runs on Linux, Windows, and a variety of Unix platforms. Firebird offers -excellent concurrency, high performance, and powerful language support for -stored procedures and triggers. It has been used in production systems, under -a variety of names since 1981. - -Firebird is an open source project developing and enhancing a multi-platform -relational database management system based on the source code released by -Inprise Corp (now known again as Borland Software Corp). - -More information about Firebird can be found in the 'doc' -subdirectory or at: - -http://www.firebirdsql.org diff --git a/doc/install_win32.txt b/doc/install_win32.txt deleted file mode 100644 index dbb14101c4..0000000000 --- a/doc/install_win32.txt +++ /dev/null @@ -1,177 +0,0 @@ ------------------------------------------------------------ -Firebird 1.5 installation notes ------------------------------------------------------------ - -1. GENERIC INFORMATION - - The distribution of the version 1.5 has a number of - changes as compared with 1.0. - -1.1. Some files were renamed, namely: - - ibserver.exe -> fbserver.exe (SS architecture) - ibguard.exe -> fbguard.exe - interbase.msg -> firebird.msg - interbase.log -> firebird.log - isc4.gdb -> security.fdb - - Regarding the last item, it should be mentioned that - now the recommended extension for database files is - ".fdb" to avoid possible conflicts with "system restore" - feature of Windows ME/XP operating systems. - -1.2. Changes in the client library - - Now the client library is named "fbclient.dll". To provide a - compatibility with existing applications, a gateway library - "gds32.dll" can be installed to the Windows System Directory. - See instclient.exe utility for this. This tool can also properly - install fbclient.dll to Windows System Directory, should you like or - need so. - It's recommended to use native fbclient.dll library - in newly developed applications. All server utilities (gbak, - gfix, etc) uses only fbclient.dll and do not require gds32.dll. - -1.3. New configuration file - - ibconfig file is no longer used and it has been replaced with - firebird.conf, which is a part of new configuration manager and - allows you to use both old and some new options. You can see - the list of all supported configuration options (as well as - their default values) in the distributed version of this file. - -1.4. Classic Server (CS) - - Since Firebird 1.5, Classic engine is included in win32 - distributions. The file of this server version is named - fb_inet_server.exe and support TCP/IP and NetBEUI network - protocols (local protocol is not supported). The usage of - the Classic engine doesn't differ from its SS variant, - except of the architecture specifics (one server process - is running per client connection). - -1.5. Ability to install and work with existent IB/FB1 server - - There were some changes done in the system object names - to allow FB 1.5 to be installed and used on the computer - which already has IB/FB1 installed. FB 1.5 also uses - another registry keys. If you setup the server to use - different network ports, you also can run a few server - instances simultaneously or run FB 1.5 in the same time - with IB/FB1. - -1.6. Compatibility with previous versions - - Name of the local IPC port is no longer compatible, i.e. - with default server settings you cannot connect to it from - applications using old client library (gds32.dll). If - necessary, you can setup the server to use old name of the - IPC map via the configuration file. - - New version uses updated ODS (10.1). It doens't cause any - incompatibilities with previous versions, but you should be - aware of this fact. Engine doesn't upgrade ODS automatically - and Firebird 1.0 and 1.5 can use both ODS 10.0 and 10.1 databases. - Regardless of the above, backup/restore is still the - recommended procedure of migrating databases to the different - version of the server. - - Since a number of bugs has been fixed, the behaviour of the - database may change after downgrading from v1.5 to v1.0. - The datailed information of all such issues (as well as - appropriate recommendations) will be published separately. - - Some specifics of the server work have been changed in v1.5. - For more detailed information see configuration file - (firebird.conf) and release notes (WhatsNew.txt). - -2. INSTALLATION - - The installation of FB 1.5 doesn't practically differ from - previous versions. - -2.1. Required steps - - If you don't have a special setup program (it's distributed - separately) the steps are the following: - - - unzip the archive into the separate directory (since a few - file names were changed, it doesn't make sense to unzip - v1.5 files into the directory with IB/FB1) - - change the current directory to \bin (here and below - is the directory where v1.5 files are located) - - run instreg.exe: - instreg.exe install - it causes the installation path to be written into the registry - (HKLM\Software\Firebird Project\Firebird Server\Instances) - - if you want to register a service, run also instsvc.exe: - instsvc.exe install - (This is a Windows NT/2K/XP specific step.) - - optionally, you can copy both fbclient.dll and gds32.dll - to the OS system directory. To do so, use the provided instclient.exe - tool. - - Usage: - instclient i[nstall] [ -f[orce] ] library - q[uery] library - r[emove] library - - where library is: f[bclient] | g[ds32] - - This utility should be located and run from the 'bin' directory - of your Firebird installation. - '-z' can be used with any other option, prints version - - Purpose: - This utility manages deployment of the Firebird client library - into the Windows system directory. It caters for two installation - scenarios: - - Deployment of the native fbclient.dll. - Deployment of gds32.dll to support legacy applications. - - Version information and shared library counts are handled - automatically. You may provide the -f[orce] option to override - version checks. - - Please, note that if you -f[orce] the installation, you might have - to reboot the machine in order to finalize the copy and you might - break some other Firebird or InterBase(R) version on the system. - -2.2. Installation of CS - - To install the CS engine, the only difference is the additional - option for instsvc.exe: - instsvc.exe install -classic - - It means that you may have only one copy of the engine (either - fbserver.exe or fb_inet_server.exe) to be installed as a service. - -2.3. Simplified setup - - If you don't need a registered service, then you may avoid running - both instreg.exe and instsvc.exe. In this case you should just unzip - the archive into a separate directory and run the server: - fbserver.exe -a - It should treat its parent directory as a root directory in this - case. - You can also use instclient.exe to copy client library to System. - -2.4. Uninstallation - - To remove FB 1.5 you should: - - - stop the server (running "instsvc.exe stop" for instance) - - run "instsvc.exe remove" - - run "instreg.exe remove" - - run "instclient.exe remove fbclient" and/or "insclient.exe remove gds32" - if you used that tool to install those libraries the OS system directory. - - delete installation directory - -3. INFORMATION ABOUT THIS VERSION - - All changes included in FB 1.5 are briefly described in file: - \doc\WhatsNew.txt - Full documentation about new features and bugfixes will be - published in the official Release Notes, which will be available - in the final release. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 621060398c..ab80ca85fa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -952,8 +952,8 @@ add_custom_target(copy_files COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/extlib/ib_udf2.sql ${output_dir}/UDF/ib_udf2.sql COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/src/extlib/fbudf/fbudf.sql ${output_dir}/UDF/fbudf.sql # docs - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/ChangeLog ${output_dir}/doc/ChangeLog - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/doc/WhatsNew ${output_dir}/doc/WhatsNew + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/CHANGELOG.md ${output_dir}/doc/CHANGELOG.md + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/README.md ${output_dir}/doc/README.md # examples COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/examples/api ${output_dir}/examples/api COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/examples/dbcrypt ${output_dir}/examples/dbcrypt diff --git a/src/misc/smallog.cpp b/src/misc/smallog.cpp deleted file mode 100644 index 04125d17f5..0000000000 --- a/src/misc/smallog.cpp +++ /dev/null @@ -1,124 +0,0 @@ -/* - * PROGRAM: Prepare svn's log output to become our ChangeLog - * MODULE: smallog.cpp - * DESCRIPTION: Removes unneeded data from input file. - * - * The contents of this file are subject to the Initial - * Developer's Public License Version 1.0 (the "License"); - * you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. - * - * Software distributed under the License is distributed AS IS, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. - * See the License for the specific language governing rights - * and limitations under the License. - * - * The Original Code was created by Alexander Peshkoff - * for the Firebird Open Source RDBMS project. - * - * Copyright (c) 2010 Alexander Peshkoff - * and all contributors signed below. - * - * All Rights Reserved. - * Contributor(s): ______________________________________. - */ - -#include -#include - -#define CH_PATHS "Changed paths:" -#define IBN "increment build number" -#define NU "nightly update" - -#define TRUNK "/firebird/trunk/" -#define BRANCHES "/firebird/branches/" -#define TAGS "/firebird/tags/" - -int main(int ac, char** av) -{ - char s[32 * 1024]; - long retPos = -1; - bool firstLine = false; - bool skipped = true; - const char* master = av[1] ? av[1] : TRUNK; - char buf[1024]; - const char* branch = NULL; - if (av[1]) - { - strcpy(s, av[1]); - if (s[strlen(s) - 1] == '/') - s[strlen(s) - 1] = '\0'; - sprintf(buf, "A %s (from", s); - branch = buf; - } - - while (gets(s)) - { - if (firstLine) - { - // r51338 | dimitr | 2010-07-13 16:32:36 +0400 (Tue, 13 Jul 2010) | 1 line - char* rev = strtok(s, "|"); - char* nam = strtok(NULL, "|"); - char* dat = strtok(NULL, "|"); - char* colon = dat ? strrchr(dat, ':') : NULL; - if (colon) - *colon = '\0'; - printf("%s %s\n", dat, nam); - firstLine = false; - continue; - } - if (!strncmp(s, "----", 4)) - { - // new item - if (!skipped) - puts(""); - firstLine = true; - skipped = false; - retPos = ftell(stdout); - continue; - } - - if ((strstr(s, IBN) == s) || (strstr(s, NU) == s)) - { - if (fseek(stdout, retPos, SEEK_SET) < 0) - { - perror("fseek"); - return 1; - } - skipped = true; - continue; - } - if (skipped) - continue; - if (!strcmp(s, CH_PATHS)) - continue; - - char* trunk = strstr(s, master); - if (branch && strstr(s, branch)) - { - // branch was created here - branch = NULL; - master = TRUNK; - } - else if (trunk) - { - int l = strlen(trunk + strlen(master)); - memmove(trunk, trunk + strlen(master), l + 1); - } - else - { - if (strstr(s, TAGS)) - continue; - if (strstr(s, BRANCHES)) - continue; - if (strstr(s, TRUNK)) - continue; - } - - if (strlen(s)) - puts(s); - } - - return 0; -} diff --git a/src/misc/src_bundle.sh b/src/misc/src_bundle.sh index 63a27c8548..93c394c64d 100755 --- a/src/misc/src_bundle.sh +++ b/src/misc/src_bundle.sh @@ -36,7 +36,7 @@ popd >/dev/null 2>&1 # What and where to bundle MODULE=$SRCROOT/temp/src -MEMBERS="builds doc examples extern lang_helpers src ChangeLog Makefile.in acx_pthread.m4 autogen.sh binreloc.m4 configure.ac CMakeLists.txt README.md travis.sh .travis.yml" +MEMBERS="builds doc examples extern lang_helpers src CHANGELOG.md Makefile.in acx_pthread.m4 autogen.sh binreloc.m4 configure.ac CMakeLists.txt README.md travis.sh .travis.yml" # Cleanup rm -rf $MODULE