Skip to content

Commit bd33be0

Browse files
sea5kgsea5kg
committed
Up version to v0.2.4
1 parent 1829e97 commit bd33be0

File tree

4 files changed

+91
-47
lines changed

4 files changed

+91
-47
lines changed

‎build_simple.sh‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,36 @@
11
#!/bin/bash
22

3-
if [ ! -d tmp ]; then
4-
mkdir -p tmp
5-
fi
3+
check_ret() {
4+
if [ $1 -ne 0 ]; then
5+
echo ""
6+
echo "!!! FAIL: $2"
7+
echo "********************************************************************************"
8+
echo ""
9+
exit $1
10+
else
11+
echo ""
12+
echo "*** SUCCESS: $2"
13+
echo "********************************************************************************"
14+
echo ""
15+
fi
16+
}
617

7-
cd tmp
8-
cmake ..
9-
make
18+
# if [ ! -d tmp ]; then
19+
# mkdir -p tmp
20+
# fi
21+
22+
cmake -H. -Btmp/release -DCMAKE_BUILD_TYPE=Release
23+
check_ret $? "configure"
24+
25+
cmake --build tmp/release --config Release
26+
check_ret $? "make"
27+
28+
cd unit-tests.wsjcpp
29+
30+
cmake -H. -Btmp/release -DCMAKE_BUILD_TYPE=Release
31+
check_ret $? "configure"
32+
33+
cmake --build tmp/release --config Release
34+
check_ret $? "make"
35+
36+
./run_unit-tests.sh

‎unit-tests.wsjcpp/CMakeLists.txt‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Automaticly generated by wsjcpp@v0.2.2
1+
# Automaticly generated by wsjcpp@v0.2.7
22
cmake_minimum_required(VERSION 3.0)
33

44
project(unit-tests C CXX)
5-
add_definitions(-DWSJCPP_APP_VERSION="ut-v0.2.3")
5+
add_definitions(-DWSJCPP_APP_VERSION="ut-v0.2.4")
66
add_definitions(-DWSJCPP_APP_NAME="unit-tests-wsjcpp-core")
77

88
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -19,41 +19,41 @@ set (WSJCPP_SOURCES "")
1919
find_package(Threads REQUIRED)
2020
list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
2121

22-
# wsjcpp-core:v0.2.3
23-
list (APPEND WSJCPP_INCLUDE_DIRS "../src")
24-
list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.cpp")
25-
list (APPEND WSJCPP_SOURCES "../src/wsjcpp_core.h")
26-
list (APPEND WSJCPP_SOURCES "../src/wsjcpp_unit_tests.cpp")
27-
list (APPEND WSJCPP_SOURCES "../src/wsjcpp_unit_tests.h")
28-
list (APPEND WSJCPP_SOURCES "../src/wsjcpp_unit_tests_main.cpp")
22+
# wsjcpp-core:v0.2.4
23+
list (APPEND WSJCPP_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/../src")
24+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../src/wsjcpp_core.cpp")
25+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../src/wsjcpp_core.h")
26+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../src/wsjcpp_unit_tests.cpp")
27+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../src/wsjcpp_unit_tests.h")
28+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../src/wsjcpp_unit_tests_main.cpp")
2929

3030
# unit-tests
3131
list (APPEND WSJCPP_INCLUDE_DIRS "src")
32-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_normalize_path.cpp")
33-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_extract_filename.cpp")
34-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_to_upper.cpp")
35-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_uuid.cpp")
36-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_get_env.cpp")
37-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_to_lower.cpp")
38-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_replace_all.cpp")
39-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_decode_uri_component.cpp")
40-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_encode_uri_component.cpp")
41-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_uint2_hex_string.cpp")
42-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_split.cpp")
43-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_empty_file.cpp")
44-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.cpp")
45-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_join.cpp")
46-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.cpp")
47-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_test_resources.cpp")
48-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_list_of_dirs.cpp")
49-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_file_permissions.cpp")
50-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_string_padding.cpp")
51-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_date_time_format.cpp")
52-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_make_dirs_path.cpp")
53-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_extract_dirpath.cpp")
54-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_extract_filepath.cpp")
55-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_starts_with.cpp")
56-
list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_ends_with.cpp")
32+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_core_normalize_path.cpp")
33+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_core_extract_filename.cpp")
34+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_to_upper.cpp")
35+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_create_uuid.cpp")
36+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_get_env.cpp")
37+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_to_lower.cpp")
38+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_replace_all.cpp")
39+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_decode_uri_component.cpp")
40+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_encode_uri_component.cpp")
41+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_uint2_hex_string.cpp")
42+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_split.cpp")
43+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_create_empty_file.cpp")
44+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_read_file_to_buffer.cpp")
45+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_join.cpp")
46+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_get_human_size_bytes.cpp")
47+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_test_resources.cpp")
48+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_list_of_dirs.cpp")
49+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_file_permissions.cpp")
50+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_string_padding.cpp")
51+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_date_time_format.cpp")
52+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_make_dirs_path.cpp")
53+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_extract_dirpath.cpp")
54+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_extract_filepath.cpp")
55+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_starts_with.cpp")
56+
list (APPEND WSJCPP_SOURCES "${CMAKE_SOURCE_DIR}/../unit-tests.wsjcpp/src/unit_test_ends_with.cpp")
5757

5858
include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
5959

‎unit-tests.wsjcpp/build_simple.sh‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
#!/bin/bash
22

3-
if [ ! -d tmp ]; then
4-
mkdir -p tmp
5-
fi
3+
check_ret() {
4+
if [ $1 -ne 0 ]; then
5+
echo ""
6+
echo "!!! FAIL: $2"
7+
echo "********************************************************************************"
8+
echo ""
9+
exit $1
10+
else
11+
echo ""
12+
echo "*** SUCCESS: $2"
13+
echo "********************************************************************************"
14+
echo ""
15+
fi
16+
}
617

7-
cd tmp
8-
cmake ..
9-
make
18+
# if [ ! -d tmp ]; then
19+
# mkdir -p tmp
20+
# fi
21+
22+
cmake -H. -Btmp/release -DCMAKE_BUILD_TYPE=Release
23+
check_ret $? "configure"
24+
25+
cmake --build tmp/release --config Release
26+
check_ret $? "make"
1027

‎wsjcpp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_cxx_standard: 17
33
cmake_minimum_required: 3.0
44

55
name: wsjcpp-core
6-
version: v0.2.3
6+
version: v0.2.4
77
description: Basic Utils for wsjcpp
88
issues: https://github.com/wsjcpp/wsjcpp-core/issues
99
repositories:

0 commit comments

Comments
 (0)