Updated project tree

Author: Sandro Kalatozishvili

.github/workflows/script.yml

@@ -31,19 +31,29 @@ jobs:
       run: cd smake && ./build.sh --install
 
     - name: Build with SMAKE (SSL)
-      run: ./build.sh smake
+      run: |
+        ./build.sh --tool=smake --tools --examples
+        ./build/xutils
 
     - name: Build with SMAKE (no SSL)
-      run: ./build.sh smake --ssl=no
+      run: ./build.sh --tool=smake --tools --examples --ssl=no
 
     - name: Build with CMAKE (SSL)
-      run: ./build.sh cmake
+      run: |
+        ./build.sh --tool=cmake --tools --examples
+        ./build/xutils
       
     - name: Build with CMAKE (no SSL)
-      run: ./build.sh cmake --ssl=no
+      run: |
+        ./build.sh --tool=cmake --tools --examples --ssl=no
+        ./build/xutils
       
     - name: Build with Makefile (SSL)
-      run: ./build.sh make
+      run: |
+        ./build.sh --tool=make --tools --examples
+        ./build/xutils
 
     - name: Build with Makefile (no SSL)
-      run: ./build.sh make --ssl=no
+      run: |
+        ./build.sh --tool=make --tools --examples --ssl=no
+        ./build/xutils

.vscode/settings.json

@@ -48,6 +48,7 @@
         "tuple": "c",
         "type_traits": "c",
         "utility": "c",
-        "xcli.h": "c"
+        "xcli.h": "c",
+        "xlog.h": "c"
     }
 }

CMakeLists.txt

@@ -7,6 +7,15 @@ ELSE()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall")
 ENDIF()
 
+set(XUTILS_INSTALL_PREFIX "/usr/local")
+string(SUBSTRING "${XUTILS_INSTALL_PREFIX}" 0 2 PREFIX_START)
+
+if("${PREFIX_START}" STREQUAL "./")
+  get_filename_component(CURRENT_WORKING_DIR "${CMAKE_SOURCE_DIR}" REALPATH)
+  string(SUBSTRING "${XUTILS_INSTALL_PREFIX}" 1 -1 RELATIVE_PATH)
+  set(CMAKE_INSTALL_PREFIX "${CURRENT_WORKING_DIR}${RELATIVE_PATH}")
+endif()
+
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
@@ -31,43 +40,43 @@ include_directories(
 )
 
 add_library(xutils STATIC
-    ${SOURCE_DIR}/xver.c
-    ${DATA_DIR}/array.c
-    ${DATA_DIR}/xjson.c
-    ${DATA_DIR}/xbuf.c
-    ${DATA_DIR}/hash.c
-    ${DATA_DIR}/list.c
-    ${DATA_DIR}/xstr.c
-    ${DATA_DIR}/map.c
-    ${DATA_DIR}/jwt.c
-    ${CRYPT_DIR}/crypt.c
-    ${CRYPT_DIR}/aes.c
-    ${CRYPT_DIR}/base64.c
-    ${CRYPT_DIR}/sha256.c
-    ${CRYPT_DIR}/sha1.c
-    ${CRYPT_DIR}/crc32.c
-    ${CRYPT_DIR}/hmac.c
-    ${CRYPT_DIR}/md5.c
-    ${CRYPT_DIR}/rsa.c
-    ${NET_DIR}/event.c
-    ${NET_DIR}/addr.c
-    ${NET_DIR}/http.c
-    ${NET_DIR}/mdtp.c
-    ${NET_DIR}/sock.c
-    ${NET_DIR}/api.c
-    ${NET_DIR}/ntp.c
-    ${NET_DIR}/rtp.c
-    ${NET_DIR}/ws.c
-    ${SYS_DIR}/thread.c
-    ${SYS_DIR}/xtype.c
-    ${SYS_DIR}/xtime.c
-    ${SYS_DIR}/sync.c
-    ${SYS_DIR}/xsig.c
-    ${SYS_DIR}/xcli.c
-    ${SYS_DIR}/xcpu.c
-    ${SYS_DIR}/xlog.c
-    ${SYS_DIR}/xtop.c
-    ${SYS_DIR}/xfs.c
+    ./src/xver.c
+    ./src/crypt/aes.c
+    ./src/crypt/base64.c
+    ./src/crypt/crc32.c
+    ./src/crypt/crypt.c
+    ./src/crypt/hmac.c
+    ./src/crypt/md5.c
+    ./src/crypt/rsa.c
+    ./src/crypt/sha256.c
+    ./src/crypt/sha1.c
+    ./src/data/array.c
+    ./src/data/hash.c
+    ./src/data/jwt.c
+    ./src/data/list.c
+    ./src/data/map.c
+    ./src/data/xbuf.c
+    ./src/data/xjson.c
+    ./src/data/xstr.c
+    ./src/net/addr.c
+    ./src/net/event.c
+    ./src/net/http.c
+    ./src/net/mdtp.c
+    ./src/net/ntp.c
+    ./src/net/rtp.c
+    ./src/net/sock.c
+    ./src/net/api.c
+    ./src/net/ws.c
+    ./src/sys/sync.c
+    ./src/sys/thread.c
+    ./src/sys/xcli.c
+    ./src/sys/xcpu.c
+    ./src/sys/xfs.c
+    ./src/sys/xlog.c
+    ./src/sys/xsig.c
+    ./src/sys/xtime.c
+    ./src/sys/xtop.c
+    ./src/sys/xtype.c
 )
 
 install(TARGETS xutils DESTINATION lib)

README.md

@@ -159,8 +159,8 @@ 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.\
-The examples can be built by using the `CMake` tool or `Makefile` from that directory.
+The project includes samples and apps in the `examples` and `tools` directory.\
+These sources can be built by using the `CMake` tool or `Makefile` from that directory.
 
 ```bash
 cd examples
@@ -173,12 +173,12 @@ make
 #### XTOP and more
 
 <p align="center">
-    <img src="https://raw.githubusercontent.com/kala13x/libxutils/main/examples/xtop.png" alt="alternate text">
+    <img src="https://raw.githubusercontent.com/kala13x/libxutils/main/misc/xtop.png" alt="alternate text">
 </p>
 
 `XTOP` is `HTOP` like performance monitor that supports to monitor CPU, memory, and network traffic into a single window. In addition, it has powerful `REST API` client/server mode and much more.
 
-After building the sources in example directory, run `sudo make install` command to install following tools in the system:
+After building the sources in `tools` directory, run `sudo make install` command to install following apps in the system:
 
 - `xcrypt` - File and text encrypt/decrypt tool for CLI
 - `xpass` - Secure password manager tool for CLI

build.sh

@@ -3,13 +3,14 @@
 # 2015-2023  Sun Dro (s.kalatoz@gmail.com)
 
 PROJ_PATH=$(dirname $(readlink -f "$0"))
-TOOL_PATH=$PROJ_PATH/examples
+TOOL_PATH=$PROJ_PATH/tools
 LIB_PATH=$PROJ_PATH
 
 INSTALL_PREFIX="/usr/local"
 MAKE_TOOL="make"
 USE_SSL="yes"
 
+EXAMPLES_DONE=0
 TOOLS_DONE=0
 CPU_COUNT=1
 
@@ -72,6 +73,7 @@ clean_dir() {
 
 clean_project() {
     clean_dir $PROJ_PATH/examples
+    clean_dir $PROJ_PATH/tools
     clean_dir $PROJ_PATH
 }
 
@@ -83,18 +85,31 @@ update_cpu_count() {
 
 build_tools() {
     [ "$TOOLS_DONE" -eq 1 ] && return
-    cd $PROJ_PATH/examples
+    cd $PROJ_PATH/tools
 
     if [[ $MAKE_TOOL == "cmake" ]]; then
         mkdir -p build && cd build && cmake ..
-        TOOL_PATH=$PROJ_PATH/examples/build
+        TOOL_PATH=$PROJ_PATH/tools/build
     fi
 
     make -j $CPU_COUNT
     cd $PROJ_PATH
     TOOLS_DONE=1
 }
 
+build_examples() {
+    [ "$EXAMPLES_DONE" -eq 1 ] && return
+    cd $PROJ_PATH/examples
+
+    if [[ $MAKE_TOOL == "cmake" ]]; then
+        mkdir -p build && cd build && cmake ..
+    fi
+
+    make -j $CPU_COUNT
+    cd $PROJ_PATH
+    EXAMPLES_DONE=1
+}
+
 build_library() {
     cd $PROJ_PATH/misc
     ./generate.sh $MAKE_TOOL --prefix=$INSTALL_PREFIX --ssl=$USE_SSL
@@ -157,6 +172,10 @@ build_library
 
 for arg in "$@"; do
     if [[ $arg == "--examples" ]]; then
+        build_examples
+    fi
+
+    if [[ $arg == "--tools" ]]; then
         build_tools
     fi
 

clean.sh

@@ -14,4 +14,5 @@ clean_path() {
 }
 
 clean_path $PROJ_PATH
+clean_path $PROJ_PATH/tools
 clean_path $PROJ_PATH/examples

examples/CMakeLists.txt

@@ -6,6 +6,15 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall")
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 set(THREADS_PREFER_PTHREAD_FLAG TRUE)
 
+set(XUTILS_INCLUDE_DIRS
+  ../src/crypt 
+  ../src/data
+  ../src/net
+  ../src/sys
+  ../src
+)
+
+include_directories(${XUTILS_INCLUDE_DIRS})
 find_package(Threads REQUIRED)
 list(APPEND EXTRA_LIBS xutils)
 
@@ -23,20 +32,13 @@ set(SOURCE_FILES
     tcp-server.c
     ws-server.c
     ws-client.c
-    events.c
-    files.c
-    thread.c
     statcov.c
     strings.c
+    thread.c
+    events.c
+    files.c
     json.c
-    xtop.c
     xlog.c
-    xcrypt.c
-    xutils.c
-    xpass.c
-    xhttp.c
-    xjson.c
-    xsrc.c
     list.c
     ntp.c
     jwt.c
@@ -48,7 +50,3 @@ foreach(sourcefile ${SOURCE_FILES})
     target_link_libraries(${execname} Threads::Threads ${EXTRA_LIBS})
 endforeach()
 
-# install targets
-install(TARGETS xcrypt xutils xpass xjson xhttp xtop xsrc 
-        RUNTIME DESTINATION /usr/local/bin)
-

examples/Makefile

@@ -1,30 +1,34 @@
+####################################
+# Automatically generated by SMake #
+# https://github.com/kala13x/smake #
+####################################
 
 CFLAGS = -g -O2 -Wall
-LIBS = -lxutils -lpthread
+LIBS = -lpthread
+LD_LIBS = ../build/libxutils.a
 
 ifeq ($(XUTILS_USE_SSL),y)
 CFLAGS += -D_XUTILS_USE_SSL
 LIBS += -lssl -lcrypto
 endif
 
+CFLAGS += -I../src \
+	-I../src/crypt \
+	-I../src/data \
+	-I../src/net \
+	-I../src/sys
+
 EXECS = array \
 	http-server \
 	tcp-server \
 	ws-server \
 	ws-client \
-	events \
-	files \
-	thread \
 	statcov \
 	strings \
+	events \
+	thread \
+	files \
 	json \
-	xutils \
-	xcrypt \
-	xhttp \
-	xjson \
-	xpass \
-	xsrc \
-	xtop \
 	xlog \
 	list \
 	ntp \
@@ -34,17 +38,7 @@ EXECS = array \
 all: $(EXECS)
 
 $(EXECS): %: %.c
-	$(CC) $(CFLAGS) -o $@ $< $(LIBS)
-
-.PHONY: install
-install:
-	install -m 0755 xcrypt /usr/local/bin/
-	install -m 0755 xutils /usr/local/bin/
-	install -m 0755 xpass /usr/local/bin/
-	install -m 0755 xjson /usr/local/bin/
-	install -m 0755 xhttp /usr/local/bin/
-	install -m 0755 xtop /usr/local/bin/
-	install -m 0755 xsrc /usr/local/bin/
+	$(CC) $(CFLAGS) -o $@ $< $(LD_LIBS) $(LIBS)
 
 .PHONY: clean
 clean:

examples/array.c

@@ -6,8 +6,8 @@
  * Test example source of working with arrays
  */
 
-#include <xutils/xstd.h>
-#include <xutils/array.h>
+#include "xstd.h"
+#include "array.h" 
 
 typedef struct {
     int key;