Skip to content

Commit a8ac388

Browse files
c-jimenezc-jimenez
authored
Merge pull request #107 from c-jimenez/release/v1.1.0
[version] Update version number => 1.1.0
2 parents 57176a6 + f73cbd4 commit a8ac388

File tree

165 files changed

+285246
-490
lines changed

Some content is hidden

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

165 files changed

+285246
-490
lines changed

‎.clang-format‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,37 @@ AllowShortBlocksOnASingleLine: Empty
88
AllowShortIfStatementsOnASingleLine: false
99
AllowShortLoopsOnASingleLine: false
1010
AllowShortFunctionsOnASingleLine: Inline
11+
AllowShortLambdasOnASingleLine: All
1112
AlignEscapedNewlines: Left
1213
AlignOperands: true
1314
AlignTrailingComments: true
14-
AllowShortBlocksOnASingleLine: false
1515
BreakConstructorInitializers: BeforeColon
1616
ReflowComments: false
1717
AllowShortCaseLabelsOnASingleLine: false
1818
BinPackParameters: false
1919
BinPackArguments: false
2020
PointerAlignment: Left
2121
IndentCaseLabels: true
22-
BreakBeforeBraces: Allman
2322
ConstructorInitializerAllOnOneLineOrOnePerLine: true
2423
SpaceInEmptyBlock: true
2524
AlwaysBreakTemplateDeclarations: Yes
25+
BreakBeforeBraces: Custom
26+
BraceWrapping:
27+
AfterCaseLabel: true
28+
AfterClass: true
29+
AfterControlStatement: Always
30+
AfterEnum: true
31+
AfterFunction: true
32+
AfterNamespace: true
33+
AfterObjCDeclaration: true
34+
AfterStruct: true
35+
AfterUnion: true
36+
AfterExternBlock: true
37+
BeforeCatch: true
38+
BeforeElse: true
39+
BeforeLambdaBody: true
40+
BeforeWhile: false
41+
IndentBraces: false
42+
SplitEmptyFunction: true
43+
SplitEmptyRecord: true
44+
SplitEmptyNamespace: true

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
# uses a compiled language
6464

6565
- run: |
66-
make clang-native
66+
make clang
6767
6868
- name: Perform CodeQL Analysis
6969
uses: github/codeql-action/analyze@v2

‎.github/workflows/install-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
- name: Install dependencies
1717
run: sudo apt-get install -y libev-dev libuv1-dev
1818
- name: make gcc install
19-
run: make BUILD_TYPE=Release INSTALL_PREFIX=/tmp/install-gcc tests-install-gcc-native
19+
run: make BUILD_TYPE=Release INSTALL_PREFIX=/tmp/install-gcc tests-install-gcc
2020
- name: make clang install
21-
run: make BUILD_TYPE=Release INSTALL_PREFIX=/tmp/install-clang tests-install-clang-native
21+
run: make BUILD_TYPE=Release INSTALL_PREFIX=/tmp/install-clang tests-install-clang

‎.github/workflows/unit-test-debug.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: make gcc Debug
17-
run: make gcc-native BUILD_TYPE=Debug
17+
run: make gcc BUILD_TYPE=Debug
1818
- name: unit tests gcc Debug
19-
run: make tests-gcc-native BUILD_TYPE=Debug
19+
run: make tests-gcc BUILD_TYPE=Debug
2020
- name: make clang Debug
21-
run: make clang-native BUILD_TYPE=Debug
21+
run: make clang BUILD_TYPE=Debug
2222
- name: unit tests clang
23-
run: make tests-clang-native BUILD_TYPE=Debug
23+
run: make tests-clang BUILD_TYPE=Debug

‎.github/workflows/unit-test-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616
- name: make gcc Release
17-
run: make gcc-native BUILD_TYPE=Release
17+
run: make gcc BUILD_TYPE=Release
1818
- name: unit tests gcc Release
19-
run: make tests-gcc-native BUILD_TYPE=Release
19+
run: make tests-gcc BUILD_TYPE=Release
2020
- name: make clang Release
21-
run: make clang-native BUILD_TYPE=Release
21+
run: make clang BUILD_TYPE=Release
2222
- name: unit tests clang
23-
run: make tests-clang-native BUILD_TYPE=Release
23+
run: make tests-clang BUILD_TYPE=Release

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ build
22
build_*
33
bin/*
44
.vscode/settings.json
5+
.vs

‎.vscode/launch.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@
2222
"arguments": "-r",
2323
"valuesFormatting": "parseText"
2424
},
25+
{
26+
"type": "gdb",
27+
"request": "launch",
28+
"name": "x86 LC debug",
29+
"target": "${workspaceRoot}/bin/gcc_native/quick_start_localcontroller",
30+
"cwd": "${workspaceRoot}/bin/gcc_native/",
31+
"arguments": "-r",
32+
"valuesFormatting": "parseText"
33+
},
2534
{
2635
"type": "gdb",
2736
"request": "launch",

‎.vscode/tasks.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"version": "2.0.0",
55
"tasks": [
66
{
7-
"label": "build GCC native",
7+
"label": "build GCC",
88
"type": "shell",
99
"command": "make",
1010
"args": [
11-
"gcc-native",
11+
"gcc",
1212
"BUILD_TYPE=Debug"
1313
],
1414
"problemMatcher": "$gcc",
@@ -18,20 +18,20 @@
1818
}
1919
},
2020
{
21-
"label": "tests GCC native",
21+
"label": "tests GCC",
2222
"type": "shell",
2323
"command": "make",
2424
"args": [
25-
"tests-gcc-native"
25+
"tests-gcc"
2626
],
2727
"group": "build"
2828
},
2929
{
30-
"label": "clean GCC native",
30+
"label": "clean GCC",
3131
"type": "shell",
3232
"command": "make",
3333
"args": [
34-
"clean-gcc-native",
34+
"clean-gcc",
3535
"BUILD_TYPE=Debug"
3636
],
3737
"group": "build"

‎3rdparty/CMakeLists.txt‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,21 @@ target_include_directories(rapidjson INTERFACE rapidjson/include)
1111
add_library(doctest INTERFACE)
1212
target_include_directories(doctest INTERFACE doctest/doctest)
1313

14+
# SQLite 3
15+
add_subdirectory(sqlite3)
16+
1417
# Use default flags for the libwebsockets library
15-
set(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -ggdb3")
16-
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -ggdb3")
17-
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
18-
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
18+
if (NOT MSVC)
19+
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT} -O0 -g3 -ggdb3")
20+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT} -O0 -g3 -ggdb3")
21+
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_INIT} -O2 -DNDEBUG")
22+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT} -O2 -DNDEBUG")
23+
else()
24+
set(DISABLED_WARNING_LWS "/WX- /wd4191 /wd4996")
25+
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT} ${DISABLED_WARNING_LWS}")
26+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT} ${DISABLED_WARNING_LWS}")
27+
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_INIT} ${DISABLED_WARNING_LWS}")
28+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT} ${DISABLED_WARNING_LWS}")
29+
endif()
1930

2031
add_subdirectory(libwebsockets)

‎3rdparty/libwebsockets/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,8 +849,6 @@ endif()
849849
if (MSVC)
850850
# Turn off pointless microsoft security warnings.
851851
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
852-
# Fail the build if any warnings
853-
add_compile_options(/W3 /WX)
854852
# Unbreak MSVC broken preprocessor __VA_ARGS__ behaviour
855853
if (MSVC_VERSION GREATER 1925)
856854
add_compile_options(/Zc:preprocessor /wd5105)

0 commit comments

Comments
 (0)