diff options
| author | Anton Adamansky <adamansky@gmail.com> | 2015-03-10 19:28:33 +0600 |
|---|---|---|
| committer | Anton Adamansky <adamansky@gmail.com> | 2015-03-10 19:28:33 +0600 |
| commit | afb8bcc481dfdd0e3b18996099143754c7777ffd (patch) | |
| tree | 7408d5b4f496ecc9604fd8f642875e0b79ce44f8 | |
| parent | 4158e81757a55b35fc196be95dbc83c1bac485f5 (diff) | |
| download | ejdb-afb8bcc481dfdd0e3b18996099143754c7777ffd.tar.gz ejdb-afb8bcc481dfdd0e3b18996099143754c7777ffd.tar.bz2 ejdb-afb8bcc481dfdd0e3b18996099143754c7777ffd.zip | |
#115
24 files changed, 244 insertions, 994 deletions
diff --git a/Changelog b/Changelog deleted file mode 100644 index 0b550c5..0000000 --- a/Changelog +++ /dev/null @@ -1,193 +0,0 @@ -libtcejdb (1.1.27) testing; urgency=low - - * Added negation support for the $elemMatch #109 - * Set `TCETHREAD` when pthread mutex or lock allocation fails. - Cherry picked from #4 https://github.com/Incubaid/tokyocabinet/pull/4 - * Added $rename query operators. - * Fixed #104 #114 - * #14 Implemented $slice operator - -libtcejdb (1.1.25) testing; urgency=low - - * Mongodb $unset operation implemented #101 - * json2bson segfaults for arrays of simple types #102 - - -- Anton Adamansky <adamansky@gmail.com> Sun, 27 Oct 2013 23:32:14 +0700 - -libtcejdb (1.1.24) testing; urgency=low - - * Fixed incorrect $set behaviour #99 - - -- Anton Adamansky <adamansky@gmail.com> Tue, 10 Sep 2013 22:30:49 +0700 - -libtcejdb (1.1.23) testing; urgency=low - - * Fixed crash with $elemMatch inside $and #96 - * Memleak #97 - - -- Anton Adamansky <adamansky@gmail.com> Tue, 03 Sep 2013 23:47:39 +0700 - -libtcejdb (1.1.22) testing; urgency=low - - * Testing new package build script - - -- Anton Adamansky <adamansky@gmail.com> Tue, 20 Aug 2013 02:36:48 +0700 - -libtcejdb (1.1.21) testing; urgency=low - - * Testing new package build script - - -- Anton Adamansky <adamansky@gmail.com> Tue, 20 Aug 2013 01:06:38 +0700 - -libtcejdb (1.1.20) testing; urgency=low - - * Fixed minor bug with update positional operator. - - -- Anton Adamansky <adamansky@gmail.com> Tue, 20 Aug 2013 01:01:51 +0700 - -libtcejdb (1.1.19-4) testing; urgency=low - - * Added support for MongoDB $(query) update operator #91 - - -- Anton Adamansky <adamansky@gmail.com> Mon, 19 Aug 2013 16:07:29 +0700 - -libtcejdb (1.1.18) testing; urgency=low - - * Added support MongoDB $(projection) operator #15 - - * Fixed incorrect behavior of field inclusion in $fields #15 - - * Fixed wrong checking of $ in collection names #90 - - -- Anton Adamansky <adamansky@gmail.com> Sun, 11 Aug 2013 23:32:26 +0700 - -libtcejdb (1.1.17) testing; urgency=low - - * Supports nested `$and` and `$or` clauses. #81 - - -- Anton Adamansky <adamansky@gmail.com> Thu, 08 Aug 2013 18:03:11 +0700 - -libtcejdb (1.1.16) testing; urgency=low - - * Fixed incorrect $set and $addToSet behaviour. #88 #89 - - -- Anton Adamansky <adamansky@gmail.com> Wed, 07 Aug 2013 10:07:12 +0700 - -libtcejdb (1.1.15) testing; urgency=low - - * Fixed segfault when passing NULL for cnames #84 - - -- Anton Adamansky <adamansky@gmail.com> Sat, 20 Jul 2013 17:26:41 +0700 - -libtcejdb (1.1.14-2) testing; urgency=low - - * Fix of arrays exporting in json export mode - - -- Anton Adamansky <adamansky@gmail.com> Fri, 19 Jul 2013 10:43:45 +0700 - -libtcejdb (1.1.14) testing; urgency=low - - * Supports generic ejdb commands interface - * Export/Import database data implemented - - -- Anton Adamansky <adamansky@gmail.com> Thu, 18 Jul 2013 15:44:31 +0700 - -libtcejdb (1.1.13) testing; urgency=low - - * .Net binding - * BSON processing fixes - - -- Anton Adamansky <adamansky@gmail.com> Fri, 21 Jun 2013 12:40:28 +0700 - -libtcejdb (1.1.12) testing; urgency=low - - * Threading consistency improvements - - -- Anton Adamansky <adamansky@gmail.com> Mon, 03 Jun 2013 11:32:15 +0700 - -libtcejdb (1.1.10) testing; urgency=low - - * Threading consistency improvements - - -- Anton Adamansky <adamansky@gmail.com> Thu, 30 May 2013 20:43:15 +0700 - -libtcejdb (1.1.8) testing; urgency=low - - * Fullscan selects stability improvements - - -- Anton Adamansky <adamansky@gmail.com> Thu, 30 May 2013 17:45:00 +0700 - -libtcejdb (1.1.7) testing; urgency=low - - * Fixed memleak #65 - - -- Anton Adamansky <adamansky@gmail.com> Tue, 28 May 2013 12:35:56 +0700 - -libtcejdb (1.1.6) testing; urgency=low - - * Better error reporting in the case of lack pthread resources. - - -- Anton Adamansky <adamansky@gmail.com> Sat, 25 May 2013 18:22:07 +0700 - -libtcejdb (1.1.5-0) testing; urgency=low - - * TCHDB locking optimization - * Out of memory crash fixed (#64) - - -- Anton Adamansky <adamansky@gmail.com> Fri, 24 May 2013 01:12:16 +0700 - -libtcejdb (1.1.4-0) testing; urgency=low - - * Array token index can be used for number eq matching - - -- Anton Adamansky <adamansky@gmail.com> Sun, 05 May 2013 22:11:14 +0700 - -libtcejdb (1.1.3-0) testing; urgency=low - - * Minor optimizations in the header files - - -- Anton Adamansky <adamansky@gmail.com> Tue, 30 Apr 2013 13:02:48 +0700 - -libtcejdb (1.1.1-1) testing; urgency=low - - * Various bugfixes - * EJDB & TokyoCabinet ported to windows - - -- Anton Adamansky <adamansky@gmail.com> Thu, 25 Apr 2013 13:22:39 +0700 - -libtcejdb (1.0.68-2) unstable; urgency=low - - * Fixed number index crash #54 - - -- Anton Adamansky <adamansky@gmail.com> Fri, 22 Mar 2013 18:01:39 +0700 - -libtcejdb (1.0.66) stable; urgency=low - - * Better BSON error reporting - - -- Anton Adamansky <adamansky@gmail.com> Mon, 11 Mar 2013 00:16:58 +0700 - -libtcejdb (1.0.65) unstable; urgency=low - - * Fix include directives to relative paths - - -- Anton Adamansky <adamansky@gmail.com> Wed, 13 Feb 2013 23:17:33 +0700 - -libtcejdb (1.0.64) unstable; urgency=low - - * Build flags fix - - -- Anton Adamansky <adamansky@gmail.com> Tue, 12 Feb 2013 00:50:00 +0700 - -libtcejdb (1.0.63) unstable; urgency=low - - * Fixed version number in tcutil.h - - -- Anton Adamansky <adamansky@gmail.com> Sun, 10 Feb 2013 15:34:29 +0700 - -libtcejdb (1.0.59) unstable; urgency=low - - * Initial Release. - - -- Anton Adamansky <adamansky@gmail.com> Sat, 02 Feb 2013 23:42:28 +0700 - diff --git a/ejdb.workspace b/ejdb.workspace index 0b194ce..b7b8332 100644 --- a/ejdb.workspace +++ b/ejdb.workspace @@ -5,10 +5,10 @@ <![CDATA[]]> </Environment> <BuildMatrix> - <WorkspaceConfiguration Name="win64-dbg" Selected="yes"> + <WorkspaceConfiguration Name="win64-dbg" Selected="no"> <Project Name="tcejdb" ConfigName="win64-dbg"/> </WorkspaceConfiguration> - <WorkspaceConfiguration Name="nix-dbg" Selected="no"> + <WorkspaceConfiguration Name="nix-dbg" Selected="yes"> <Project Name="tcejdb" ConfigName="nix-dbg"/> </WorkspaceConfiguration> </BuildMatrix> diff --git a/tcejdb/CMakeLists.txt b/tcejdb/CMakeLists.txt index f774572..00b64e8 100644 --- a/tcejdb/CMakeLists.txt +++ b/tcejdb/CMakeLists.txt @@ -1,13 +1,14 @@ cmake_minimum_required(VERSION 3.0) set(PROJECT_NAME "ejdb") - -project(${PROJECT_NAME} - VERSION 1.2.0 - LANGUAGES C) +set(PROJECT_VENDOR "Softmotions") +set(PROJECT_DESCRIPTION_SUMMARY "Embedded JSON database library (EJDB)") +set(PROJECT_WEBSITE "http://ejdb.org") +project(${PROJECT_NAME} VERSION 1.2.0 LANGUAGES C) option(BUILD_SHARED_LIBS "Build shared libraries" ON) -option(BUILD_TESTS "Build EJDB test cases" OFF) -#option(TEST_TOOL_CMD "Test tool command", "") +option(BUILD_TESTS "Build test cases" OFF) +option(PACKAGE_DEB "Build .deb instalation packages" OFF) +option(PACKAGE_TGZ "Build .tgz package archive" ON) if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.7) @@ -22,11 +23,8 @@ else() with Clang >= 3.4 and GCC >= 4.7") endif() -set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") -set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) -set(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) -set(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) -set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME} CACHE PATH "Installation prefix for C header files" FORCE) +include(GNUInstallDirs) + if(APPLE) option(BUILD_FRAMEWORK "Build an OS X framework" OFF) set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to.") @@ -202,8 +200,8 @@ file(GLOB EJDB_GENERATED_HDRS ${EJDB_GENERATED_DIR}/*.h) list(APPEND ALL_HDRS ${EJDB_GENERATED_HDRS}) if (NOT APPLE AND NOT BUILD_FRAMEWORK) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libejdb.pc.in ${EJDB_GENERATED_DIR}/libejdb.pc) - install(FILES ${EJDB_GENERATED_DIR}/libejdb.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libejdb.pc.in ${EJDB_GENERATED_DIR}/libejdb.pc @ONLY) + install(FILES ${EJDB_GENERATED_DIR}/libejdb.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif(NOT APPLE AND NOT BUILD_FRAMEWORK) if (BUILD_TESTS) @@ -240,28 +238,67 @@ set_target_properties(ejdb_p PROPERTIES install(TARGETS ejdb EXPORT ejdb-exports FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(EXPORT ejdb-exports - DESTINATION ${LIB_INSTALL_DIR}/${PROJECT_NAME}) + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) -export(EXPORT ejdb-exports) +install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE + ${CMAKE_CURRENT_SOURCE_DIR}/README + ${CMAKE_CURRENT_SOURCE_DIR}/Changelog + DESTINATION ${CMAKE_INSTALL_DOCDIR}) + + +export(EXPORT ejdb-exports) + +####################################################### + +set(CPACK_GENERATORS) +if (PACKAGE_TGZ) + list(APPEND CPACK_GENERATORS "TGZ") +endif() +if (PACKAGE_DEB) + list(APPEND CPACK_GENERATORS "DEB") +endif() + +set(CPACK_SOURCE_GENERATOR "TGZ") + +if (CPACK_GENERATORS) + set(CPACK_GENERATOR "${CPACK_GENERATORS}") + set(CPACK_PACKAGE_VERSION ${ejdb_VERSION}) + set(CPACK_PACKAGE_VERSION_MAJOR ${ejdb_VERSION_MAJOR}) + set(CPACK_PACKAGE_VERSION_MINOR ${ejdb_VERSION_MINOR}) + set(CPACK_PACKAGE_VERSION_PATCH ${ejdb_VERSION_PATCH}) + set(CPACK_PACKAGE_VENDOR ${PROJECT_VENDOR}) + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_DESCRIPTION_SUMMARY}) + set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") + set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README") + set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/README") + set(CPACK_PACKAGE_FILE_NAME + "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_BUILD_TYPE}-${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}") + if (PACKAGE_DEB) + include(EjdbDebCpack) + endif() + include(CPack) +endif() -#todo if -include(EjdbDebCpack) +######################################################### message("") message("#############################################") -message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") -message("\nBUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") -message("\nBUILD_TESTS: ${BUILD_TESTS}") -message("\nLINK LIBS: ${EJDB_LLIBRARIES}") +message("LINK LIBS: ${EJDB_LLIBRARIES}") message("\nINCLUDE DIRS: ${EJDB_INCLUDE_DIRS}") message("\nSOURCES: ${ALL_SRC}") message("\nPUB_HDRS: ${PUB_HDRS}") +message("\nCMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +message("BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") +message("BUILD_TESTS: ${BUILD_TESTS}") +message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") +message("CPACK_GENERATORS: ${CPACK_GENERATORS}") message("#############################################") message("") diff --git a/tcejdb/COPYING b/tcejdb/COPYING deleted file mode 100644 index b1e3f5a..0000000 --- a/tcejdb/COPYING +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/tcejdb/Changelog b/tcejdb/Changelog index 0b550c5..8453452 100644 --- a/tcejdb/Changelog +++ b/tcejdb/Changelog @@ -6,6 +6,8 @@ libtcejdb (1.1.27) testing; urgency=low * Added $rename query operators. * Fixed #104 #114 * #14 Implemented $slice operator + * Project moved to CMake build system #115 + * EJDB shared library changed its name from `tcejdb` to `ejdb` libtcejdb (1.1.25) testing; urgency=low diff --git a/tcejdb/CPack.cmake b/tcejdb/EjdbDebCpackOptions.cmake.in index e69de29..e69de29 100644 --- a/tcejdb/CPack.cmake +++ b/tcejdb/EjdbDebCpackOptions.cmake.in diff --git a/tcejdb/README b/tcejdb/README index 21bf2c7..fbf7a99 100644 --- a/tcejdb/README +++ b/tcejdb/README @@ -1 +1,2 @@ -http://ejdb.org +See http://ejdb.org + diff --git a/tcejdb/WIN32.md b/tcejdb/WIN32.md deleted file mode 100644 index 1e3640f..0000000 --- a/tcejdb/WIN32.md +++ /dev/null @@ -1,107 +0,0 @@ -Precompiled windows binaries -========================================= - -* [tcejdb-1.1.26-mingw32-i686](https://dl.dropboxusercontent.com/u/4709222/ejdb/tcejdb-1.1.26-mingw32-i686.zip) -* [tcejdb-1.1.26-mingw32-x86_64](https://dl.dropboxusercontent.com/u/4709222/ejdb/tcejdb-1.1.26-mingw32-x86_64.zip) - -**[Installing EJDB NodeJS win32 module](#ejdb-nodejs-module-installation)** - - -Building EJDB and TokyoCabinet for windows -========================================== - -All TokyoCabinet and EJDB API are ported to windows! - -Prerequsties ------------------------------------------- - - * Install **Linux x64 OS** (tested on debian/ubuntu) - * Install all these packages: - -``` - autoconf automake bash bison bzip2 cmake - flex gcc intltool libtool make openssl - patch perl pkg-config scons sed unzip - wget xz-utils yasm zip wine git -``` - - -Creating build environment ------------------------------------------ - -You need to checkout specific branch of [MXE cross build environmen](http://mxe.cc/) -to build win32 and win64 binaries: - - git clone https://github.com/mxe/mxe.git - git checkout multi-rebase - -Then create MXE settings file: - - cd <mx checkout dir> - nano ./settings.mk - -And enter the following settings into `./settings.mk`: - - JOBS := 1 - MXE_TARGETS := x86_64-w64-mingw32 i686-w64-mingw32 - #SOURCEFORGE_MIRROR := downloads.sourceforge.net - LOCAL_PKG_LIST := winpthreads pcre zlib cunit - .DEFAULT local-pkg-list: - local-pkg-list: $(LOCAL_PKG_LIST) - -Then make MXE build env: - - cd <mx checkout dir> - make - -Building EJDB and TokyoCabinet ------------------------------------- - - git clone https://github.com/Softmotions/ejdb.git - cd ejdb - -To make win build we have to run this script: `tcejdb/mxe/mxe-build.sh` - - mxe-build.sh <mxe home path> w32|w64 [optional ./configure options] - -Example: building win32 binaries + EJDB test cases - - tcejdb/mxe/mxe-build.sh ${HOME}/mxe w32 "--enable-tests" - -Example: building win64 binaries: - - tcejdb/mxe/mxe-build.sh ${HOME}/mxe w64 - -As result you will get zip archive in the folder `./tcejdb`: - `tcejdb-1.1.25-mingw32-i686.zip` or `tcejdb-1.1.25-mingw32-x86_64.zip` - -In those archives you will found: - - * TC/EJDB header files `./include/tcejdb` - * library DLL: `tcejdbdll.dll` **(Exported All TokyoCabinet and EJDB API)** - * DLL Import library for MSVC: `tcejdbdll.lib(.exp)` and for GCC: `libtcejdbdll.a` - * Library for static linking: `libtcejdb.a` - - -Sample code --------------------------------- -Sample code can be found in `./tcejdb/samples/` - - * `sample1_mingw` Netbeans project for MinGW build env - * `sample1_win32` Visual studio express 2010 solution - - -Notes --------------------------------- - -* In order to build MSVC import library we need Microsoft's `lib.exe` tool, -it automatically downloaded by `mxe-build.sh` from my dropbox account. So do not be surprised =) - -* Database files size on windows 32-bit are limited to 2GB, because on win32 all data is memory mapped. - -* HDB `tchdbsetxmsiz()` takes no effect because all file data is memory mapped on windows platform. - - - - - diff --git a/tcejdb/cmake/Modules/EjdbDebCpack.cmake b/tcejdb/cmake/Modules/EjdbDebCpack.cmake index e69de29..f4c2a4b 100644 --- a/tcejdb/cmake/Modules/EjdbDebCpack.cmake +++ b/tcejdb/cmake/Modules/EjdbDebCpack.cmake @@ -0,0 +1,8 @@ + +configure_file("${PROJECT_SOURCE_DIR}/EjdbDebCpackOptions.cmake.in", + "${PROJECT_BINARY_DIR}/EjdbDebCpackOptions.cmake" + @ONLY) + +set(CPACK_PROJECT_CONFIG_FILE + "${PROJECT_BINARY_DIR}/EjdbDebCpackOptions.cmake") + diff --git a/tcejdb/src/libejdb.pc.in b/tcejdb/src/libejdb.pc.in index e613786..af087f0 100644 --- a/tcejdb/src/libejdb.pc.in +++ b/tcejdb/src/libejdb.pc.in @@ -1,11 +1,11 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${EXEC_INSTALL_PREFIX} -libdir=${LIB_INSTALL_DIR} -includedir=${INCLUDE_INSTALL_DIR} +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix}/@CMAKE_INSTALL_BINDIR@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -Name: ${PROJECT_NAME} -Description: Embeddable JSON database library (EJDB) -URL: http://ejdb.org -Version: ${PROJECT_VERSION} -Libs: -L${LIB_INSTALL_DIR} -l${PROJECT_NAME} -Cflags: -I${INCLUDE_INSTALL_DIR} +Name: @PROJECT_NAME@ +Description: @PROJECT_DESCRIPTION_SUMMARY@ +URL: @PROJECT_WEBSITE@ +Version: @PROJECT_VERSION@ +Libs: -L${libdir} -l@PROJECT_NAME@ +Cflags: -I${includedir} diff --git a/tcejdb/src/tcbdb/tests/CMakeLists.txt b/tcejdb/src/tcbdb/tests/CMakeLists.txt index 0014eea..c2c05aa 100644 --- a/tcejdb/src/tcbdb/tests/CMakeLists.txt +++ b/tcejdb/src/tcbdb/tests/CMakeLists.txt @@ -4,8 +4,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TEST_DATA_DIR}) add_executable(tcbtest tcbtest.c) add_executable(tcbmttest tcbmttest.c) -add_dependencies(tcbtest tchmgr) -add_dependencies(tcbmttest tchmgr tchmttest) +add_dependencies(tcbtest jbhmgr) +add_dependencies(tcbmttest jbhmgr tchmttest) set_target_properties(tcbtest tcbmttest PROPERTIES COMPILE_FLAGS "-DEJDB_STATIC") @@ -23,11 +23,11 @@ add_test(NAME tcbtest3 WORKING_DIRECTORY ${TEST_DATA_DIR} remove casket) add_test(NAME tcbtest4 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -rb 00001000 00002000 casket) #check.out add_test(NAME tcbtest5 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -fm 000001 casket) #check.out add_test(NAME tcbtest6 WORKING_DIRECTORY ${TEST_DATA_DIR} @@ -79,7 +79,7 @@ add_test(NAME tcbtest16 WORKING_DIRECTORY ${TEST_DATA_DIR} rcat -cd -tl -td -ru -pn 500 casket 5000 5 5 500 1 1) add_test(NAME tcbtest17 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -pv casket) #check.out add_test(NAME tcbtest18 WORKING_DIRECTORY ${TEST_DATA_DIR} @@ -131,7 +131,7 @@ add_test(NAME tcbtest29 WORKING_DIRECTORY ${TEST_DATA_DIR} remove -cd -lc 5 -nc 5 casket) add_test(NAME tcbtest30 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -pv casket) #check.out add_test(NAME tcbtest31 WORKING_DIRECTORY ${TEST_DATA_DIR} @@ -147,7 +147,7 @@ add_test(NAME tcbtest33 WORKING_DIRECTORY ${TEST_DATA_DIR} remove -ci -lc 5 -nc 5 casket) add_test(NAME tcbtest34 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -pv casket) #check.out add_test(NAME tcbtest35 WORKING_DIRECTORY ${TEST_DATA_DIR} @@ -163,7 +163,7 @@ add_test(NAME tcbtest37 WORKING_DIRECTORY ${TEST_DATA_DIR} remove -cj -lc 5 -nc 5 casket) add_test(NAME tcbtest38 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -pv casket) #check.out add_test(NAME tcbtest39 WORKING_DIRECTORY ${TEST_DATA_DIR} @@ -211,97 +211,97 @@ add_test(NAME tcbtest49 WORKING_DIRECTORY ${TEST_DATA_DIR} race -df 5 casket 5 10000) add_test(NAME tcbtest50 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> create casket 4 4 3 1 1) add_test(NAME tcbtest51 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> inform casket) add_test(NAME tcbtest52 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put casket one first) add_test(NAME tcbtest53 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put casket two second) add_test(NAME tcbtest54 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put -dk casket three third) add_test(NAME tcbtest55 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put -dc casket three third) add_test(NAME tcbtest56 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put -dc casket three third) add_test(NAME tcbtest57 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put -dd casket three third) add_test(NAME tcbtest58 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put -dd casket three third) add_test(NAME tcbtest59 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put casket four fourth) add_test(NAME tcbtest60 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put -dk casket five fifth) add_test(NAME tcbtest61 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> out casket one) add_test(NAME tcbtest62 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> out casket two) add_test(NAME tcbtest63 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> get casket three) #check.out add_test(NAME tcbtest64 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> get casket four) #check.out add_test(NAME tcbtest65 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> get casket five) #check.out add_test(NAME tcbtest66 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -pv casket) #check.out add_test(NAME tcbtest67 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -j three -pv casket) #check.out add_test(NAME tcbtest68 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> optimize casket) add_test(NAME tcbtest69 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> put -dc casket three third) add_test(NAME tcbtest70 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> get casket three) #check.out add_test(NAME tcbtest71 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> get casket four) #check.out add_test(NAME tcbtest72 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> get casket five) #check.out add_test(NAME tcbtest73 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcbmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbbmgr> list -pv casket) #check.out diff --git a/tcejdb/src/tcbdb/tools/CMakeLists.txt b/tcejdb/src/tcbdb/tools/CMakeLists.txt index 10de211..9c61069 100644 --- a/tcejdb/src/tcbdb/tools/CMakeLists.txt +++ b/tcejdb/src/tcbdb/tools/CMakeLists.txt @@ -1,14 +1,14 @@ link_libraries(ejdb_p) -add_executable(tcbmgr tcbmgr.c) +add_executable(jbbmgr jbbmgr.c) -set_target_properties(tcbmgr PROPERTIES +set_target_properties(jbbmgr PROPERTIES COMPILE_FLAGS "-DEJDB_STATIC") -install(TARGETS tcbmgr +install(TARGETS jbbmgr FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/tcejdb/src/tcbdb/tools/tcbmgr.c b/tcejdb/src/tcbdb/tools/jbbmgr.c index d99fab0..d99fab0 100644 --- a/tcejdb/src/tcbdb/tools/tcbmgr.c +++ b/tcejdb/src/tcbdb/tools/jbbmgr.c diff --git a/tcejdb/src/tcfdb/tests/CMakeLists.txt b/tcejdb/src/tcfdb/tests/CMakeLists.txt index 3e7a139..9568a46 100644 --- a/tcejdb/src/tcfdb/tests/CMakeLists.txt +++ b/tcejdb/src/tcfdb/tests/CMakeLists.txt @@ -4,8 +4,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TEST_DATA_DIR}) add_executable(tcftest tcftest.c) add_executable(tcfmttest tcfmttest.c) -add_dependencies(tcftest tcfmgr) -add_dependencies(tcfmttest tcfmgr) +add_dependencies(tcftest jbfmgr) +add_dependencies(tcfmttest jbfmgr) set_target_properties(tcftest tcfmttest PROPERTIES COMPILE_FLAGS "-DEJDB_STATIC") @@ -48,11 +48,11 @@ add_test(NAME tcftest9 WORKING_DIRECTORY ${TEST_DATA_DIR} rcat -pn 500 -ru casket 5000 500) add_test(NAME tcftest10 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> list -pv casket) #check.out add_test(NAME tcftest11 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> list -pv -ri "[100,200)" -px casket) #check.out add_test(NAME tcftest12 WORKING_DIRECTORY ${TEST_DATA_DIR} @@ -108,90 +108,90 @@ add_test(NAME tcftest24 WORKING_DIRECTORY ${TEST_DATA_DIR} typical -nc casket 5 50000 50) add_test(NAME tcftest25 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> create casket 50) add_test(NAME tcftest26 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> inform casket) add_test(NAME tcftest27 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put casket 1 first) add_test(NAME tcftest28 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put casket 2 second) add_test(NAME tcftest29 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put -dk casket 3 third) add_test(NAME tcftest30 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put -dc casket 3 third) add_test(NAME tcftest31 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put -dc casket 3 third) add_test(NAME tcftest32 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put -dc casket 3 third) add_test(NAME tcftest33 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put casket 4 fourth) add_test(NAME tcftest34 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put -dk casket 5 fifth) add_test(NAME tcftest35 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> out casket 1) add_test(NAME tcftest36 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> out casket 2) add_test(NAME tcftest37 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> get casket 3) #check.out add_test(NAME tcftest38 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> get casket 4) #check.out add_test(NAME tcftest39 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> get casket 5) #check.out add_test(NAME tcftest40 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> list -pv casket) #check.out add_test(NAME tcftest41 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> optimize casket 5) add_test(NAME tcftest42 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> put -dc casket 3 third) add_test(NAME tcftest43 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> get casket 3) #check.out add_test(NAME tcftest44 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> get casket 4) #check.out add_test(NAME tcftest45 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> get casket 5) #check.out add_test(NAME tcftest46 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tcfmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbfmgr> list -pv casket) #check.out diff --git a/tcejdb/src/tcfdb/tools/CMakeLists.txt b/tcejdb/src/tcfdb/tools/CMakeLists.txt index 2ab76be..6229786 100644 --- a/tcejdb/src/tcfdb/tools/CMakeLists.txt +++ b/tcejdb/src/tcfdb/tools/CMakeLists.txt @@ -1,12 +1,12 @@ link_libraries(ejdb_p) -add_executable(tcfmgr tcfmgr.c) +add_executable(jbfmgr jbfmgr.c) -set_target_properties(tcfmgr PROPERTIES +set_target_properties(jbfmgr PROPERTIES COMPILE_FLAGS "-DEJDB_STATIC") -install(TARGETS tcfmgr +install(TARGETS jbfmgr FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/tcejdb/src/tcfdb/tools/tcfmgr.c b/tcejdb/src/tcfdb/tools/jbfmgr.c index 8fe3632..8fe3632 100644 --- a/tcejdb/src/tcfdb/tools/tcfmgr.c +++ b/tcejdb/src/tcfdb/tools/jbfmgr.c diff --git a/tcejdb/src/tchdb/tests/CMakeLists.txt b/tcejdb/src/tchdb/tests/CMakeLists.txt index d9f4c87..1f9d46e 100644 --- a/tcejdb/src/tchdb/tests/CMakeLists.txt +++ b/tcejdb/src/tchdb/tests/CMakeLists.txt @@ -4,8 +4,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TEST_DATA_DIR}) add_executable(tchtest tchtest.c) add_executable(tchmttest tchmttest.c) -add_dependencies(tchtest tchmgr) -add_dependencies(tchmttest tchmgr) +add_dependencies(tchtest jbhmgr) +add_dependencies(tchmttest jbhmgr) set_target_properties(tchtest tchmttest PROPERTIES COMPILE_FLAGS "-DEJDB_STATIC") @@ -71,11 +71,11 @@ add_test(NAME tchtest15 WORKING_DIRECTORY ${TEST_DATA_DIR} rcat -tl -td -ru -pn 500 casket 5000 500 1 1) add_test(NAME tchtest16 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> list -pv casket) add_test(NAME tchtest17 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> list -pv -fm 1 -px casket) add_test(NAME tchtest18 WORKING_DIRECTORY ${TEST_DATA_DIR} @@ -155,94 +155,94 @@ add_test(NAME tchtest36 WORKING_DIRECTORY ${TEST_DATA_DIR} race -df 5 casket 5 10000) add_test(NAME tchtest37 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> create casket 3 1 1) add_test(NAME tchtest38 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> inform casket) add_test(NAME tchtest39 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put casket one first) add_test(NAME tchtest40 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put casket two second) add_test(NAME tchtest41 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put -dk casket three third) add_test(NAME tchtest42 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put -dc casket three third) add_test(NAME tchtest43 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put -dc casket three third) add_test(NAME tchtest44 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put -dc casket three third) add_test(NAME tchtest45 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put casket four fourth) add_test(NAME tchtest46 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put -dk casket five fifth) add_test(NAME tchtest47 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> out casket one) add_test(NAME tchtest48 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> out casket two) add_test(NAME tchtest49 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> get casket three) #check.out add_test(NAME tchtest50 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> get casket four) #check.out add_test(NAME tchtest51 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> get casket five) #check.out add_test(NAME tchtest52 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> list -pv casket) #check.out add_test(NAME tchtest53 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> optimize casket) add_test(NAME tchtest54 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> put -dc casket three third) add_test(NAME tchtest55 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> get casket three) #check.out add_test(NAME tchtest56 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> get casket three) #check.out add_test(NAME tchtest57 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> get casket four) #check.out add_test(NAME tchtest58 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> get casket five) #check.out add_test(NAME tchtest59 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tchmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbhmgr> list -pv casket) #check.out diff --git a/tcejdb/src/tchdb/tools/CMakeLists.txt b/tcejdb/src/tchdb/tools/CMakeLists.txt index bfaa086..f1eed47 100644 --- a/tcejdb/src/tchdb/tools/CMakeLists.txt +++ b/tcejdb/src/tchdb/tools/CMakeLists.txt @@ -1,11 +1,11 @@ link_libraries(ejdb_p) -add_executable(tchmgr tchmgr.c) -set_target_properties(tchmgr PROPERTIES +add_executable(jbhmgr jbhmgr.c) +set_target_properties(jbhmgr PROPERTIES COMPILE_FLAGS "-DEJDB_STATIC") -install(TARGETS tchmgr +install(TARGETS jbhmgr FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/tcejdb/src/tchdb/tools/tchmgr.c b/tcejdb/src/tchdb/tools/jbhmgr.c index 7594c9d..7594c9d 100644 --- a/tcejdb/src/tchdb/tools/tchmgr.c +++ b/tcejdb/src/tchdb/tools/jbhmgr.c diff --git a/tcejdb/src/tctdb/tests/CMakeLists.txt b/tcejdb/src/tctdb/tests/CMakeLists.txt index 76d0db2..7031673 100644 --- a/tcejdb/src/tctdb/tests/CMakeLists.txt +++ b/tcejdb/src/tctdb/tests/CMakeLists.txt @@ -4,8 +4,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${TEST_DATA_DIR}) add_executable(tcttest tcttest.c) add_executable(tctmttest tctmttest.c) -add_dependencies(tcttest tchmgr tcbmgr) -add_dependencies(tctmttest tchmgr tcbmgr) +add_dependencies(tcttest jbhmgr jbbmgr) +add_dependencies(tctmttest jbhmgr jbbmgr) set_target_properties(tcttest tctmttest PROPERTIES COMPILE_FLAGS "-DEJDB_STATIC") @@ -61,11 +61,11 @@ add_test(NAME tcttest12 WORKING_DIRECTORY ${TEST_DATA_DIR} rcat -tl -td -ru -pn 500 -is -in casket 5000 500 1 1) add_test(NAME tcttest13 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> list -pv casket) #check.out add_test(NAME tcttest14 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> list -pv -px casket) #check.out add_test(NAME tcttest15 WORKING_DIRECTORY ${TEST_DATA_DIR} @@ -141,121 +141,121 @@ add_test(NAME tcttest32 WORKING_DIRECTORY ${TEST_DATA_DIR} typical -tl -rc 50000 -lc 5 -nc 5 casket 5 5000 500) add_test(NAME tcttest33 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> create casket 3 1 1) add_test(NAME tcttest34 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> setindex casket name) add_test(NAME tcttest35 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> inform casket) add_test(NAME tcttest36 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> put casket "" name mikio birth 19780211 lang ja,en,c) add_test(NAME tcttest37 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> put casket "" name fal birth 19771007 lang ja) add_test(NAME tcttest38 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> put casket "" name banana price 100) add_test(NAME tcttest39 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> put -dc casket 3 color yellow) add_test(NAME tcttest40 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> put -dk casket "" name melon price 1200 color green) add_test(NAME tcttest41 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> put casket "" name void birth 20010101 lang en) add_test(NAME tcttest42 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> out casket 5) add_test(NAME tcttest43 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> get casket 1) #check.out add_test(NAME tcttest44 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> get casket 2) #check.out add_test(NAME tcttest45 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> get casket 3) #check.out add_test(NAME tcttest46 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search casket) #check.out add_test(NAME tcttest47 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search -m 10 -sk 1 -pv -ph casket) #check.out add_test(NAME tcttest48 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search -m 10 -ord name STRDESC -pv -ph casket) #check.out add_test(NAME tcttest49 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search -m 10 -ord name STRDESC -pv -ph casket name STRBW mi birth NUMBT 19700101,19791231 lang STRAND ja,en) #check.out add_test(NAME tcttest50 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search -ord birth NUMDESC -pv -ms UNION casket name STREQ mikio name STRINC fal name FTSEX "ba na na") #check.out add_test(NAME tcttest51 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> setindex casket name) add_test(NAME tcttest52 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> setindex -it dec casket birth) add_test(NAME tcttest53 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> setindex casket lang) add_test(NAME tcttest54 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> list -pv casket) #check.out add_test(NAME tcttest55 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> optimize casket) add_test(NAME tcttest56 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> put casket "" name tokyo country japan lang ja) add_test(NAME tcttest57 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search -m 10 -sk 1 -pv -ph casket) #check.out add_test(NAME tcttest58 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search -m 10 -ord name STRDESC -pv -ph casket) #check.out add_test(NAME tcttest59 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search -m 10 -ord name STRDESC -pv -ph casket name STRBW mi birth NUMBT 19700101,19791231 lang STRAND ja,en) #check.out add_test(NAME tcttest60 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> search -ord price NUMDESC -ph -rm casket name STRINC a) add_test(NAME tcttest61 WORKING_DIRECTORY ${TEST_DATA_DIR} - COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:tctmgr> + COMMAND ${TEST_TOOL_CMD} $<TARGET_FILE:jbtmgr> list -pv casket) #check.out diff --git a/tcejdb/src/tctdb/tools/CMakeLists.txt b/tcejdb/src/tctdb/tools/CMakeLists.txt index 0b55b93..3235f0b 100644 --- a/tcejdb/src/tctdb/tools/CMakeLists.txt +++ b/tcejdb/src/tctdb/tools/CMakeLists.txt @@ -1,11 +1,11 @@ link_libraries(ejdb_p) -add_executable(tctmgr tctmgr.c) -set_target_properties(tctmgr PROPERTIES +add_executable(jbtmgr jbtmgr.c) +set_target_properties(jbtmgr PROPERTIES COMPILE_FLAGS "-DEJDB_STATIC") -install(TARGETS tctmgr +install(TARGETS jbtmgr FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/tcejdb/src/tctdb/tools/tctmgr.c b/tcejdb/src/tctdb/tools/jbtmgr.c index 87dc379..87dc379 100644 --- a/tcejdb/src/tctdb/tools/tctmgr.c +++ b/tcejdb/src/tctdb/tools/jbtmgr.c diff --git a/tcejdb/tcejdb.project b/tcejdb/tcejdb.project index 3833b52..b01b1f1 100644 --- a/tcejdb/tcejdb.project +++ b/tcejdb/tcejdb.project @@ -71,8 +71,8 @@ <File Name="src/tcbdb/tcbdb.c"/> <File Name="src/tcbdb/tcbdb.h"/> <VirtualDirectory Name="tools"> - <File Name="src/tcbdb/tools/tcbmgr.c"/> <File Name="src/tcbdb/tools/CMakeLists.txt"/> + <File Name="src/tcbdb/tools/jbbmgr.c"/> </VirtualDirectory> </VirtualDirectory> <VirtualDirectory Name="tcfdb"> @@ -84,8 +84,8 @@ <File Name="src/tcfdb/tcfdb.c"/> <File Name="src/tcfdb/tcfdb.h"/> <VirtualDirectory Name="tools"> - <File Name="src/tcfdb/tools/tcfmgr.c"/> <File Name="src/tcfdb/tools/CMakeLists.txt"/> + <File Name="src/tcfdb/tools/jbfmgr.c"/> </VirtualDirectory> </VirtualDirectory> <VirtualDirectory Name="tchdb"> @@ -97,8 +97,8 @@ <File Name="src/tchdb/tchdb.c"/> <File Name="src/tchdb/tchdb.h"/> <VirtualDirectory Name="tools"> - <File Name="src/tchdb/tools/tchmgr.c"/> <File Name="src/tchdb/tools/CMakeLists.txt"/> + <File Name="src/tchdb/tools/jbhmgr.c"/> </VirtualDirectory> </VirtualDirectory> <VirtualDirectory Name="tctdb"> @@ -110,8 +110,8 @@ <File Name="src/tctdb/tctdb.c"/> <File Name="src/tctdb/tctdb.h"/> <VirtualDirectory Name="tools"> - <File Name="src/tctdb/tools/tctmgr.c"/> <File Name="src/tctdb/tools/CMakeLists.txt"/> + <File Name="src/tctdb/tools/jbtmgr.c"/> </VirtualDirectory> </VirtualDirectory> <VirtualDirectory Name="tcutil"> @@ -166,6 +166,7 @@ <File Name="cmake/Modules/EjdbUtils.cmake"/> <File Name="win64-tc.cmake"/> <File Name="cmake/Modules/EjdbDebCpack.cmake"/> + <File Name="EjdbDebCpackOptions.cmake.in"/> </VirtualDirectory> <Settings Type="Executable"> <GlobalSettings> @@ -218,7 +219,7 @@ <SearchPaths/> </Completion> </Configuration> - <Configuration Name="win64-dbg" CompilerType="Cross GCC ( x86_64-linux-gnu )" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> + <Configuration Name="win64-dbg" CompilerType="Cross GCC(x86_64-w64)" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> <Compiler Options="-g -Wall" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0"> <IncludePath Value="."/> </Compiler> @@ -231,7 +232,7 @@ <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"> <![CDATA[]]> </Environment> - <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no"> + <Debugger IsRemote="yes" RemoteHostName="localhost" RemoteHostPort="6666" DebuggerPath="" IsExtended="no"> <DebuggerSearchPaths/> <PostConnectCommands/> <StartupCommands/> @@ -260,4 +261,9 @@ </Completion> </Configuration> </Settings> + <VirtualDirectory Name="docs"> + <File Name="../Changelog"/> + <File Name="../README.md"/> + <File Name="../LICENSE"/> + </VirtualDirectory> </CodeLite_Project> |