Merge remote-tracking branch 'upstream/develop' into add_stlink_v3_su…

…pport

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,38 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: "[Your device name]: [Title]"
+labels: bug/needs-investigation
+assignees: ''
+
+---
+
+Thank you for giving feedback to the stlink project.
+
+In order to allow developers and other contributors to isolate and target your respective issue, please take some time to fill out each of the following items appropriate to your specific problem:
+
+- Programmer/board type: [enter here] (e.g Stlink /v1, /v2, /v2-clone, /v2-1)
+- Programmer firmware version: [enter here] (e.g STSW-LINK007 2.27.15)
+- Operating system and version: [enter here] (e.g Linux, Mac OS X, Windows)
+- **Stlink tools version** and/or git commit hash: [enter here] (e.g v1.1.0/git-c722056)
+- Stlink commandline tool name: [enter here] (e.g `st-info`, `st-flash`, `st-util`)
+- Target chip (and board if applicable): [enter here] (e.g STM32F402VG)
+
+Futher we kindly ask you to describe the detected problem as detailed as possible and to add debug output if available, by using the following template:
+
+Commandline-Output:
+
+```
+OUTPUT/ERROR of the commandline tool(s)
+```
+
+Expected/description:
+
+`short description of the expected value`
+
+
+**NOTICE: This bug report may be closed without further notice, if not enough information is provided!**
+
+Thank you for your support.
+
+The stlink project maintainers

.github/ISSUE_TEMPLATE/feature_request.md → .github/ISSUE_TEMPLATE/feature-request.md

@@ -1,4 +1,11 @@
-# Feature Request
+---
+name: Feature Request
+about: Suggest an idea for this project
+title: "[feature] "
+labels: code/feature-request
+assignees: ''
+
+---
 
 Thank you for giving feedback to the stlink project.
 

.gitignore

@@ -1,3 +1,4 @@
 build
+build-mingw
 obj-*
 *.user*

.travis.sh

@@ -5,15 +5,42 @@ ls -1 /usr/bin/clang*
 ls -1 /usr/bin/scan-build*
 echo "----"
 
+echo "WORK DIR:$DIR"
+DIR=$PWD
+
 if [ "$TRAVIS_OS_NAME" == "linux" ]; then
 	sudo apt-get update -qq || true
 	sudo apt-get install -qq -y --no-install-recommends libgtk-3-dev
-else #("$TRAVIS_OS_NAME" == "osx")
+
+	echo "--> Building Debug..."
+	mkdir -p build/Debug && cd build/Debug
+	echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install"
+	cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
+	make && make package && cd -
+
+	echo "--> Building Release..."
+	mkdir -p build/Release && cd build/Release
+	echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install"
+	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
+	make && make package && cd -
+
+#	echo "--> Building Binary..."
+#	mkdir -p build/Binary && cd build/Binary
+#	cho "-DCMAKE_BUILD_TYPE=Binary -DCMAKE_INSTALL_PREFIX=$PWD/_install"
+#	cmake -DCMAKE_BUILD_TYPE=Binary -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
+#	make && make package && cd -
+else [ "$TRAVIS_OS_NAME" == "osx" ];
 	brew install libusb
-fi
 
-echo "=== Building Debug"
-mkdir -p build/Debug && cd build/Debug && cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../ && make && make package && cd -
+	echo "--> Building Debug..."
+	mkdir -p build/Debug && cd build/Debug
+	echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install"
+	cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
+	make && make package && cd -
 
-echo "=== Building Release"
-mkdir -p build/Release && cd build/Release && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../ && make && make package && cd -
+	echo "--> Building Release..."
+	mkdir -p build/Release && cd build/Release
+	echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install"
+	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
+	make && make package && cd -
+fi

.travis.yml

@@ -1,23 +1,106 @@
-
-compiler:
-  - gcc
-  - clang
-
 language: c
 
-os:
-  - linux
-  - osx
+matrix:
+    include:
+        ### 64-bit builds ###
+        - os: linux
+          arch: x64
+          compiler: gcc-5
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test']
+                  packages: ['gcc-5', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+        - os: linux
+          arch: x64
+          compiler: gcc-7
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test']
+                  packages: ['gcc-7', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+        - os: linux
+          arch: x64
+          compiler: gcc-9
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test']
+                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+        - os: linux
+          arch: x64
+          compiler: clang-3.7
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-3.7']
+                  packages: ['clang-3.7', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+        - os: linux
+          arch: x64
+          compiler: clang-6.0
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-bionic-6.0']
+                  packages: ['clang-6.0', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+#        - os: linux
+#          arch: x64
+#          compiler: clang-6.0
+#          addons:
+#              apt:
+#                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-bionic-6.0']
+#                  packages: ['clang-6.0', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+#          env: CFLAGS=-m32 LDFLAGS=-m32
+
+        ### 32-bit builds ###
+        - os: linux
+          arch: x86
+          compiler: gcc-5
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test']
+                  packages: ['gcc-5', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+        - os: linux
+          arch: x86
+          compiler: gcc-7
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test']
+                  packages: ['gcc-7', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+        - os: linux
+          arch: x86
+          compiler: gcc-9
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test']
+                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+        - os: linux
+          arch: x86
+          compiler: clang-3.7
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-3.7']
+                  packages: ['clang-3.7', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+        - os: linux
+          arch: x86
+          compiler: clang-6.0
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-bionic-6.0']
+                  packages: ['clang-6.0', 'libusb-1.0.0-dev', 'libgtk-3-dev']
 
-addons:
-  apt:
-    sources:
-       - sourceline: 'ppa:ubuntu-toolchain-r/test'
-    packages:
-      - clang
-      - g++-6
-      - gcc-6
-      - libusb-1.0.0-dev
+        ### macOS ###
+        - os: osx
+          compiler: gcc
+          addons:
+            homebrew:
+              packages:
+                - gcc
+                - libusb
+                - gtk+3
+        - os: osx
+          compiler: clang
+          addons:
+            homebrew:
+              packages:
+                - clang
+                - libusb
+                - gtk+3
 
 script:
   - git fetch --tags

.version

@@ -1 +1 @@
-1.6.0
+1.6.0