Skip to content

Commit aa80836

Browse files
committed
automatic template update of Serial Peripheral Interface (SPI) Analyzer
1 parent 72ebc30 commit aa80836

3 files changed

Lines changed: 42 additions & 15 deletions

File tree

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,40 @@ jobs:
1212
windows:
1313
runs-on: windows-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: Build
1717
run: |
1818
cmake -B ${{github.workspace}}/build -A x64
1919
cmake --build ${{github.workspace}}/build --config Release
2020
- name: Upload windows build
21-
uses: actions/upload-artifact@v2
21+
uses: actions/upload-artifact@v3
2222
with:
2323
name: windows
2424
path: ${{github.workspace}}/build/Analyzers/Release/*.dll
2525
macos:
2626
runs-on: macos-latest
2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2929
- name: Build
3030
run: |
3131
cmake -B ${{github.workspace}}/build/x86_64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=x86_64
3232
cmake --build ${{github.workspace}}/build/x86_64
3333
cmake -B ${{github.workspace}}/build/arm64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64
3434
cmake --build ${{github.workspace}}/build/arm64
3535
- name: Upload MacOS x86_64 build
36-
uses: actions/upload-artifact@v2
36+
uses: actions/upload-artifact@v3
3737
with:
3838
name: macos_x86_64
3939
path: ${{github.workspace}}/build/x86_64/Analyzers/*.so
4040
- name: Upload MacOS arm64 build
41-
uses: actions/upload-artifact@v2
41+
uses: actions/upload-artifact@v3
4242
with:
4343
name: macos_arm64
4444
path: ${{github.workspace}}/build/arm64/Analyzers/*.so
4545
linux:
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v3
4949
- name: Build
5050
run: |
5151
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release
@@ -54,7 +54,7 @@ jobs:
5454
CC: gcc-10
5555
CXX: g++-10
5656
- name: Upload Linux build
57-
uses: actions/upload-artifact@v2
57+
uses: actions/upload-artifact@v3
5858
with:
5959
name: linux
6060
path: ${{github.workspace}}/build/Analyzers/*.so
@@ -63,14 +63,14 @@ jobs:
6363
runs-on: ubuntu-latest
6464
steps:
6565
- name: download individual builds
66-
uses: actions/download-artifact@v2
66+
uses: actions/download-artifact@v3
6767
with:
6868
path: ${{github.workspace}}/artifacts
6969
- name: zip
7070
run: |
7171
cd ${{github.workspace}}/artifacts
7272
zip -r ${{github.workspace}}/analyzer.zip .
73-
- uses: actions/upload-artifact@v2
73+
- uses: actions/upload-artifact@v3
7474
with:
7575
name: all-platforms
7676
path: ${{github.workspace}}/artifacts/**

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 Saleae
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Saleae Serial Peripheral Interface (SPI) Analyzer
44

55
## Getting Started
66

7-
The following documentation describes getting this analyzer building locally. For more detailed information about the Analyzer SDK, debugging, CI build, and more, checkout the readme from the Sample Analyzer repository:
7+
The following documentation describes how to build this analyzer locally. For more detailed information about the Analyzer SDK, debugging, CI builds, and more, check out the readme in the Sample Analyzer repository.
88

99
https://github.com/saleae/SampleAnalyzer
1010

@@ -16,15 +16,15 @@ Dependencies:
1616
- CMake 3.13+
1717
- git
1818

19-
Installing command line tools after XCode is installed:
19+
Install command line tools after XCode is installed:
2020

2121
```
2222
xcode-select --install
2323
```
2424

2525
Then open XCode, open Preferences from the main menu, go to locations, and select the only option under 'Command line tools'.
2626

27-
Installing CMake on MacOS:
27+
Install CMake on MacOS:
2828

2929
1. Download the binary distribution for MacOS, `cmake-*-Darwin-x86_64.dmg`
3030
2. Install the usual way by dragging into applications.
@@ -36,7 +36,7 @@ Installing CMake on MacOS:
3636

3737
_Note: Errors may occur if older versions of CMake are installed._
3838

39-
Building the analyzer:
39+
Build the analyzer:
4040

4141
```
4242
mkdir build
@@ -59,7 +59,7 @@ Misc dependencies:
5959
sudo apt-get install build-essential
6060
```
6161

62-
Building the analyzer:
62+
Build the analyzer:
6363

6464
```
6565
mkdir build
@@ -96,7 +96,7 @@ https://cmake.org/download/
9696
Download and install git here.
9797
https://git-scm.com/
9898

99-
Building the analyzer:
99+
Build the analyzer:
100100

101101
```
102102
mkdir build
@@ -106,6 +106,12 @@ cmake .. -A x64
106106

107107
Then, open the newly created solution file located here: `build\spi_analyzer.sln`
108108

109+
Optionally, build from the command line without opening Visual Studio:
110+
111+
```
112+
cmake --build .
113+
```
114+
109115
The built analyzer DLLs will be located here:
110116

111117
`build\Analyzers\Debug`

0 commit comments

Comments
 (0)