Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expanded and revised list of chips #1145

Merged
merged 2 commits into from
May 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ elif [ "$TRAVIS_JOB_NAME" == "linux-mingw-32" ]; then
make && rm -rf build-mingw-32 && cd -

elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
echo "--> Building Debug..."
echo "--> make debug..."
mkdir -p build/Debug && cd build/Debug
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
make && cd -
make debug && cd -

echo "--> Building Release with package..."
echo "--> make package..."
mkdir -p build/Release && cd build/Release
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
make package && cd -
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Updates & changes:

- Added instructions for bug-reports and feature-requests to contribution guidelines ([#906](https://github.com/stlink-org/stlink/pull/906))
- Added travis CI configuration for macOS 10.14 to maintain capability for 32-bit compilation ([#f5ada94](https://github.com/stlink-org/stlink/commit/f5ada9474cdb87ff37de0d4eb9e75622b5870646))
- Updated description of chip id 0x0457 to L01x/L02x ([#1143](https://github.com/stlink-org/stlink/pull/1143), [#1144](https://github.com/stlink-org/stlink/pull/1144))

Fixes:
- cmake: Install shared libraries in proper directories ([#1142](https://github.com/stlink-org/stlink/pull/1142))
Expand Down
3 changes: 2 additions & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ The following versions of the stlink toolset are currently being supported.<br /
| Version | Supported |
| ------- | ------------------ |
| develop | :white_check_mark: |
| 1.6.x | :white_check_mark: |
| 1.7.x | :white_check_mark: |
| 1.6.x | :x: |
| 1.5.x | :x: |
| 1.4.0 | :x: |
| 1.3.x | :x: |
Expand Down
1 change: 1 addition & 0 deletions doc/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ This document describes the necessary steps for developers to create a release:
6. Create binary packages (.rpm / .deb / .zip) with `make package && sh ./cmake/packaging/windows/generate_binaries.sh`
7. Upload packages to the [release page](https://github.com/stlink-org/stlink/releases) of this project
8. Merge `master` into `develop`
9. Update GitHub security policy (/SECURITY.md)
6 changes: 3 additions & 3 deletions doc/version_support.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _Source:_ pkgs.org - [libusb](https://pkgs.org/search/?q=libusb); [cmake](https:

### Microsoft Windows

On Windows users should ensure that cmake 3.17.0 or any later version is installed.<br />
On Windows users should ensure that cmake 3.20.2 or any later version is installed.<br />
Up on compiling c-make will **automatically** download and install the latest compatible version of `libusb` (1.0.23 at the time of writing).

- Windows 10
Expand All @@ -14,8 +14,8 @@ Up on compiling c-make will **automatically** download and install the latest co

| Package Repository | libusb<br />version | cmake<br />version | gtk-3<br />version | Supported macOS versions |
| ------------------ | ------------------- | ------------------ | ------------------ | ------------------------ |
| homebrew | 1.0.23 | 3.17.0 | 3.24.18<br />gtk+3 | 10.9 - 11.x |
| MacPorts | 1.0.23 | 3.17.0 | 3.24.18<br />gtk3 | 10.4 - 11.x |
| homebrew | 1.0.24 | 3.20.2 | 3.24.29<br />gtk+3 | 10.9 - 11.x |
| MacPorts | 1.0.24 | 3.20.2 | 3.24.29<br />gtk3 | 10.4 - 11.x |

NOTE: In order to use a STLINK/V1 programmer on macOS, versions 10.14 or 10.15 are required.

Expand Down
9 changes: 0 additions & 9 deletions run_clang_analyze.sh

This file was deleted.