Skip to content

Commit 6dc2d24

Browse files
authored
Merge pull request #651 from aregtech/feature/619-move-docs-to-wiki
Update and improve wiki docs, add conditional log
2 parents 46dd32f + 43af19a commit 6dc2d24

File tree

694 files changed

+20066
-7136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

694 files changed

+20066
-7136
lines changed

CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ###########################################################################
2-
# CMake options of AREG SDK
2+
# CMake options of Areg SDK
33
# Copyright 2022-2026 Aregtech
44
# ###########################################################################
55

@@ -17,7 +17,7 @@ include(${AREG_CMAKE_CONFIG_DIR}/setup.cmake)
1717
# set CMake tool settings
1818
set(CMAKE_BUILD_TYPE ${AREG_BUILD_TYPE} CACHE STRING "Configuration Type" FORCE)
1919

20-
# AREG SDK project name and version
20+
# Areg SDK project name and version
2121
set(AREG_PROJECT_NAME "areg-sdk")
2222
set(AREG_PROJECT_VERSION "1.9.99.111")
2323

@@ -26,7 +26,7 @@ set(PROJECT_NAME ${AREG_PROJECT_NAME})
2626
set(PROJECT_VERSION ${AREG_PROJECT_VERSION})
2727
project("${PROJECT_NAME}"
2828
VERSION "${PROJECT_VERSION}"
29-
DESCRIPTION "AREG Communication Framework and Tools"
29+
DESCRIPTION "Areg Communication Framework and Tools"
3030
HOMEPAGE_URL "https://areg.tech"
3131
LANGUAGES CXX C)
3232

@@ -46,22 +46,22 @@ add_custom_command( TARGET areg-dummy PRE_BUILD
4646
include_directories(${AREG_FRAMEWORK})
4747
include_directories(${AREG_THIRDPARTY})
4848

49-
# build AREG Framework thirdparty software
49+
# build Areg Framework thirdparty software
5050
include(${AREG_THIRDPARTY}/CMakeLists.txt)
5151
if (NOT AREG_SQLITE_FOUND)
5252
add_dependencies(aregsqlite3 areg-dummy)
5353
endif()
5454

55-
# build AREG Framework software
55+
# build Areg Framework software
5656
include(${AREG_FRAMEWORK}/CMakeLists.txt)
5757
add_dependencies(areg areg-dummy)
5858

59-
# build optional AREG project examples, if required
59+
# build optional Areg project examples, if required
6060
if(AREG_BUILD_EXAMPLES)
6161
include(${AREG_EXAMPLES}/CMakeLists.txt)
6262
endif()
6363

64-
# build optional AREG Framework unit tests, if required
64+
# build optional Areg Framework unit tests, if required
6565
if(AREG_BUILD_TESTS)
6666
include(${AREG_TESTS}/CMakeLists.txt)
6767
if (NOT AREG_GTEST_FOUND)
@@ -83,6 +83,6 @@ endif()
8383
printAregConfigStatus(
8484
TRUE
8585
"AREG"
86-
"----------------------> AREG project CMake Status Report Begin <-----------------------"
87-
"-----------------------> AREG project CMake Status Report End <------------------------"
86+
"----------------------> Areg project CMake Status Report Begin <-----------------------"
87+
"-----------------------> Areg project CMake Status Report End <------------------------"
8888
)

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CONTRIBUTING TO AREG SDK
1+
# CONTRIBUTING TO Areg SDK
22

33
Thank you for your interest in contributing to Areg SDK.
44
We welcome developers, companies, researchers, and hobbyists who want to help improve the framework.

README.md

Lines changed: 290 additions & 249 deletions
Large diffs are not rendered by default.

Releases.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Release Notes
22

33
```
4-
This document contains the release notes of AREG SDK project.
4+
This document contains the release notes of Areg SDK project.
55
Copyright © Aregtech UG, 2021-2026
66
Contact: info[at]areg.tech
77
```
@@ -15,7 +15,7 @@ Release date: 15.06.2023
1515
- Compilation with CYGWIN
1616
- Compilation with VSCode
1717
- Service Watchdog
18-
- AREG extended objects (Console)
18+
- Areg extended objects (Console)
1919
- GTest integration for unit tests
2020
- More examples
2121

@@ -30,8 +30,8 @@ Release date: 15.06.2023
3030
* Software build
3131
* Preprocessor define symbols
3232
* Compile with WSL
33-
* AREG Logging System
34-
* AREG Multitarget Router
33+
* Areg Logging System
34+
* Areg Multitarget Router
3535
* Persistence Syntax
3636

3737
### Deprecated
@@ -44,7 +44,7 @@ Release date: 15.06.2023
4444
Release date: 11.11.2021
4545

4646
### New Features
47-
- AREG interface-centric framework
47+
- Areg interface-centric framework
4848
- Build with MSVC
4949
- Build with Makefile
5050
- Build with Eclipse

areg-sdk.sln

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -732,11 +732,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wiki", "wiki", "{C33D0DF1-A
732732
docs\wiki\01b-cmake-build.md = docs\wiki\01b-cmake-build.md
733733
docs\wiki\01c-msvc-build.md = docs\wiki\01c-msvc-build.md
734734
docs\wiki\01d-wsl-build.md = docs\wiki\01d-wsl-build.md
735-
docs\wiki\02a-cmake-config.md = docs\wiki\02a-cmake-config.md
736-
docs\wiki\02b-cmake-functions.md = docs\wiki\02b-cmake-functions.md
737-
docs\wiki\02c-cmake-integrate.md = docs\wiki\02c-cmake-integrate.md
738-
docs\wiki\02d-msvc-integrate.md = docs\wiki\02d-msvc-integrate.md
739-
docs\wiki\02e-preprocessor-definitions.md = docs\wiki\02e-preprocessor-definitions.md
735+
docs\wiki\02a-quick-project-setup.md = docs\wiki\02a-quick-project-setup.md
736+
docs\wiki\02b-cmake-integrate.md = docs\wiki\02b-cmake-integrate.md
737+
docs\wiki\02c-msvc-integrate.md = docs\wiki\02c-msvc-integrate.md
738+
docs\wiki\02d-cmake-config.md = docs\wiki\02d-cmake-config.md
739+
docs\wiki\02e-cmake-functions.md = docs\wiki\02e-cmake-functions.md
740+
docs\wiki\02f-preprocessor-definitions.md = docs\wiki\02f-preprocessor-definitions.md
740741
docs\wiki\03a-mtrouter.md = docs\wiki\03a-mtrouter.md
741742
docs\wiki\04a-logging-config.md = docs\wiki\04a-logging-config.md
742743
docs\wiki\04b-logging-develop.md = docs\wiki\04b-logging-develop.md
@@ -749,8 +750,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wiki", "wiki", "{C33D0DF1-A
749750
docs\wiki\06d-setup-lusan.md = docs\wiki\06d-setup-lusan.md
750751
docs\wiki\06e-lusan-service-interface.md = docs\wiki\06e-lusan-service-interface.md
751752
docs\wiki\06f-lusan-live-logging.md = docs\wiki\06f-lusan-live-logging.md
752-
docs\wiki\07a-troubleshooting-wsl-update.md = docs\wiki\07a-troubleshooting-wsl-update.md
753753
docs\wiki\06g-lusan-offline-logging.md = docs\wiki\06g-lusan-offline-logging.md
754+
docs\wiki\07a-troubleshooting-wsl-update.md = docs\wiki\07a-troubleshooting-wsl-update.md
754755
docs\wiki\07b-troubleshooting-cmake-linux-builds.md = docs\wiki\07b-troubleshooting-cmake-linux-builds.md
755756
docs\wiki\07c-troubleshooting-integration.md = docs\wiki\07c-troubleshooting-integration.md
756757
docs\wiki\08a-examples-and-tests.md = docs\wiki\08a-examples-and-tests.md

areg.cmake

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ###########################################################################
2-
# Settings for external projects to integrate AREG framework
2+
# Settings for external projects to integrate Areg framework
33
# Copyright (c) 2022-2026 Aregtech
44
# ###########################################################################
55

@@ -10,31 +10,31 @@
1010
# Define AREG_SDK_ROOT before including this file in the project.
1111
if (NOT DEFINED AREG_SDK_ROOT OR "${AREG_SDK_ROOT}" STREQUAL "")
1212
# Make sure that AREG_SDK_ROOT is set before the 'setup.cmake' is included
13-
message(FATAL_ERROR "AREG: >>> Set \'AREG_SDK_ROOT\' before including \'setup.cmake\'. Stopping building the project.")
13+
message(FATAL_ERROR "Areg: >>> Set \'AREG_SDK_ROOT\' before including \'setup.cmake\'. Stopping building the project.")
1414
return()
1515
else()
16-
message(STATUS "AREG: >>> Specified AREG_SDK_ROOT = \'${AREG_SDK_ROOT}\'")
16+
message(STATUS "Areg: >>> Specified AREG_SDK_ROOT = \'${AREG_SDK_ROOT}\'")
1717
endif()
1818

1919
# The location of cmake configuration files.
2020
if (NOT DEFINED AREG_CMAKE_CONFIG_DIR OR "${AREG_CMAKE_CONFIG_DIR}" STREQUAL "")
2121
set(AREG_CMAKE_CONFIG_DIR "${AREG_SDK_ROOT}/conf/cmake")
2222
else()
23-
message(STATUS "AREG: >>> Specified AREG_CMAKE_CONFIG_DIR = \'${AREG_CMAKE_CONFIG_DIR}\'")
23+
message(STATUS "Areg: >>> Specified AREG_CMAKE_CONFIG_DIR = \'${AREG_CMAKE_CONFIG_DIR}\'")
2424
endif()
2525

2626
# Disable or enable areg-sdk specific outputs
2727
if (NOT DEFINED AREG_ENABLE_OUTPUTS OR "${AREG_ENABLE_OUTPUTS}" STREQUAL "")
28-
option(AREG_ENABLE_OUTPUTS "Disable AREG SDK specific outputs, use defaults" OFF)
29-
message(STATUS "AREG: >>> Disable AREG SDK specific outputs, use defaults")
28+
option(AREG_ENABLE_OUTPUTS "Disable Areg SDK specific outputs, use defaults" OFF)
29+
message(STATUS "Areg: >>> Disable Areg SDK specific outputs, use defaults")
3030
endif()
3131

3232
# Include setup.cmake to initialize variables
33-
message(STATUS "AREG: >>> Including \'${AREG_CMAKE_CONFIG_DIR}/setup.cmake\'")
33+
message(STATUS "Areg: >>> Including \'${AREG_CMAKE_CONFIG_DIR}/setup.cmake\'")
3434
include("${AREG_CMAKE_CONFIG_DIR}/setup.cmake")
3535

3636
# Include common.cmake to initialize compile options
37-
message(STATUS "AREG: >>> Including \'${AREG_CMAKE_CONFIG_DIR}/common.cmake\'")
37+
message(STATUS "Areg: >>> Including \'${AREG_CMAKE_CONFIG_DIR}/common.cmake\'")
3838
include("${AREG_CMAKE_CONFIG_DIR}/common.cmake")
3939

4040
set(AREG_RESOURCES "${AREG_FRAMEWORK}/areg/resources")

conf/cmake/clang.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright 2022-2026 Aregtech
44
# ###########################################################################
55

6-
message(STATUS "AREG: >>> Preparing settings for CLang compiler under \'${AREG_OS}\' platform, WIN32 = \'${WIN32}\'")
6+
message(STATUS "Areg: >>> Preparing settings for CLang compiler under \'${AREG_OS}\' platform, WIN32 = \'${WIN32}\'")
77

88
if (AREG_OS STREQUAL "Windows")
99

conf/cmake/common.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ if ("${AREG_COMPILER_FAMILY}" STREQUAL "")
1919

2020
macro_setup_compilers_data("${CMAKE_CXX_COMPILER}" AREG_COMPILER_FAMILY AREG_COMPILER_SHORT AREG_CXX_COMPILER AREG_C_COMPILER AREG_TARGET AREG_PROCESSOR AREG_BITNESS _compiler_found)
2121
if (_compiler_found)
22-
message(STATUS "AREG: >>> Use system default settings:")
23-
message(STATUS "AREG: ... Compiler family = '${AREG_COMPILER_FAMILY}'")
24-
message(STATUS "AREG: ... CXX compiler = '${AREG_CXX_COMPILER}'")
25-
message(STATUS "AREG: ... CC compiler = '${AREG_C_COMPILER}'")
26-
message(STATUS "AREG: ... Compiler Target = '${AREG_TARGET}'")
22+
message(STATUS "Areg: >>> Use system default settings:")
23+
message(STATUS "Areg: ... Compiler family = '${AREG_COMPILER_FAMILY}'")
24+
message(STATUS "Areg: ... CXX compiler = '${AREG_CXX_COMPILER}'")
25+
message(STATUS "Areg: ... CC compiler = '${AREG_C_COMPILER}'")
26+
message(STATUS "Areg: ... Compiler Target = '${AREG_TARGET}'")
2727
else()
28-
message(WARNING "AREG: >>> The compiler \'${${CMAKE_CXX_COMPILER}}\' is unknown, the compilation result is unpredictable")
28+
message(WARNING "Areg: >>> The compiler \'${${CMAKE_CXX_COMPILER}}\' is unknown, the compilation result is unpredictable")
2929
endif()
3030

3131
elseif("${AREG_COMPILER_SHORT}" STREQUAL "")
3232

33-
message(FATAL_ERROR "AREG: >>> The file \'${AREG_CMAKE_CONFIG_DIR}/setup.cmake\' should be included before \'common.cmake\', fix it and retry again.")
33+
message(FATAL_ERROR "Areg: >>> The file \'${AREG_CMAKE_CONFIG_DIR}/setup.cmake\' should be included before \'common.cmake\', fix it and retry again.")
3434

3535
endif()
3636

@@ -125,7 +125,7 @@ elseif (MSVC)
125125

126126
else()
127127

128-
message(WARNING "AREG: >>> Unsupported compiler type may cause unpredicted results, use default GNU compiler settings and POSIX API")
128+
message(WARNING "Areg: >>> Unsupported compiler type may cause unpredicted results, use default GNU compiler settings and POSIX API")
129129
include(${AREG_CMAKE_CONFIG_DIR}/gnu.cmake)
130130

131131
endif()
@@ -138,8 +138,8 @@ if (AREG_EXTENDED)
138138
list(APPEND AREG_EXTENDED_LIBS ncurses)
139139
set(AREG_EXTENDED_LIBS_STR "-lncurses")
140140
else()
141-
message(STATUS "AREG: >>> No suitable 'ncurses' library found for '${AREG_PROCESSOR}' processor, force to disable extended objects.")
142-
set(AREG_EXTENDED OFF CACHE INTERNAL "Disable AREG Extended objects")
141+
message(STATUS "Areg: >>> No suitable 'ncurses' library found for '${AREG_PROCESSOR}' processor, force to disable extended objects.")
142+
set(AREG_EXTENDED OFF CACHE INTERNAL "Disable Areg Extended objects")
143143
add_definitions(-DAREG_EXTENDED=0)
144144
endif()
145145
else()

0 commit comments

Comments
 (0)