Updated build script and changed email in headers

Author: Sun Dro

LICENSE

@@ -1,7 +1,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 2015-2021  Sun Dro <f4tb0y@protonmail.com>
+Copyright (c) 2015-2021  Sun Dro <s.kalatoz@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -78,9 +78,19 @@ smake && make
 sudo make install
 ```
 
+#### Using build script
+A relatively simple way to build and install a project is to use a build script.
+
+```bash
+git clone https://github.com/kala13x/libxutils.git
+cd libxutils
+./build.sh cmake --install --cleanup
+```
+
+You can either choose `cmake` or `smake` as the first argument, but `cmake` is recommended on platforms other than the Linux.
+
 #### Using Makefile
-If you do not have any of the above tools installed on your operating system,\
-then you can try the build by using already generated `Makefile` for linux.
+If you do not have any of the above tools installed on your operating system, then you can try the build by using already generated `Makefile` for linux.
 
 ```bash
 git clone https://github.com/kala13x/libxutils.git
@@ -147,10 +157,13 @@ use `-lxutils` linker flag while compiling your project. See the example directo
 ### Tools & Examples
 
 The project includes several examples and tools in the `examples` directory.\
-Currently, the examples can be built only by using `Makefile` from that directory.
+The examples can be built by using the `CMake` tool or `Makefile` from that directory.
 
 ```bash
 cd examples
+mkdir build
+cd build
+cmake ..
 make
 ```
 

build.sh

@@ -1,69 +1,115 @@
 #!/bin/bash
-./clean.sh
+# This source is part of "libxutils" project
+# 2015-2023  Sun Dro (s.kalatoz@gmail.com)
 
+PROJ_PATH=$(dirname $(readlink -f "$0"))
+TOOL_PATH=$PROJ_PATH/examples
+LIB_PATH=$PROJ_PATH
+
+TOOLS_DONE=0
 MAKE_TOOL=0
 CPU_COUNT=1
 
 if [ ! -z "$1" ]; then
     MAKE_TOOL=$1
 fi
 
-# Check argument
 if [ $MAKE_TOOL == 0 ]; then
     echo "Specify build tool (cmake / smake)"
     echo "example: $0 smake"
     exit 1
 fi
 
-# Detect CPU count
-if [ $OSTYPE == linux-gnu ]; then
-    CPU_COUNT=$(nproc)
-fi
-
 # List of possible OpenSSL library locations
-LIB_CRYPTO_PATHS=(
-    "/lib/libcrypto.so"
-    "/lib64/libcrypto.so"
-    "/usr/lib/libcrypto.so"
-    "/usr/lib64/libcrypto.so"
-    "/usr/local/lib/libcrypto.so"
-    "/usr/local/lib64/libcrypto.so"
-    "/usr/local/ssl/lib/libcrypto.so"
-    "/usr/local/ssl/lib64/libcrypto.so"
-)
-
-LIB_SSL_PATHS=(
-    "/lib/libssl.so"
-    "/lib64/libssl.so"
-    "/usr/lib/libssl.so"
-    "/usr/lib64/libssl.so"
-    "/usr/local/lib/libssl.so"
-    "/usr/local/lib64/libssl.so"
-    "/usr/local/ssl/lib/libssl.so"
-    "/usr/local/ssl/lib64/libssl.so"
+SSL_LD_PATH=(
+    "/lib"
+    "/lib64"
+    "/usr/lib"
+    "/usr/lib64"
+    "/usr/local/lib"
+    "/usr/local/lib64"
+    "/usr/local/ssl/lib"
+    "/usr/local/ssl/lib64"
 )
 
-# Default values
-LIB_CRYPTO=""
-LIB_SSL=""
-
-# Function to find the library file from a list of possible locations
 find_lib() {
-    local paths=("$@")
-    for path in "${paths[@]}"; do
-        if [ -f "$path" ]; then
+    for directory in "${SSL_LD_PATH[@]}"; do
+        path=$(find "$directory" -name "$@")
+
+        if [ -n "$path" ]; then
             echo "$path"
             return
         fi
+
     done
     echo ""
 }
 
-# Detect the operating system
-echo "Checking OpenSSL libraries."
+clean_dir() {
+    cd "$@" 
+    [ -f ./Makefile ] && make clean
+    [ -d ./obj ] && rm -rf ./obj
+    [ -d ./build ] && rm -rf ./build
+    [ -d ./CMakeFiles ] && rm -rf ./CMakeFiles
+    [ -f ./CMakeCache.txt ] && rm -rf ./CMakeCache.txt
+    [ -f ./cmake_install.cmake ] && rm -rf ./cmake_install.cmake
+    [ -f ./install_manifest.txt ] && rm -rf ./install_manifest.txt
+    cd $PROJ_PATH
+}
+
+clean_project() {
+    clean_dir $PROJ_PATH/examples
+    clean_dir $PROJ_PATH
+}
+
+update_cpu_count() {
+    if [ $OSTYPE == linux-gnu ]; then
+        CPU_COUNT=$(nproc)
+    fi
+}
+
+build_tools() {
+    [ "$TOOLS_DONE" -eq 1 ] && return
+    cd $PROJ_PATH/examples
+
+    if [[ $MAKE_TOOL == "cmake" ]]; then
+        mkdir -p build && cd build && cmake ..
+        TOOL_PATH=$PROJ_PATH/examples/build
+    fi
 
-LIB_CRYPTO=$(find_lib "${LIB_CRYPTO_PATHS[@]}")
-LIB_SSL=$(find_lib "${LIB_SSL_PATHS[@]}")
+    make -j $CPU_COUNT
+    cd $PROJ_PATH
+    TOOLS_DONE=1
+}
+
+build_library() {
+    cd $PROJ_PATH
+
+    if [[ $MAKE_TOOL == "cmake" ]]; then
+        mkdir -p build && cd build && cmake ..
+        LIB_PATH=$PROJ_PATH/build
+    fi
+
+    make -j $CPU_COUNT
+    cd $PROJ_PATH
+}
+
+install_tools() {
+    build_tools
+    cd $TOOL_PATH
+    sudo make install
+    cd $PROJ_PATH
+}
+
+install_library() {
+    cd $LIB_PATH
+    sudo make install
+    cd $PROJ_PATH
+}
+
+echo "Checking OpenSSL libraries."
+LIB_CRYPTO=$(find_lib "libcrypto.so")
+LIB_SSL=$(find_lib "libssl.so")
 
 # If the OpenSSL libraries are found, set the environment variable
 if [ -n "$LIB_CRYPTO" ] && [ -n "$LIB_SSL" ]; then
@@ -75,20 +121,24 @@ else
     echo 'OpenSSL libraries not found!'
 fi
 
-# Generate Makefile and build library
-$MAKE_TOOL . && make -j $CPU_COUNT
-
-if [ ! -z "$2" ]; then
-    if [ $2 == "--examples" ]; then
-        cd examples
-        make -j $CPU_COUNT
-        cd ..
-    elif [ $2 == "--install" ]; then
-        sudo make install
-        cd examples
-        make -j $CPU_COUNT
-        sudo make install
+# Build the library
+update_cpu_count
+clean_project
+build_library
+
+for arg in "$@"; do
+    if [[ $arg == "--examples" ]]; then
+        build_tools
     fi
-fi
+
+    if [[ $arg == "--install" ]]; then
+        install_library
+        install_tools
+    fi
+
+    if [[ $arg == "--cleanup" ]]; then
+        clean_project
+    fi
+done
 
 exit 0

clean.sh

@@ -1,33 +1,17 @@
 #!/bin/bash
-
-cd examples
-make clean
-cd ..
-
-if [ -f ./Makefile ]; then
-    make clean
-fi
-
-if [ -d ./obj ]; then
-    rm -rf ./obj
-fi
-
-if [ -d ./build ]; then
-    rm -rf ./build
-fi
-
-if [ -d ./CMakeFiles ]; then
-    rm -rf ./CMakeFiles
-fi
-
-if [ -f ./CMakeCache.txt ]; then
-    rm -f ./CMakeCache.txt
-fi
-
-if [ -f ./cmake_install.cmake ]; then
-    rm -f ./cmake_install.cmake
-fi
-
-if [ -f ./install_manifest.txt ]; then
-    rm -f ./install_manifest.txt
-fi
+PROJ_PATH=$(dirname $(readlink -f "$0"))
+
+clean_path() {
+    cd "$@" 
+    [ -f ./Makefile ] && make clean
+    [ -d ./obj ] && rm -rf ./obj
+    [ -d ./build ] && rm -rf ./build
+    [ -d ./CMakeFiles ] && rm -rf ./CMakeFiles
+    [ -f ./CMakeCache.txt ] && rm -rf ./CMakeCache.txt
+    [ -f ./cmake_install.cmake ] && rm -rf ./cmake_install.cmake
+    [ -f ./install_manifest.txt ] && rm -rf ./install_manifest.txt
+    cd $PROJ_PATH
+}
+
+clean_path $PROJ_PATH
+clean_path $PROJ_PATH/examples

examples/CMakeLists.txt

@@ -0,0 +1,53 @@
+cmake_minimum_required(VERSION 3.10)
+project(xutils)
+
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall")
+set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+
+find_package(Threads REQUIRED)
+list(APPEND EXTRA_LIBS xutils)
+
+# if OpenSSL is found, add the definitions and libraries
+find_package(OpenSSL)
+if(OpenSSL_FOUND)
+  add_definitions(-D_XUTILS_USE_SSL)
+  list(APPEND EXTRA_LIBS ${OPENSSL_LIBRARIES})
+endif()
+
+# replace with your actual source files
+set(SOURCE_FILES 
+    array.c
+    http-server.c
+    tcp-server.c
+    ws-server.c
+    ws-client.c
+    events.c
+    files.c
+    thread.c
+    statcov.c
+    strings.c
+    json.c
+    xtop.c
+    xlog.c
+    xcrypt.c
+    xpass.c
+    xhttp.c
+    xjson.c
+    xsrc.c
+    list.c
+    ntp.c
+    jwt.c
+    rsa.c)
+
+foreach(sourcefile ${SOURCE_FILES})
+    string(REPLACE ".c" "" execname ${sourcefile})
+    add_executable(${execname} ${sourcefile})
+    target_link_libraries(${execname} Threads::Threads ${EXTRA_LIBS})
+endforeach()
+
+# install targets
+install(TARGETS xcrypt xpass xjson xhttp xtop xsrc 
+        RUNTIME DESTINATION /usr/local/bin)
+

examples/events.c

@@ -2,7 +2,7 @@
  *  @file libxutils/examples/events.c
  *
  *  This source is part of "libxutils" project
- *  2015-2020  Sun Dro (f4tb0y@protonmail.com)
+ *  2015-2020  Sun Dro (s.kalatoz@gmail.com)
  *
  * @brief Implementation of high performance event based non-blocking HTTP server.
  * The xUtils library will use poll() or epoll() depending on the operating system.

examples/http-server.c

@@ -2,7 +2,7 @@
  *  @file libxutils/examples/http-server.c
  *
  *  This source is part of "libxutils" project
- *  2015-2020  Sun Dro (f4tb0y@protonmail.com)
+ *  2015-2020  Sun Dro (s.kalatoz@gmail.com)
  *
  * @brief Implementation of high performance event based non-blocking HTTP/S server.
  * The library will use poll(), epoll() or WSAPoll() depending on the operating system.

examples/jwt.c

@@ -2,7 +2,7 @@
  *  @file libxutils/examples/jwt.c
  * 
  *  This source is part of "libxutils" project
- *  2015-2023  Sun Dro (f4tb0y@protonmail.com)
+ *  2015-2023  Sun Dro (s.kalatoz@gmail.com)
  *
  * @brief Example file of working with JSON Web Tokens
  */

examples/rsa.c

@@ -2,7 +2,7 @@
  *  @file libxutils/examples/rsa.c
  * 
  *  This source is part of "libxutils" project
- *  2015-2023  Sun Dro (f4tb0y@protonmail.com)
+ *  2015-2023  Sun Dro (s.kalatoz@gmail.com)
  *
  * @brief Example file of working with RSA
  */

examples/statcov.c

@@ -1,7 +1,7 @@
 /*!
  *  @file libxutils/examples/statcov.c
  * 
- *  2020-2021  Sun Dro (f4tb0y@protonmail.com)
+ *  2020-2021  Sun Dro (s.kalatoz@gmail.com)
  *
  * @brief Parse and print COVID-19 case 
  * statistics from https://stopcov.ge/

examples/ws-client.c

@@ -2,7 +2,7 @@
  *  @file libxutils/examples/ws-client.c
  *
  *  This source is part of "libxutils" project
- *  2015-2023  Sun Dro (f4tb0y@protonmail.com)
+ *  2015-2023  Sun Dro (s.kalatoz@gmail.com)
  *
  * @brief Implementation of high performance event based non-blocking WebSocket/TLS client.
  * The library will use poll(), WSAPoll(), or epoll() depending on the operating system.