From f88509130505748831ded417031a14cd033bdb63 Mon Sep 17 00:00:00 2001
From: nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com>
Date: Mon, 24 May 2021 12:13:56 +0200
Subject: [PATCH] General Project Update

- Updated CHANGELOG.md
- Updated GitHub security policy
- [doc] Updated steps for release procedure
- [doc] Updated list of supported OS
- Removed old clang_analyze script
- Minor fix in travis build script
---
 .travis.sh             | 6 +++---
 CHANGELOG.md           | 1 +
 SECURITY.md            | 3 ++-
 doc/release.md         | 1 +
 doc/version_support.md | 6 +++---
 run_clang_analyze.sh   | 9 ---------
 6 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100755 run_clang_analyze.sh

diff --git a/.travis.sh b/.travis.sh
index a156db203..d8c5377de 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -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 -
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57ed15e98..b711f3890 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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))
diff --git a/SECURITY.md b/SECURITY.md
index caa2740db..9ace47066 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -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:                |
diff --git a/doc/release.md b/doc/release.md
index 6321e8ab2..7d5ead83c 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -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)
diff --git a/doc/version_support.md b/doc/version_support.md
index 408c1be85..bf4bc1e5e 100644
--- a/doc/version_support.md
+++ b/doc/version_support.md
@@ -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
@@ -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.
 
diff --git a/run_clang_analyze.sh b/run_clang_analyze.sh
deleted file mode 100755
index fd1b78b55..000000000
--- a/run_clang_analyze.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Run this hacky script in project root directory to start clang static analysis.
-# Adjust ccc-analyzer path if necessary
-
-CCC_ANALYZER=/usr/share/clang/scan-build-3.5/ccc-analyzer
-mkdir -p build-clang-analyze/reports
-cd build-clang-analyze
-cmake -DCMAKE_C_COMPILER=${CCC_ANALYZER} $* ..
-scan-build -o ./reports --keep-empty make