From 90eee08b3e672573e3ad93470d844e1d498651dd Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Sat, 11 Jun 2016 22:49:01 +0200
Subject: Let qmake do most of the work of configuring Qt

Command line arguments, configure tests and features are now
defined in a json file and a configure.pri containing some
custom functions.

qmake uses the json file to determine command line arguments,
tests and features to be executed at configuration time.

A new qt_configure.prf contains all the infrastructure to parse
the command line, run the configure tests, determine the set of
available features and create a report about it.

Change-Id: If30ac089dd3e9f8c67ebd642bde10cfa960893bb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 config.tests/unix/compile.test | 109 -----------------------------------------
 1 file changed, 109 deletions(-)
 delete mode 100755 config.tests/unix/compile.test

(limited to 'config.tests')

diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
deleted file mode 100755
index f5db1847b8..0000000000
--- a/config.tests/unix/compile.test
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-
-SUCCESS=no
-QMKSPEC=$1
-XPLATFORM=`basename "$1"`
-QMAKE_CONFIG=$2
-VERBOSE=$3
-SRCDIR=$4
-OUTDIR=$5
-TEST=$6
-EXE=`basename "$6"`
-DESCRIPTION=$7
-QMAKE=$8
-QTCONF=$9
-shift 9
-LFLAGS="$SYSROOT_FLAG"
-INCLUDEPATH=""
-CFLAGS="$SYSROOT_FLAG"
-CXXFLAGS="$SYSROOT_FLAG"
-MAC_ARCH_CXXFLAGS=""
-MAC_ARCH_LFLAGS=""
-QMAKE_ARGS=
-while [ "$#" -gt 0 ]; do
-    PARAM=$1
-    case $PARAM in
-    -config)
-        QMAKE_CONFIG="$QMAKE_CONFIG $2"
-        shift
-        ;;
-    -framework)
-        LFLAGS="$LFLAGS -framework \"$2\""
-        shift
-        ;;
-    -arch)
-        MAC_ARCH_CFLAGS="$MAC_ARCH_CFLAGS -arch $2"
-        MAC_ARCH_CXXFLAGS="$MAC_ARCH_CXXFLAGS -arch $2"
-        MAC_ARCH_LFLAGS="$MAC_ARCH_LFLAGS -arch $2"
-        shift
-        ;;
-    -F*|-m*|-x*)
-        LFLAGS="$LFLAGS \"$PARAM\""
-        CFLAGS="$CFLAGS \"$PARAM\""
-        CXXFLAGS="$CXXFLAGS \"$PARAM\""
-        ;;
-    -L*|-l*|-pthread)
-        LFLAGS="$LFLAGS \"$PARAM\""
-	;;
-    -I*)
-        INC=`echo $PARAM | sed -e 's/^-I//'`
-        INCLUDEPATH="$INCLUDEPATH \"$INC\""
-        ;;
-    -f*|-D*)
-        CFLAGS="$CFLAGS \"$PARAM\""
-        CXXFLAGS="$CXXFLAGS \"$PARAM\""
-        ;;
-    -Qoption)
-	# Two-argument form for the Sun Compiler
-        CFLAGS="$CFLAGS $PARAM \"$2\""
-	CXXFLAGS="$CXXFLAGS $PARAM \"$2\""
-	shift
-	;;
-    *)
-        QMAKE_ARGS="$QMAKE_ARGS $PARAM"
-        ;;
-    esac
-    shift
-done
-
-test -d "$OUTDIR/$TEST" || mkdir -p "$OUTDIR/$TEST"
-
-cd "$OUTDIR/$TEST"
-
-test -r Makefile && $MAKE distclean >/dev/null 2>&1
-# Make sure output from possible previous tests is gone
-rm -f "$EXE" "${EXE}.exe"
-
-set -- \
-    "$QMAKE" \
-     -qtconf "$QTCONF" \
-     -nocache \
-     -spec "$QMKSPEC" \
-     "CONFIG+=$QMAKE_CONFIG" \
-     "CONFIG+=android_app" \
-     "CONFIG-=debug_and_release app_bundle lib_bundle" \
-     "LIBS+=$LFLAGS" \
-     "LIBS+=$MAC_ARCH_LFLAGS" \
-     "INCLUDEPATH*=$INCLUDEPATH" \
-     "QMAKE_CFLAGS*=$CFLAGS" \
-     "QMAKE_CFLAGS+=$MAC_ARCH_CFLAGS" \
-     "QMAKE_CXXFLAGS*=$CXXFLAGS" \
-     "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" \
-     $QMAKE_ARGS \
-     "$SRCDIR/$TEST/$EXE.pro" \
-     -o "$OUTDIR/$TEST/Makefile"
-if [ "$VERBOSE" = "yes" ]; then
-    echo
-    OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
-else
-    OUTDIR=$OUTDIR "$@" >/dev/null 2>&1 && $MAKE >/dev/null 2>&1 && SUCCESS=yes
-fi
-
-# done
-if [ "$SUCCESS" != "yes" ]; then
-    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION disabled." || echo " no."
-    exit 1
-else
-    [ "$VERBOSE" = "yes" ] && echo "$DESCRIPTION enabled." || echo " yes."
-    exit 0
-fi
-- 
cgit v1.2.3