diff --git a/CHANGELOG b/CHANGELOG index e19e4ab2d..0a6bd1a8c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,9 @@ -1.17.5 / +1.17.5 / May 23, 2018 [Alexandr Topilski] - [LevelDB] Update sources to version 1.20 - [RocksDB] Update sources to version 5.13.0 - Update QScintilla to version 2.10.4 +- Update libssh2 (ED25519 Key Support) 1.17.4 / April 20, 2018 [Alexandr Topilski] diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e383edd3..d77671a30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.6.3) # OPENSSL_USE_STATIC_LIBS SET(BRANDING_PROJECT_NAME "FastoNoSQL" CACHE STRING "Branding for ${BRANDING_PROJECT_NAME}") #default SET(BRANDING_PROJECT_VERSION "1.17.5.0" CACHE STRING "Branding version for ${BRANDING_PROJECT_NAME}") #default -SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "alfa" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default +SET(BRANDING_PROJECT_BUILD_TYPE_VERSION "release" CACHE STRING "Build version type for ${BRANDING_PROJECT_NAME}") #default #possible variables: alfa, beta, rc, release SET(BRANDING_PROJECT_DOMAIN "https://www.fastonosql.com" CACHE STRING "Branding domain url for ${BRANDING_PROJECT_NAME}") #default @@ -515,3 +515,7 @@ ENDIF(CPACK_SUPPORT) IF(DEVELOPER_GENERATE_DOCS) CREATE_DOCS(${PROJECT_NAME_LOWERCASE} ${CMAKE_SOURCE_DIR}/docs/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) ENDIF(DEVELOPER_GENERATE_DOCS) + +IF(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit) + EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/scripts/create_pre_commit_hook.sh) +ENDIF(NOT EXISTS ${CMAKE_SOURCE_DIR}/.git/hooks/pre-commit) diff --git a/FASTOREDIS_CHANELOG b/FASTOREDIS_CHANELOG index 73da07edf..9ca22d6b1 100644 --- a/FASTOREDIS_CHANELOG +++ b/FASTOREDIS_CHANELOG @@ -1,6 +1,7 @@ -1.16.5 / +1.16.5 / May 23, 2018 [Alexandr Topilski] - Update QScintilla to version 2.10.4 +- Update libssh2 (ED25519 Key Support) 1.16.4 / April 20, 2018 [Alexandr Topilski] diff --git a/build/build_env.py b/build/build_env.py index 274b247e6..0787f2bfb 100755 --- a/build/build_env.py +++ b/build/build_env.py @@ -104,7 +104,7 @@ def build_openssl(self, prefix_path): def build_libssh2(self, cmake_line, prefix_path, make_install): abs_dir_path = self.build_dir_path_ try: - cloned_dir = utils.git_clone('https://github.com/fastogt/libssh2.git', abs_dir_path) + cloned_dir = utils.git_clone('https://github.com/topilski/libssh2.git', abs_dir_path) os.chdir(cloned_dir) os.mkdir('build_cmake_release') @@ -355,7 +355,7 @@ def build(self, bs): # abs_dir_path = self.build_dir_path_ self.build_snappy(cmake_line, make_install) - self.build_openssl(prefix_path) + self.build_openssl(prefix_path)# self.build_libssh2(cmake_line, prefix_path, make_install) self.build_jsonc(prefix_path) self.build_qscintilla(cmake_line, make_install) @@ -363,13 +363,13 @@ def build(self, bs): # databases libs builds self.build_hiredis(prefix_path) - self.build_libmemcached(prefix_path) + self.build_libmemcached(prefix_path) # self.build_unqlite(cmake_line, make_install) self.build_lmdb(prefix_path) self.build_leveldb(cmake_line, make_install) self.build_rocksdb(cmake_line, make_install) - self.build_upscaledb(prefix_path) - self.build_forestdb(cmake_line, make_install) + self.build_upscaledb(prefix_path) # + self.build_forestdb(cmake_line, make_install) # if __name__ == "__main__": diff --git a/cmake b/cmake index 6a7c0b9d2..acb525784 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6a7c0b9d2869856ed87c44be21a5adfd208a5390 +Subproject commit acb5257840fd4c9a91241b8484ab0f88c7a267c1