diff --git a/tools/autobuild/build.sh b/tools/autobuild/build.sh index 38ca4767bc..0704c96d57 100644 --- a/tools/autobuild/build.sh +++ b/tools/autobuild/build.sh @@ -42,17 +42,6 @@ StripCygwinPrefix() { # 3rd param: additional qmake parameters BuildQt() { ( - SHADOW_DIR="$1" - MKSPEC="$2" - QMAKE_PARAMS="$3" - - mkdir -p "$SHADOW_DIR" - cd "$SHADOW_DIR" - echo "Launching qmake..." - # This call is needed to correctly rebuild c++ sources after switching between branches with added or removed source files. - # Otherwise we get build errors. - "$QMAKE" -r CONFIG-=sdk "$QMAKE_PARAMS" -spec "$(StripCygwinPrefix $MKSPEC)" "$(StripCygwinPrefix $MY_PATH)/../../omim.pro" -# make clean > /dev/null || true - make -j $(GetCPUCores) + echo "ERROR! The script is obsolete. Rewrite with cmake" ) } diff --git a/tools/autobuild/detect_qmake.sh b/tools/autobuild/detect_qmake.sh deleted file mode 100755 index 7632b87777..0000000000 --- a/tools/autobuild/detect_qmake.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -set -e -u - -# If QMAKE variable is set, use it -[ -n "${QMAKE-}" -a -x "${QMAKE-}" ] && return 0 - -# Add your path into this array -KNOWN_QMAKE_PATHS=( \ - ~/Developer/Qt/5.8/clang_64/bin/qmake \ -) - -# Prints path to directory with found qmake binary or prints nothing if not found -# Returns 1 in case of not found and 0 in case of success -if QMAKE="$(which qmake-qt5)"; then - return 0 -elif QMAKE="$(which qmake)"; then - return 0 -else - # qmake binary is not in the path, look for it in the given array - for path in "${KNOWN_QMAKE_PATHS[@]}"; do - if [ -x "$path" ]; then - QMAKE="$path" - return 0 - fi - done -fi - -# Not found -echo "ERROR: qmake was not found, please add it to your PATH or into the tools/autobuild/detect_qmake.sh" -exit 1