Merge pull request #969 from stlink-org/develop

Release v1.6.1

.github/ISSUE_TEMPLATE/bug-report--only-valid-if-template-is-reused--.md

@@ -0,0 +1,38 @@
+---
+name: Bug Report (only valid if template is reused!)
+about: 'Please read #906 before submitting a ticket.'
+title: "[STM32 device name]: [Title]"
+labels: ''
+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/bug-report.md

@@ -1,8 +1,8 @@
 ---
 name: Bug Report
-about: Create a report to help us improve
-title: "[Your device name]: [Title]"
-labels: bug/needs-investigation
+about: 'Please read #906 before submitting a ticket.'
+title: "[STM32 device name]: [Title]"
+labels: ''
 assignees: ''
 
 ---

.gitignore

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

.travis.sh

@@ -5,15 +5,67 @@ ls -1 /usr/bin/clang*
 ls -1 /usr/bin/scan-build*
 echo "----"
 
-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")
-	brew install libusb
-fi
+echo "WORK DIR:$DIR"
+DIR=$PWD
+
+if [ "$TRAVIS_JOB_NAME" == "linux-mingw" ]; then
+    echo "--> Building Release for Windows (x86-64) ..."
+    mkdir -p build-mingw && cd build-mingw
+    echo "-DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
+          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR"
+    cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
+          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
+    make && rm -rf build-mingw && cd -
+
+    echo "--> Building Release for Windows (i686) ..."
+    mkdir -p build-mingw && cd build-mingw
+    echo "-DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=i686-w64-mingw32 \
+          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR"
+    cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=i686-w64-mingw32 \
+          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
+    make && rm -rf build-mingw && cd -
+
+elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
+    sudo apt-get update -qq || true
+    sudo apt-get install -qq -y --no-install-recommends libgtk-3-dev
+
+    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 $DIR
+    make && cd -
 
-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 Release with package..."
+    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 $DIR
+    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 -
+elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    brew install libusb
+
+    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 $DIR
+    make && cd -
+
+    echo "--> Building Release with package..."
+    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 $DIR
+    make package && cd -
+
+else # local test-build
+    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 && cd -
+
+    echo "--> Building Release with package..."
+    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 package && cd -
+fi