From 033c40a6e5879e2d6e7f6fd39ce1adca61f02383 Mon Sep 17 00:00:00 2001 From: alexstocks Date: Tue, 27 Aug 2024 23:43:25 +0800 Subject: [PATCH 1/3] add new logo --- CMakeCache.txt | 56 ++++++++++++++++++++++++++++++++++++ CMakeFiles/cmake.check_cache | 1 + etc/script/build.sh | 3 ++ src/pikiwidb_logo.h | 13 +++++---- 4 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 CMakeCache.txt create mode 100644 CMakeFiles/cmake.check_cache diff --git a/CMakeCache.txt b/CMakeCache.txt new file mode 100644 index 0000000..9c784d4 --- /dev/null +++ b/CMakeCache.txt @@ -0,0 +1,56 @@ +# This is the CMakeCache file. +# For build in directory: /Users/alex/test/golang/lib/src/github.com/arana-db/kiwi +# It was generated by CMake: /usr/local/Cellar/cmake/3.9.3_1/bin/cmake +# You can edit this file to change values found and used by cmake. +# If you do not want to change any of the values, simply exit the editor. +# If you do want to change a value, simply edit, save, and exit the editor. +# The syntax for the file is as follows: +# KEY:TYPE=VALUE +# KEY is the name of a variable in the cache. +# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!. +# VALUE is the current value for the KEY. + +######################## +# EXTERNAL cache entries +######################## + +//No help, variable specified on the command line. +CMAKE_BUILD_TYPE:UNINITIALIZED=Release + + +######################## +# INTERNAL cache entries +######################## + +//This is the directory where this CMakeCache.txt was created +CMAKE_CACHEFILE_DIR:INTERNAL=/Users/alex/test/golang/lib/src/github.com/arana-db/kiwi +//Major version of cmake used to create the current loaded cache +CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 +//Minor version of cmake used to create the current loaded cache +CMAKE_CACHE_MINOR_VERSION:INTERNAL=9 +//Patch version of cmake used to create the current loaded cache +CMAKE_CACHE_PATCH_VERSION:INTERNAL=3 +//Path to CMake executable. +CMAKE_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/bin/cmake +//Path to cpack program executable. +CMAKE_CPACK_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/bin/cpack +//Path to ctest program executable. +CMAKE_CTEST_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/bin/ctest +//Path to cache edit program executable. +CMAKE_EDIT_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/bin/ccmake +//Name of external makefile project generator. +CMAKE_EXTRA_GENERATOR:INTERNAL= +//Name of generator. +CMAKE_GENERATOR:INTERNAL=Unix Makefiles +//Name of generator platform. +CMAKE_GENERATOR_PLATFORM:INTERNAL= +//Name of generator toolset. +CMAKE_GENERATOR_TOOLSET:INTERNAL= +//Source directory with the top level CMakeLists.txt file for this +// project +CMAKE_HOME_DIRECTORY:INTERNAL=/Users/alex/test/golang/lib/src/github.com/arana-db/kiwi/cmake-build-release +//number of local generators +CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 +//Path to CMake installation. +CMAKE_ROOT:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/share/cmake + diff --git a/CMakeFiles/cmake.check_cache b/CMakeFiles/cmake.check_cache new file mode 100644 index 0000000..3dccd73 --- /dev/null +++ b/CMakeFiles/cmake.check_cache @@ -0,0 +1 @@ +# This file is generated by cmake for dependency checking of the CMakeCache.txt file diff --git a/etc/script/build.sh b/etc/script/build.sh index 5105755..2aced88 100755 --- a/etc/script/build.sh +++ b/etc/script/build.sh @@ -44,6 +44,9 @@ function build() { PREFIX="${PREFIX}-debug" fi + mkdir -p ${PREFIX} + cp CMakeLists.txt ${PREFIX}/ + cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_FLAGS} -S . -B ${PREFIX} cmake --build ${PREFIX} -- ${MAKE_FLAGS} -j ${CPU_CORE} diff --git a/src/pikiwidb_logo.h b/src/pikiwidb_logo.h index dffc13b..3ee7a33 100644 --- a/src/pikiwidb_logo.h +++ b/src/pikiwidb_logo.h @@ -12,9 +12,10 @@ #pragma once const char* pikiwidbLogo = - "\n______ _ _ _ _ ______ ______ \n" - "| ___ \\ (_)| | (_) (_)| _ \\| ___ \\ \n" - "| |_/ / _ | | __ _ __ __ _ | | | || |_/ / PikiwiDB(%s) %d bits \n" // version and - "| __/ | || |/ /| |\\ \\ /\\ / /| || | | || ___ \\ \n" - "| | | || < | | \\ V V / | || |/ / | |_/ / Port: %d\n" - "\\_| |_||_|\\_\\|_| \\_/\\_/ |_||___/ \\____/ https://github.com/OpenAtomFoundation/pikiwidb \n\n\n"; + "\n _ _ __ _ \n" + " ( )( ) / )( ) _ _ \n" + " _ _ _ __ _ _ ___ _ _ ______ _| || |_ /' /' | |/') (_) _ _ _ (_) arana-db/kiwi %d bits \n" // version + " /'_` )( '__)/'_` )/' _ `\ /'_` )(______)/'_` || '_`\ /' /' | , < | |( ) ( ) ( )| | Port: %d \n" + " ( (_| || | ( (_| || ( ) |( (_| | ( (_| || |_) ) /' /' | |\`\ | || \_/ \_/ || | \n" + " `\__,_)(_) `\__,_)(_) (_)`\__,_) `\__,_)(_,__/'(_/' (_) (_)(_)`\___x___/'(_) \n" + " Github repo site: https://github.com/arana-db/kiwi \n\n\n"; From 551fd9b75586d8afb23ec5c6675b366fbce09d03 Mon Sep 17 00:00:00 2001 From: alexstocks Date: Wed, 28 Aug 2024 09:47:21 +0800 Subject: [PATCH 2/3] delete CMakeCache.txt --- .gitignore | 2 ++ CMakeCache.txt | 56 ------------------------------------ CMakeFiles/cmake.check_cache | 1 - 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 CMakeCache.txt delete mode 100644 CMakeFiles/cmake.check_cache diff --git a/.gitignore b/.gitignore index cc9a5c6..d9bdc8d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ cmake-build-release-release/ build/ build-debug/ build-release/ +CMakeFiles/ +CMakeCache.txt # Precompiled Headers *.gch diff --git a/CMakeCache.txt b/CMakeCache.txt deleted file mode 100644 index 9c784d4..0000000 --- a/CMakeCache.txt +++ /dev/null @@ -1,56 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: /Users/alex/test/golang/lib/src/github.com/arana-db/kiwi -# It was generated by CMake: /usr/local/Cellar/cmake/3.9.3_1/bin/cmake -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a variable in the cache. -# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - -//No help, variable specified on the command line. -CMAKE_BUILD_TYPE:UNINITIALIZED=Release - - -######################## -# INTERNAL cache entries -######################## - -//This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/Users/alex/test/golang/lib/src/github.com/arana-db/kiwi -//Major version of cmake used to create the current loaded cache -CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 -//Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=9 -//Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=3 -//Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/bin/cmake -//Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/bin/cpack -//Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/bin/ctest -//Path to cache edit program executable. -CMAKE_EDIT_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/bin/ccmake -//Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL= -//Name of generator. -CMAKE_GENERATOR:INTERNAL=Unix Makefiles -//Name of generator platform. -CMAKE_GENERATOR_PLATFORM:INTERNAL= -//Name of generator toolset. -CMAKE_GENERATOR_TOOLSET:INTERNAL= -//Source directory with the top level CMakeLists.txt file for this -// project -CMAKE_HOME_DIRECTORY:INTERNAL=/Users/alex/test/golang/lib/src/github.com/arana-db/kiwi/cmake-build-release -//number of local generators -CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 -//Path to CMake installation. -CMAKE_ROOT:INTERNAL=/usr/local/Cellar/cmake/3.9.3_1/share/cmake - diff --git a/CMakeFiles/cmake.check_cache b/CMakeFiles/cmake.check_cache deleted file mode 100644 index 3dccd73..0000000 --- a/CMakeFiles/cmake.check_cache +++ /dev/null @@ -1 +0,0 @@ -# This file is generated by cmake for dependency checking of the CMakeCache.txt file From 58c3b0f70e5213456d04dda238ad742afa2bbaa0 Mon Sep 17 00:00:00 2001 From: alexstocks Date: Wed, 28 Aug 2024 10:26:58 +0800 Subject: [PATCH 3/3] update logo --- src/pikiwidb_logo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pikiwidb_logo.h b/src/pikiwidb_logo.h index 3ee7a33..aad36e3 100644 --- a/src/pikiwidb_logo.h +++ b/src/pikiwidb_logo.h @@ -14,7 +14,7 @@ const char* pikiwidbLogo = "\n _ _ __ _ \n" " ( )( ) / )( ) _ _ \n" - " _ _ _ __ _ _ ___ _ _ ______ _| || |_ /' /' | |/') (_) _ _ _ (_) arana-db/kiwi %d bits \n" // version + " _ _ _ __ _ _ ___ _ _ ______ _| || |_ /' /' | |/') (_) _ _ _ (_) %d bits \n" " /'_` )( '__)/'_` )/' _ `\ /'_` )(______)/'_` || '_`\ /' /' | , < | |( ) ( ) ( )| | Port: %d \n" " ( (_| || | ( (_| || ( ) |( (_| | ( (_| || |_) ) /' /' | |\`\ | || \_/ \_/ || | \n" " `\__,_)(_) `\__,_)(_) (_)`\__,_) `\__,_)(_,__/'(_/' (_) (_)(_)`\___x___/'(_) \n"