|
2 | 2 |
|
3 | 3 | # On OSX use coreutils package to fix absense of readlink command
|
4 | 4 | if [[ $OSTYPE == darwin* ]]; then
|
5 |
| - brew install coreutils |
| 5 | + brew install coreutils || true |
6 | 6 | PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
|
7 | 7 | fi
|
8 | 8 |
|
@@ -52,17 +52,6 @@ if [ "$os_VENDOR" == "Ubuntu" ]; then
|
52 | 52 | qt${RDM_QT_VERSION:0:2}declarative qt${RDM_QT_VERSION:0:2}quickcontrols qt${RDM_QT_VERSION:0:2}script qt${RDM_QT_VERSION:0:2}quick1 -y
|
53 | 53 | fi
|
54 | 54 |
|
55 |
| - # Install CI environment if needed |
56 |
| - if [ $RDM_CI ]; then |
57 |
| - print_title "Install CI deps" |
58 |
| - sudo apt-get install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev -y |
59 |
| - sudo apt-get install libdbus-1-dev -y |
60 |
| - sudo apt-get install libxext-dev -y |
61 |
| - sudo apt-get install build-essential devscripts ubuntu-dev-tools debhelper \ |
62 |
| - dh-make diffutils patch gnupg fakeroot lintian pbuilder git python perl -y |
63 |
| - sudo apt-get build-dep qt5-default -y |
64 |
| - fi |
65 |
| - |
66 | 55 | print_title "Check deps"
|
67 | 56 | sudo apt-get install automake libtool libssl-dev \
|
68 | 57 | libssh2-1-dev g++ libgl1-mesa-dev -y
|
@@ -95,7 +84,7 @@ elif [[ $OSTYPE == darwin* ]]; then
|
95 | 84 | xcodebuild -sdk macosx -project src/client/mac/Breakpad.xcodeproj -configuration Release -target Breakpad ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES MACOSX_DEPLOYMENT_TARGET=10.10 GCC_VERSION=com.apple.compilers.llvm.clang.1_0 > /dev/null
|
96 | 85 | xcodebuild -sdk macosx -project src/client/mac/Breakpad.xcodeproj -configuration Release -target Breakpad install DSTROOT=$DEPS_DIR/../bin/osx INSTALL_PATH=/Frameworks ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES MACOSX_DEPLOYMENT_TARGET=10.10 GCC_VERSION=com.apple.compilers.llvm.clang.1_0 > /dev/null
|
97 | 86 | xcodebuild -sdk macosx -project src/client/mac/Breakpad.xcodeproj -configuration Release -target Breakpad install DSTROOT=$DEPS_DIR/../bin INSTALL_PATH=/Frameworks ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES MACOSX_DEPLOYMENT_TARGET=10.10 GCC_VERSION=com.apple.compilers.llvm.clang.1_0 > /dev/null
|
98 |
| - brew upgrade libssh2 || brew install libssh2 |
| 87 | + brew upgrade libssh2 || brew install libssh2 || true |
99 | 88 | else
|
100 | 89 | echo "Your operation system is not supported!"
|
101 | 90 | fi
|
0 commit comments