Skip to content

Commit 8087d61

Browse files
MaJerleMaJerle
committed
Merge branch 'develop'
2 parents 5d80638 + e3ac713 commit 8087d61

File tree

20 files changed

+235
-42
lines changed

20 files changed

+235
-42
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
tag_name: ${{ github.ref }}
2323
release_name: Release ${{ github.ref }}
2424
body: |
25-
See the CHANGELOG.md
25+
See the [CHANGELOG](CHANGELOG.md)
2626
draft: false
2727
prerelease: false

‎.gitignore‎

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,29 @@
2424
*.i
2525
*.txt
2626
!docs/*.txt
27+
!CMakeLists.txt
2728
RTE/
2829

29-
# IAR Settings
30-
**/settings/*.crun
31-
**/settings/*.dbgdt
32-
**/settings/*.cspy
33-
**/settings/*.cspy.*
34-
**/settings/*.xcl
35-
**/settings/*.dni
36-
**/settings/*.wsdt
37-
**/settings/*.wspos
38-
39-
# IAR Debug Exe
40-
**/Exe/*.sim
41-
42-
# IAR Debug Obj
43-
**/Obj/*.pbd
44-
**/Obj/*.pbd.*
45-
**/Obj/*.pbi
46-
**/Obj/*.pbi.*
30+
*debug
31+
32+
# IAR Settings
33+
**/settings/*.crun
34+
**/settings/*.dbgdt
35+
**/settings/*.cspy
36+
**/settings/*.cspy.*
37+
**/settings/*.xcl
38+
**/settings/*.dni
39+
**/settings/*.wsdt
40+
**/settings/*.wspos
41+
42+
# IAR Debug Exe
43+
**/Exe/*.sim
44+
45+
# IAR Debug Obj
46+
**/Obj/*.pbd
47+
**/Obj/*.pbd.*
48+
**/Obj/*.pbi
49+
**/Obj/*.pbi.*
4750

4851
*.TMP
4952
/docs_src/x_Doxyfile.doxy
@@ -69,13 +72,15 @@ RTE/
6972
[Dd]ebugPublic/
7073
[Rr]elease/
7174
[Rr]eleases/
75+
[Dd]ebug*/
7276
x64/
7377
x86/
7478
bld/
7579
[Bb]in/
7680
[Oo]bj/
7781
[Ll]og/
7882
_build/
83+
build/
7984

8085
# Visual Studio 2015/2017 cache/options directory
8186
.vs/
@@ -274,7 +279,7 @@ ClientBin/
274279
*.publishsettings
275280
orleans.codegen.cs
276281

277-
# Including strong name files can present a security risk
282+
# Including strong name files can present a security risk
278283
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
279284
#*.snk
280285

@@ -370,7 +375,7 @@ __pycache__/
370375
# OpenCover UI analysis results
371376
OpenCover/
372377

373-
# Azure Stream Analytics local run output
378+
# Azure Stream Analytics local run output
374379
ASALocalRun/
375380

376381
# MSBuild Binary and Structured Log
@@ -383,3 +388,13 @@ log_file.txt
383388
project.ioc
384389
mx.scratch
385390
*.tilen majerle
391+
392+
393+
# Altium
394+
Project outputs*
395+
History/
396+
*.SchDocPreview
397+
*.$$$Preview
398+
399+
# VSCode projects
400+
project_vscode_compiled.exe

‎.vscode/c_cpp_properties.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Win32",
5+
"includePath": [
6+
"${workspaceFolder}\\dev\\",
7+
"${workspaceFolder}\\lwshell\\src\\include\\"
8+
],
9+
"defines": [
10+
"WIN32",
11+
"_DEBUG",
12+
"UNICODE",
13+
"_UNICODE"
14+
],
15+
"compilerPath": "c:\\msys64\\mingw64\\bin\\gcc.exe",
16+
"cStandard": "gnu17",
17+
"cppStandard": "gnu++14",
18+
"intelliSenseMode": "windows-gcc-x86",
19+
"configurationProvider": "ms-vscode.cmake-tools"
20+
}
21+
],
22+
"version": 4
23+
}

‎.vscode/launch.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "(Windows) Launch",
9+
"type": "cppdbg",
10+
"request": "launch",
11+
"program": "${workspaceFolder}\\build\\LwLibPROJECT.exe",
12+
"miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
13+
"args": [],
14+
"stopAtEntry": false,
15+
"cwd": "${fileDirname}",
16+
"environment": [],
17+
"console": "integratedTerminal"
18+
}
19+
]
20+
}

‎.vscode/tasks.json‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"version": "2.0.0",
3+
4+
/* For this builds, you need
5+
*
6+
* - Ninja build system
7+
* - MSYS2 compiler with ninja support
8+
* - C/C++ extension for VSCode
9+
* - CMake-Tools extension for VSCode
10+
*/
11+
"tasks": [
12+
{
13+
"type": "cppbuild",
14+
"label": "Build project",
15+
"command": "cmake",
16+
"args": ["--build", "\"build\""],
17+
"options": {
18+
"cwd": "${workspaceFolder}"
19+
},
20+
"problemMatcher": ["$gcc"],
21+
"group": {
22+
"kind": "build",
23+
"isDefault": true
24+
}
25+
},
26+
{
27+
"type": "shell",
28+
"label": "Re-build project",
29+
"command": "cmake",
30+
"args": ["--build", "\"build\"", "--clean-first", "-v"],
31+
"options": {
32+
"cwd": "${workspaceFolder}"
33+
},
34+
"problemMatcher": ["$gcc"],
35+
},
36+
{
37+
"type": "shell",
38+
"label": "Clean project",
39+
"command": "cmake",
40+
"args": ["--build", "\"build\"", "--target", "clean"],
41+
"options": {
42+
"cwd": "${workspaceFolder}"
43+
},
44+
"problemMatcher": []
45+
},
46+
{
47+
"type": "shell",
48+
"label": "Run application",
49+
"command": "${workspaceFolder}\\build\\LwLibPROJECT.exe",
50+
"args": [],
51+
"problemMatcher": [],
52+
},
53+
]
54+
}

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
## Develop
44

5+
## v1.1.1
6+
7+
- Split CMakeLists.txt files between library and executable
8+
- Fix wrongly interpreted backspace character
9+
510
## v1.1.0
611

712
- Add support for `listcmd` to print all registered commands

‎CMakeLists.txt‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
cmake_minimum_required(VERSION 3.0.0)
2+
3+
# Setup project
4+
project(LwLibPROJECT)
5+
6+
# -------------------------------------------------
7+
# This CMakeLists.txt is used only if it is a top-level file.
8+
# Purpose of it is to be able to compile project in standalone way only
9+
#
10+
# When library sources are to be included in another project
11+
# user shall use /lwshell/CMakeLists.txt instead
12+
if (NOT PROJECT_IS_TOP_LEVEL)
13+
message(FATAL_ERROR "This CMakeLists.txt can only be used as top-level. Use /lwshell/CMakeLists.txt for library include purpose")
14+
endif()
15+
16+
# Set as executable
17+
add_executable(${PROJECT_NAME})
18+
19+
# Add key executable block
20+
target_sources(${PROJECT_NAME} PUBLIC
21+
${CMAKE_CURRENT_LIST_DIR}/dev/main.c
22+
)
23+
24+
# Add key include paths
25+
target_include_directories(${PROJECT_NAME} PUBLIC
26+
${CMAKE_CURRENT_LIST_DIR}/dev
27+
)
28+
29+
# Compilation definition information
30+
target_compile_definitions(${PROJECT_NAME} PUBLIC
31+
WIN32
32+
_DEBUG
33+
CONSOLE
34+
LWSHELL_DEV
35+
)
36+
37+
# Add subdir with lwshell and link to project
38+
add_subdirectory("lwshell" lwshell)
39+
target_link_libraries(${PROJECT_NAME} lwshell)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ It targets communication with embedded systems from remote terminal to quickly s
1313
* Written in C language (C99)
1414
* No dynamic allocation, maximum number of commands assigned at compile time
1515
* Highly configurable
16-
* Simple help-text with `cmd -v` option
16+
* Simple help-text with `cmd -h` option
1717
* User friendly MIT license
1818

1919
## Contribute

‎dev/VisualStudio/lwshell_dev.sln‎ renamed to ‎dev/lwshell_dev.sln‎

File renamed without changes.

‎dev/VisualStudio/lwshell_dev.vcxproj‎ renamed to ‎dev/lwshell_dev.vcxproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,10 @@
7373
<PropertyGroup Label="UserMacros" />
7474
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7575
<LinkIncremental>true</LinkIncremental>
76-
<IncludePath>..\..\lwshell\src\include;.;$(IncludePath)</IncludePath>
76+
<IncludePath>..\lwshell\src\include;.;$(IncludePath)</IncludePath>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7979
<LinkIncremental>true</LinkIncremental>
80-
<IncludePath>..\..\lwmem\src\include;.;$(IncludePath)</IncludePath>
8180
</PropertyGroup>
8281
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8382
<LinkIncremental>false</LinkIncremental>
@@ -143,8 +142,8 @@
143142
</Link>
144143
</ItemDefinitionGroup>
145144
<ItemGroup>
146-
<ClCompile Include="..\..\examples\example_minimal.c" />
147-
<ClCompile Include="..\..\lwshell\src\lwshell\lwshell.c" />
145+
<ClCompile Include="..\examples\example_minimal.c" />
146+
<ClCompile Include="..\lwshell\src\lwshell\lwshell.c" />
148147
<ClCompile Include="main.c" />
149148
</ItemGroup>
150149
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

0 commit comments

Comments
 (0)