Merge pull request #929 from stlink-org/build-settings

Update and refactoring for build settings
stlink-org · Apr 19, 2020 · cb3a2b6 · cb3a2b6
2 parents fc72b92 + e93c516
commit cb3a2b6
Show file tree

Hide file tree

Showing 44 changed files with 1,045 additions and 1,012 deletions.
diff --git a/.travis.sh b/.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
diff --git a/.travis.yml b/.travis.yml
@@ -9,35 +9,43 @@ matrix:
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-5', 'libusb-1.0.0-dev']
+                  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']
+                  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']
+                  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']
+                  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']
+                  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
@@ -46,51 +54,53 @@ matrix:
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-5', 'libusb-1.0.0-dev']
+                  packages: ['gcc-5', 'libusb-1.0.0-dev', 'libgtk-3-dev']
         - os: linux
           arch: x86
-          compiler: gcc-6
+          compiler: gcc-7
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-6', 'libusb-1.0.0-dev']
+                  packages: ['gcc-7', 'libusb-1.0.0-dev', 'libgtk-3-dev']
         - os: linux
           arch: x86
-          compiler: gcc-7
+          compiler: gcc-9
           addons:
               apt:
                   sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-7', 'libusb-1.0.0-dev']
+                  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']
+                  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']
+                  packages: ['clang-6.0', 'libusb-1.0.0-dev', 'libgtk-3-dev']
 
         ### macOS ###
         - os: osx
           compiler: gcc
           addons:
             homebrew:
               packages:
-                - libusb
                 - gcc
+                - libusb
+                - gtk+3
         - os: osx
           compiler: clang
           addons:
             homebrew:
               packages:
-                - libusb
                 - clang
+                - libusb
+                - gtk+3
 
 script:
   - git fetch --tags