stlink-org · Nightwalker-87 · May 19, 2020 · Apr 29, 2020 · Apr 29, 2020 · Apr 29, 2020
diff --git a/.travis.sh b/.travis.sh
@@ -8,39 +8,64 @@ 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
-
-	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
-
-	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 -
+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 && 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 $DIR
+    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 && 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 $DIR
+    make && 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 && 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
diff --git a/.travis.yml b/.travis.yml
@@ -1,98 +1,111 @@
 language: c
 
-matrix:
+jobs:
     include:
-        ### 64-bit builds ###
+        ### 64-bit builds on AMD64 ###
         - os: linux
+          dist: bionic
           env: BADGE=linux
-          arch: x64
           compiler: gcc-5
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-5', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+                  packages: ['gcc-5', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
         - os: linux
+          dist: bionic
           env: BADGE=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
-          env: BADGE=linux
-          arch: x64
           compiler: gcc-9
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
         - os: linux
+          dist: xenial
           env: BADGE=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']
+                  packages: ['clang-3.7', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
         - os: linux
+          dist: bionic
           env: BADGE=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 ###
+                  packages: ['clang-6.0', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
         - os: linux
+          dist: bionic
           env: BADGE=linux
-          arch: x86
-          compiler: gcc-5
+          compiler: clang-9
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test']
+                  packages: ['clang-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
+
+        - os: linux
+          dist: bionic
+          env: BADGE=linux-mingw
+          name: linux-mingw
+          compiler: gcc-9
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-5', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm', 'mingw-w64']
+
+        ### 32-bit builds on AMD64 ###
         - os: linux
+          dist: bionic
           env: BADGE=linux
-          arch: x86
-          compiler: gcc-7
+          compiler: gcc-5
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-7', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+                  packages: ['gcc-5', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
+          before_install:
+            - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
         - os: linux
+          dist: bionic
           env: BADGE=linux
-          arch: x86
           compiler: gcc-9
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev']
+                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
+          before_install:
+            - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
         - os: linux
+          dist: xenial
           env: BADGE=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']
+                  packages: ['clang-3.7', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
+          before_install:
+            - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
         - os: linux
+          dist: bionic
           env: BADGE=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']
+                  packages: ['clang-6.0', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
+          before_install:
+            - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+        - os: linux
+          dist: bionic
+          env: BADGE=linux
+          compiler: clang-9
+          addons:
+              apt:
+                  sources: ['ubuntu-toolchain-r-test']
+                  packages: ['clang-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
+          before_install:
+            - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+
 
         ### macOS ###
         - os: osx
@@ -114,8 +127,14 @@ matrix:
                 - libusb
                 - gtk+3
 
+        ### Windows ###
+#        - os: windows
+#          env: BADGE=windows
+#          compiler: gcc
+
 script:
   - git fetch --tags
   - printenv
   - cmake --version
-  - ./.travis.sh
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]] || [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis.sh; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then cmd.exe /C 'mingw64-build.bat'; fi
diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ package: build/Release
 		@$(MAKE) -C build/Release package
 
 test: debug
-		@echo "[TEST]"
+		@echo "[TEST] Debug"
 		@$(MAKE) -C build/Debug test
 
 build/Debug:

diff --git a/cmake/modules/Findlibusb.cmake b/cmake/modules/Findlibusb.cmake
@@ -1,4 +1,6 @@
 # Findlibusb.cmake
+# Find and install external libusb library
+
 # Once done this will define
 #
 #  LIBUSB_FOUND         libusb present on system
@@ -8,7 +10,7 @@
 
 include(FindPackageHandleStandardArgs)
 
-if (APPLE)                                      # macOS
+if (APPLE)                                                                      # macOS
     FIND_PATH(
         LIBUSB_INCLUDE_DIR NAMES libusb.h
         HINTS /usr /usr/local /opt
@@ -25,7 +27,7 @@ if (APPLE)                                      # macOS
         message(FATAL_ERROR "No libusb library found on your system! Install libusb-1.0 from Homebrew or MacPorts")
     endif ()
 
-elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")   # FreeBSD; libusb is integrated into the system
+elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")                                   # FreeBSD; libusb is integrated into the system
     FIND_PATH(
         LIBUSB_INCLUDE_DIR NAMES libusb.h
         HINTS /usr/include
@@ -41,15 +43,15 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")   # FreeBSD; libusb is integrated
         message(FATAL_ERROR "Expected libusb library not found on your system! Verify your system integrity.")
     endif ()
 
-elseif (WIN32)                                  # Windows
+elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW))                      # Windows or MinGW-toolchain on Debian
     # for MinGW/MSYS/MSVC: 64-bit or 32-bit?
     if (CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(ARCH 64)
     else ()
         set(ARCH 32)
     endif ()
 
-    if (NOT EXISTS "/etc/debian_version")
+    if (WIN32 AND NOT EXISTS "/etc/debian_version") # Skip this for Debian...
         FIND_PATH(
             LIBUSB_INCLUDE_DIR NAMES libusb.h
             HINTS /usr /usr/local /opt
@@ -71,12 +73,17 @@ elseif (WIN32)                                  # Windows
         endif ()
     endif ()
 
-    if (NOT LIBUSB_FOUND OR EXISTS "/etc/debian_version")
+    if (NOT LIBUSB_FOUND)
         # Preparations for installing libusb library
         set(LIBUSB_WIN_VERSION 1.0.23)          # set libusb version
         set(LIBUSB_WIN_ARCHIVE libusb-${LIBUSB_WIN_VERSION}.7z)
-        set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/${LIBUSB_WIN_ARCHIVE})
-        set(LIBUSB_WIN_OUTPUT_FOLDER ${CMAKE_BINARY_DIR}/3rdparty/libusb-${LIBUSB_WIN_VERSION})
+        if (WIN32 AND NOT EXISTS "/etc/debian_version") # ... on native Windows systems
+            set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/${LIBUSB_WIN_ARCHIVE})
+            set(LIBUSB_WIN_OUTPUT_FOLDER ${CMAKE_BINARY_DIR}/3rdparty/libusb-${LIBUSB_WIN_VERSION})
+        else (EXISTS "/etc/debian_version" AND MINGW) # ... only for cross-building on Debian
+            set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_SOURCE_DIR}/build-mingw/${LIBUSB_WIN_ARCHIVE})
+            set(LIBUSB_WIN_OUTPUT_FOLDER ${CMAKE_SOURCE_DIR}/build-mingw/3rdparty/libusb-${LIBUSB_WIN_VERSION})
+        endif ()
 
         # Get libusb package
         if (EXISTS ${LIBUSB_WIN_ARCHIVE_PATH})  # ... should the package be already there (for whatever reason)
@@ -107,6 +114,7 @@ elseif (WIN32)                                  # Windows
             )
 
         if (MINGW OR MSYS)
+            set(LIBUSB_NAME usb-1.0)
             find_library(
                 LIBUSB_LIBRARY NAMES ${LIBUSB_NAME}
                 HINTS ${LIBUSB_WIN_OUTPUT_FOLDER}/MinGW${ARCH}/static
@@ -115,6 +123,7 @@ elseif (WIN32)                                  # Windows
                 )
 
         else (MSVC)
+            set(LIBUSB_NAME libusb-1.0.lib)
             find_library(
                 LIBUSB_LIBRARY NAMES ${LIBUSB_NAME}
                 HINTS ${LIBUSB_WIN_OUTPUT_FOLDER}/MS${ARCH}/dll
@@ -127,7 +136,7 @@ elseif (WIN32)                                  # Windows
     FIND_PACKAGE_HANDLE_STANDARD_ARGS(libusb DEFAULT_MSG LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR)
     mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARY)
 
-else ()                                          # all other OS (unix-based)
+else ()                                                                         # all other OS (unix-based)
     FIND_PATH(
         LIBUSB_INCLUDE_DIR NAMES libusb.h
         HINTS /usr /usr/local /opt

diff --git a/cmake/modules/c_flags.cmake b/cmake/modules/c_flags.cmake
@@ -1,3 +1,6 @@
+# c_flags.cmake
+# Configure C compiler flags
+
 include(CheckCCompilerFlag)
 
 function(add_cflag_if_supported flag)

diff --git a/cmake/modules/get_version.cmake b/cmake/modules/get_version.cmake
@@ -1,6 +1,5 @@
-# Determine project version
-# * Using Git
-# * Local .version file
+# get_version.cmake
+# Determine project version by using Git or a local .version file
 
 set(__detect_version 0)
 
@@ -77,13 +76,14 @@ if (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
     endif(GIT_DESCRIBE_RESULT EQUAL 0)
 endif ()
 
+##
 # Failure to read version via git
 # Possible cases:
 # -> git is not found or
 # -> /.git does not exist or
 # -> GIT_DESCRIBE failed or
 # -> version string is of invalid format
-
+##
 if (NOT GIT_FOUND OR NOT EXISTS "${PROJECT_SOURCE_DIR}/.git" OR ERROR_FLAG EQUAL 1)
     message(STATUS "Git and/or repository not found.") # e.g. when building from source package
     message(STATUS "Try to detect version from \"${PROJECT_SOURCE_DIR}/.version\" file instead...")