diff --git a/tools/StripAndTarQtForAndroidMin.sh b/tools/StripAndTarQtForAndroidMin.sh deleted file mode 100755 index 548c74dfc31..00000000000 --- a/tools/StripAndTarQtForAndroidMin.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -if [ $# -eq 0 ]; then - echo 'Qt directory must be specified as argument' - exit 1 -fi -if [ ! -d $1 ] ; then - echo 'Qt directory not found' - exit 1 -fi -cd $1 -rm * -find . ! -name '5.8' -maxdepth 1 -type d -exec rm -rf {} + -cd 5.8 -find . ! -name 'android_armv7' -maxdepth 1 -type d -exec rm -rf {} + -cd clang_64 -rm -rf doc -cd $1 -cd .. -tar -jcvf Qt5.8.0-android-min.tar.bz2 $1 diff --git a/tools/StripAndTarQtForLinuxMin.sh b/tools/StripAndTarQtForLinuxMin.sh deleted file mode 100755 index b813c5b77b3..00000000000 --- a/tools/StripAndTarQtForLinuxMin.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -if [ $# -eq 0 ]; then - echo 'Qt directory must be specified as argument' - exit 1 -fi -if [ ! -d $1 ] ; then - echo 'Qt directory not found' - exit 1 -fi -cd $1 -rm * -find . ! -name '5.8' -maxdepth 1 -type d -exec rm -rf {} + -cd 5.8 -find . ! -name 'gcc_64' -maxdepth 1 -type d -exec rm -rf {} + -cd clang_64 -rm -rf doc -cd $1 -cd .. -tar -jcvf Qt5.8.0-linux-min.tar.bz2 $1 diff --git a/tools/StripAndTarQtForOSXMin.sh b/tools/StripAndTarQtForOSXMin.sh deleted file mode 100755 index 1e16db34ac1..00000000000 --- a/tools/StripAndTarQtForOSXMin.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -if [ $# -eq 0 ]; then - echo 'Qt directory must be specified as argument' - exit 1 -fi -if [ ! -d $1 ] ; then - echo 'Qt directory not found' - exit 1 -fi -cd $1 -rm * -find . ! -name '5.8' -maxdepth 1 -type d -exec rm -rf {} + -cd 5.8 -find . ! -name 'clang_64' -maxdepth 1 -type d -exec rm -rf {} + -cd clang_64 -rm -rf doc -cd lib -rm -rf *.dSYM -cd $1 -cd .. -tar -jcvf Qt5.8.0-mac-clang-min.tar.bz2 $1 diff --git a/tools/StripAndTarQtForiOSMin.sh b/tools/StripAndTarQtForiOSMin.sh deleted file mode 100755 index d50e537a2d5..00000000000 --- a/tools/StripAndTarQtForiOSMin.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -if [ $# -eq 0 ]; then - echo 'Qt directory must be specified as argument' - exit 1 -fi -if [ ! -d $1 ] ; then - echo 'Qt directory not found' - exit 1 -fi -cd $1 -rm * -find . ! -name '5.8' -maxdepth 1 -type d -exec rm -rf {} + -cd 5.8 -find . ! -name 'ios' -maxdepth 1 -type d -exec rm -rf {} + -cd ios -rm -rf doc -find . -type f -name 'lib*_debug.a' -delete -find . -type f -name 'lib*_debug.la' -delete -find . -type f -name 'lib*_debug.prl' -delete -cd .. -cd .. -cd .. -tar -jcvf Qt5.8.0-mac-ios-min.tar.bz2 $1 diff --git a/tools/get_xcode_version.sh b/tools/get_xcode_version.sh deleted file mode 100755 index 1ba8bf13206..00000000000 --- a/tools/get_xcode_version.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -xcodebuild -version 2>&1 | (head -n1) | awk '{print $2}' - diff --git a/tools/iosccachecc.sh b/tools/iosccachecc.sh deleted file mode 100755 index 01c52e0d3fa..00000000000 --- a/tools/iosccachecc.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -ccache $IOS_CCACHE_CC "$@" \ No newline at end of file diff --git a/tools/iosccachecxx.sh b/tools/iosccachecxx.sh deleted file mode 100755 index e9c075a2f0e..00000000000 --- a/tools/iosccachecxx.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -ccache $IOS_CCACHE_CXX "$@" \ No newline at end of file diff --git a/tools/patch_qt_for_xcode8.sh b/tools/patch_qt_for_xcode8.sh deleted file mode 100755 index dc0379e79db..00000000000 --- a/tools/patch_qt_for_xcode8.sh +++ /dev/null @@ -1,31 +0,0 @@ -XCODEVER=`xcodebuild -version 2>&1 | (head -n1) | awk '{print $2}'` -echo "Testing Xcode version: $XCODEVER" -IOSDIR=/tmp/ios -OSXDIR=/tmp/$QT_DIR -if [ X"$TRAVIS_BUILD_DIR" == "X" ]; then - echo "missing TRAVIS_BUILD_DIR" - exit 1 -fi -#IOSDIR=/Applications/Qt/5.5/ios -#OSXDIR=/Applications/Qt/5.5/clang_64 -#TRAVIS_BUILD_DIR=/Users/gus/github/work/qgroundcontrol -if [ "$XCODEVER" == "8.0" ]; then - if [ -d $OSXDIR/bin ]; then - QTVER=`$OSXDIR/bin/qmake -version | grep "Using Qt" | awk '{print $4}'` - echo "Testing Qt Version: $QTVER" - if [ "$QTVER" == "5.5.1" ]; then - echo "Found Xcode $XCODEVER for OSX. Applying patch:" - cd $OSXDIR 2> /dev/null && \ - patch -N -p7 < ${TRAVIS_BUILD_DIR}/tools/qt_macos_xcode8.patch # 2>&1 > /dev/null - fi - fi - if [ -d $IOSDIR/bin ]; then - QTVER=`$IOSDIR/bin/qmake -version | grep "Using Qt" | awk '{print $4}'` - echo "Testing Qt Version: $QTVER" - if [ "$QTVER" == "5.5.1" ]; then - echo "Found Xcode $XCODEVER for iOS. Applying patch:" - cd $IOSDIR 2> /dev/null && \ - patch -N -p7 < ${TRAVIS_BUILD_DIR}/tools/qt_ios_xcode8.patch # 2>&1 > /dev/null - fi - fi -fi diff --git a/tools/qt_ios_xcode8.patch b/tools/qt_ios_xcode8.patch deleted file mode 100644 index 090e1b3485f..00000000000 --- a/tools/qt_ios_xcode8.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur /Volumes/BootCopy/Applications/Qt/5.5/ios/mkspecs/features/mac/default_pre.prf mkspecs/features/mac/default_pre.prf ---- /Volumes/BootCopy/Applications/Qt/5.5/ios/mkspecs/features/mac/default_pre.prf 2015-10-12 18:59:25.000000000 -0400 -+++ mkspecs/features/mac/default_pre.prf 2016-09-18 19:53:59.000000000 -0400 -@@ -12,7 +12,7 @@ - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") - - # Make sure Xcode is set up properly -- isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \ -+ isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ - error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") - } - -diff -Naur /Volumes/BootCopy/Applications/Qt/5.5/ios/mkspecs/macx-ios-clang/features/sdk.prf mkspecs/macx-ios-clang/features/sdk.prf ---- /Volumes/BootCopy/Applications/Qt/5.5/ios/mkspecs/macx-ios-clang/features/sdk.prf 2015-10-12 18:59:26.000000000 -0400 -+++ mkspecs/macx-ios-clang/features/sdk.prf 2016-09-18 19:53:57.000000000 -0400 -@@ -11,8 +11,9 @@ - - load(sdk) - --lessThan(QMAKE_MAC_SDK_VERSION, "8.0"): \ -- error("Current $$QMAKE_MAC_SDK SDK version ($$QMAKE_MAC_SDK_VERSION) is too old. Please upgrade Xcode.") -+#-- This is a string compare and "10.0" is less then "8.0" -+#lessThan(QMAKE_MAC_SDK_VERSION, "8.0"): \ -+# error("Current $$QMAKE_MAC_SDK SDK version ($$QMAKE_MAC_SDK_VERSION) is too old. Please upgrade Xcode.") - - macx-xcode { - sdk_path_iphoneos.name = "QMAKE_MAC_SDK_PATH[sdk=iphoneos*]" diff --git a/tools/qt_macos_xcode8.patch b/tools/qt_macos_xcode8.patch deleted file mode 100644 index 1de019f7d47..00000000000 --- a/tools/qt_macos_xcode8.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur /Volumes/BootCopy/Applications/Qt/5.5/clang_64/mkspecs/features/mac/default_pre.prf mkspecs/features/mac/default_pre.prf ---- /Volumes/BootCopy/Applications/Qt/5.5/clang_64/mkspecs/features/mac/default_pre.prf 2015-10-12 19:40:39.000000000 -0400 -+++ mkspecs/features/mac/default_pre.prf 2016-09-18 19:54:02.000000000 -0400 -@@ -12,7 +12,7 @@ - error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") - - # Make sure Xcode is set up properly -- isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \ -+ isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ - error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") - } - diff --git a/tools/update_ios_version.sh b/tools/update_ios_version.sh deleted file mode 100755 index 3d5b79a7e45..00000000000 --- a/tools/update_ios_version.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# this requires `master` in the git tree -# travis-ci branch builds are unable to set the version properly - -PLIST_FILE_SRC=$1 -PLIST_FILE_DST=$2 - -BUILD_CODE=`git rev-list master --first-parent --count` -VERSION_CODE=`git describe --always --tags | sed -e 's/[^0-9.]*\([0-9.]*\).*/\1/'` - -if [ -z "$BUILD_CODE" -o -z "$VERSION_CODE" ]; then - echo "Error: Version and/or build empty." - exit 1 # Cause the build to fail -else - echo "Version: ${VERSION_CODE}" - echo "Build: ${BUILD_CODE}" -fi - -sed -e "s/\###BUILD###/${BUILD_CODE}/" -e "s/\###VERSION###/${VERSION_CODE}/" $PLIST_FILE_SRC > $PLIST_FILE_DST