Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reconfiguration of package build process #931

Merged
merged 16 commits into from
Apr 20, 2020
Merged

Reconfiguration of package build process #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6eb9103
Updated build-settings
Nightwalker-87 Apr 13, 2020
b4a4762
Merge branch 'develop' into build-settings
Nightwalker-87 Apr 15, 2020
9775762
Partial project restructuring
Nightwalker-87 Apr 16, 2020
c2c4808
Project cleanup
Nightwalker-87 Apr 16, 2020
aa38587
Restored functionality of make test builds
Nightwalker-87 Apr 17, 2020
07c5e32
Updated CHANGELOG for upcoming release
Nightwalker-87 Apr 17, 2020
264417e
Fix for version string read without git
Nightwalker-87 Apr 17, 2020
1554392
Unified naming for cmake modules & paths
Nightwalker-87 Apr 17, 2020
ccd1673
Enable pkg_check for gtk on macOS
Nightwalker-87 Apr 17, 2020
9fd9045
General Project Update
Nightwalker-87 Apr 17, 2020
e98c7d4
Updated cmake settings from GTK to GTK3
Nightwalker-87 Apr 17, 2020
f489145
[doc] Updated package requirements
Nightwalker-87 Apr 17, 2020
68fdd39
Reconfigured cmake packaging
Nightwalker-87 Apr 18, 2020
145ca6d
General Project Update
Nightwalker-87 Apr 19, 2020
48a9db0
Removed remnants of unused build target
Nightwalker-87 Apr 19, 2020
bc869d7
Fixes to prevent merge conflict
Nightwalker-87 Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 33 additions & 6 deletions .travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
38 changes: 24 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down