From 6b900791390a315d104446d9b29b096db03a8fcd Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Tue, 5 May 2015 15:54:57 -0400 Subject: break out setup.sh from run.sh chmod +x drop travis_helper from android and ios source travis_helper.sh before_install only run setup.sh if file exists explicitly local paths explicit if statement in before_install source setup.sh --- scripts/android/install.sh | 2 -- scripts/android/run.sh | 2 -- scripts/ios/install.sh | 2 -- scripts/ios/package.sh | 2 -- scripts/ios/run.sh | 2 -- scripts/linux/install.sh | 2 -- scripts/linux/run.sh | 28 ---------------------------- scripts/linux/setup.sh | 30 ++++++++++++++++++++++++++++++ scripts/osx/install.sh | 2 -- scripts/osx/run.sh | 8 -------- scripts/osx/setup.sh | 10 ++++++++++ 11 files changed, 40 insertions(+), 50 deletions(-) create mode 100755 scripts/linux/setup.sh create mode 100755 scripts/osx/setup.sh (limited to 'scripts') diff --git a/scripts/android/install.sh b/scripts/android/install.sh index 656465cf2f..fe2b816064 100755 --- a/scripts/android/install.sh +++ b/scripts/android/install.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -source ./scripts/travis_helper.sh - mapbox_time "checkout_mason" \ git submodule update --init .mason diff --git a/scripts/android/run.sh b/scripts/android/run.sh index 7a909ffe3c..38749f79f5 100755 --- a/scripts/android/run.sh +++ b/scripts/android/run.sh @@ -9,8 +9,6 @@ export HOST=android export MASON_PLATFORM=android export MASON_ANDROID_ABI=${ANDROID_ABI:-arm-v7} -source ./scripts/travis_helper.sh - # Add Mason to PATH export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" diff --git a/scripts/ios/install.sh b/scripts/ios/install.sh index 274557c5d7..50f43c26b0 100755 --- a/scripts/ios/install.sh +++ b/scripts/ios/install.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -source ./scripts/travis_helper.sh - mapbox_time "checkout_mason" \ git submodule update --init .mason export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh index 7691b0c5f3..675e31d573 100755 --- a/scripts/ios/package.sh +++ b/scripts/ios/package.sh @@ -4,8 +4,6 @@ set -e set -o pipefail set -u -source ./scripts/travis_helper.sh - NAME=MapboxGL OUTPUT=build/ios/pkg IOS_SDK_VERSION=`xcrun --sdk iphoneos --show-sdk-version` diff --git a/scripts/ios/run.sh b/scripts/ios/run.sh index 20695c40c1..e25f9a3025 100755 --- a/scripts/ios/run.sh +++ b/scripts/ios/run.sh @@ -6,8 +6,6 @@ set -u BUILDTYPE=${BUILDTYPE:-Release} -source ./scripts/travis_helper.sh - # Add Mason to PATH export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" diff --git a/scripts/linux/install.sh b/scripts/linux/install.sh index a6ffacf5fe..1504da2a1f 100755 --- a/scripts/linux/install.sh +++ b/scripts/linux/install.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -source ./scripts/travis_helper.sh - mapbox_time "checkout_mason" \ git submodule update --init .mason export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" diff --git a/scripts/linux/run.sh b/scripts/linux/run.sh index c4731b97ec..e6ddfc9814 100755 --- a/scripts/linux/run.sh +++ b/scripts/linux/run.sh @@ -5,34 +5,6 @@ set -o pipefail BUILDTYPE=${BUILDTYPE:-Release} -source ./scripts/travis_helper.sh - -# Add Mason to PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -# Set the core file limit to unlimited so a core file is generated upon crash -ulimit -c unlimited -S - -################################################################################ -# X Server setup -################################################################################ - -# Start the mock X server -if [ -f /etc/init.d/xvfb ] ; then - mapbox_time "start_xvfb" \ - sh -e /etc/init.d/xvfb start - sleep 2 # sometimes, xvfb takes some time to start up -fi - -# Make sure we're connecting to xvfb -export DISPLAY=:99.0 - -# Make sure we're loading the 10.4.3 libs we installed manually -export LD_LIBRARY_PATH="`mason prefix mesa 10.4.3`/lib:${LD_LIBRARY_PATH:-}" - -mapbox_time "glxinfo" \ -glxinfo - ################################################################################ # Build ################################################################################ diff --git a/scripts/linux/setup.sh b/scripts/linux/setup.sh new file mode 100755 index 0000000000..f4d2eb7e7d --- /dev/null +++ b/scripts/linux/setup.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +# Add Mason to PATH +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" + +# Set the core file limit to unlimited so a core file is generated upon crash +ulimit -c unlimited -S + +################################################################################ +# X Server setup +################################################################################ + +# Start the mock X server +if [ -f /etc/init.d/xvfb ] ; then + mapbox_time "start_xvfb" \ + sh -e /etc/init.d/xvfb start + sleep 2 # sometimes, xvfb takes some time to start up +fi + +# Make sure we're connecting to xvfb +export DISPLAY=:99.0 + +# Make sure we're loading the 10.4.3 libs we installed manually +export LD_LIBRARY_PATH="`mason prefix mesa 10.4.3`/lib:${LD_LIBRARY_PATH:-}" + +mapbox_time "glxinfo" \ +glxinfo diff --git a/scripts/osx/install.sh b/scripts/osx/install.sh index 1994d371d0..a430b5495d 100755 --- a/scripts/osx/install.sh +++ b/scripts/osx/install.sh @@ -3,8 +3,6 @@ set -e set -o pipefail -source ./scripts/travis_helper.sh - mapbox_time "checkout_mason" \ git submodule update --init .mason export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" diff --git a/scripts/osx/run.sh b/scripts/osx/run.sh index b84ed04c21..be9088d2f6 100755 --- a/scripts/osx/run.sh +++ b/scripts/osx/run.sh @@ -5,14 +5,6 @@ set -o pipefail BUILDTYPE=${BUILDTYPE:-Release} -source ./scripts/travis_helper.sh - -# Add Mason to PATH -export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" - -# Set the core file limit to unlimited so a core file is generated upon crash -ulimit -c unlimited -S - ################################################################################ # Build ################################################################################ diff --git a/scripts/osx/setup.sh b/scripts/osx/setup.sh new file mode 100755 index 0000000000..7800f8d053 --- /dev/null +++ b/scripts/osx/setup.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +# Add Mason to PATH +export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" + +# Set the core file limit to unlimited so a core file is generated upon crash +ulimit -c unlimited -S -- cgit v1.2.1