Skip to content

Commit 633281f

Browse files
authored
Clean up configure script
1 parent eeda336 commit 633281f

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/configure

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# On OSX use coreutils package to fix absense of readlink command
44
if [[ $OSTYPE == darwin* ]]; then
5-
brew install coreutils
5+
brew install coreutils || true
66
PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
77
fi
88

@@ -52,17 +52,6 @@ if [ "$os_VENDOR" == "Ubuntu" ]; then
5252
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
5353
fi
5454

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-
6655
print_title "Check deps"
6756
sudo apt-get install automake libtool libssl-dev \
6857
libssh2-1-dev g++ libgl1-mesa-dev -y
@@ -95,7 +84,7 @@ elif [[ $OSTYPE == darwin* ]]; then
9584
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
9685
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
9786
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
9988
else
10089
echo "Your operation system is not supported!"
10190
fi

0 commit comments

Comments
 (0)