Disable app_bundle and lib_bundle when running configure tests

Just like configure.prf.

Change-Id: I760e0ca5bec41b3befb738a8a7a468e8f1a15946
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-07-15 17:04:31 +02:00 committed by The Qt Project
parent c8cc4f162d
commit ba1aba61cc
56 changed files with 12 additions and 56 deletions

View File

@ -2,4 +2,3 @@ TARGET = arch
SOURCES = arch.cpp SOURCES = arch.cpp
CONFIG -= qt dylib release debug_and_release CONFIG -= qt dylib release debug_and_release
CONFIG += debug console CONFIG += debug console
mac:CONFIG -= app_bundle

View File

@ -1,6 +1,5 @@
SOURCES = avx.cpp SOURCES = avx.cpp
CONFIG -= qt dylib release debug_and_release CONFIG -= qt dylib release debug_and_release
CONFIG += debug console CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_AVX):error("This compiler does not support AVX") isEmpty(QMAKE_CFLAGS_AVX):error("This compiler does not support AVX")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX

View File

@ -1,6 +1,5 @@
SOURCES = avx2.cpp SOURCES = avx2.cpp
CONFIG -= qt dylib release debug_and_release CONFIG -= qt dylib release debug_and_release
CONFIG += debug console CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_AVX2):error("This compiler does not support AVX2") isEmpty(QMAKE_CFLAGS_AVX2):error("This compiler does not support AVX2")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2 else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_AVX2

View File

@ -1,3 +1,3 @@
SOURCES = c++11.cpp SOURCES = c++11.cpp
CONFIG += c++11 CONFIG += c++11
CONFIG -= qt app_bundle CONFIG -= qt

View File

@ -1,6 +1,5 @@
SOURCES = sse2.cpp SOURCES = sse2.cpp
CONFIG -= qt dylib release debug_and_release CONFIG -= qt dylib release debug_and_release
CONFIG += debug console CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSE2):error("This compiler does not support SSE2") isEmpty(QMAKE_CFLAGS_SSE2):error("This compiler does not support SSE2")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2 else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE2

View File

@ -1,6 +1,5 @@
SOURCES = sse3.cpp SOURCES = sse3.cpp
CONFIG -= qt dylib release debug_and_release CONFIG -= qt dylib release debug_and_release
CONFIG += debug console CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSE3):error("This compiler does not support SSE3") isEmpty(QMAKE_CFLAGS_SSE3):error("This compiler does not support SSE3")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE3 else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE3

View File

@ -1,6 +1,5 @@
SOURCES = sse4_1.cpp SOURCES = sse4_1.cpp
CONFIG -= qt dylib release debug_and_release CONFIG -= qt dylib release debug_and_release
CONFIG += debug console CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSE4_1):error("This compiler does not support SSE4.1") isEmpty(QMAKE_CFLAGS_SSE4_1):error("This compiler does not support SSE4.1")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_1 else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_1

View File

@ -1,6 +1,5 @@
SOURCES = sse4_2.cpp SOURCES = sse4_2.cpp
CONFIG -= qt dylib release debug_and_release CONFIG -= qt dylib release debug_and_release
CONFIG += debug console CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSE4_2):error("This compiler does not support SSE4.2") isEmpty(QMAKE_CFLAGS_SSE4_2):error("This compiler does not support SSE4.2")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_2 else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSE4_2

View File

@ -1,6 +1,5 @@
SOURCES = ssse3.cpp SOURCES = ssse3.cpp
CONFIG -= qt dylib release debug_and_release CONFIG -= qt dylib release debug_and_release
CONFIG += debug console CONFIG += debug console
mac:CONFIG -= app_bundle
isEmpty(QMAKE_CFLAGS_SSSE3):error("This compiler does not support SSSE3") isEmpty(QMAKE_CFLAGS_SSSE3):error("This compiler does not support SSSE3")
else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSSE3 else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_SSSE3

View File

@ -1,3 +1,3 @@
OBJECTIVE_SOURCES = coreservices.mm OBJECTIVE_SOURCES = coreservices.mm
LIBS += -framework CoreServices LIBS += -framework CoreServices
CONFIG -= app_bundle qt CONFIG -= qt

View File

@ -1,3 +1,3 @@
OBJECTIVE_SOURCES = corewlantest.mm OBJECTIVE_SOURCES = corewlantest.mm
LIBS += -framework CoreWLAN -framework Foundation LIBS += -framework CoreWLAN -framework Foundation
CONFIG -= app_bundle qt CONFIG -= qt

View File

@ -1,3 +1,2 @@
SOURCES = directfb.cpp SOURCES = directfb.cpp
CONFIG -= qt CONFIG -= qt
mac:CONFIG -= app_bundle

View File

@ -1,4 +1,3 @@
SOURCES = alsatest.cpp SOURCES = alsatest.cpp
LIBS+=-lasound LIBS+=-lasound
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle

View File

@ -26,7 +26,7 @@ CXXFLAGS="$SYSROOT_FLAG"
test -d "$OUTDIR/config.tests/arch" || mkdir -p "$OUTDIR/config.tests/arch" test -d "$OUTDIR/config.tests/arch" || mkdir -p "$OUTDIR/config.tests/arch"
cd "$OUTDIR/config.tests/arch" cd "$OUTDIR/config.tests/arch"
[ -f Makefile ] && $MAKE distclean >/dev/null 2>&1 [ -f Makefile ] && $MAKE distclean >/dev/null 2>&1
OUTDIR=$OUTDIR "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "$SRCDIR/config.tests/arch/arch$PROSUFFIX.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2 OUTDIR=$OUTDIR "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "CONFIG-=app_bundle" "$SRCDIR/config.tests/arch/arch$PROSUFFIX.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2
ARCH="" ARCH=""

View File

@ -1,4 +1,3 @@
SOURCES = clock-gettime.cpp SOURCES = clock-gettime.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
include(clock-gettime.pri) include(clock-gettime.pri)

View File

@ -1,4 +1,3 @@
SOURCES = clock-monotonic.cpp SOURCES = clock-monotonic.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
include(../clock-gettime/clock-gettime.pri) include(../clock-gettime/clock-gettime.pri)

View File

@ -67,7 +67,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1
# Make sure output from possible previous tests is gone # Make sure output from possible previous tests is gone
rm -f "$EXE" "${EXE}.exe" rm -f "$EXE" "${EXE}.exe"
set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" set -- "$OUTDIR/bin/qmake" -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_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then if [ "$VERBOSE" = "yes" ]; then
OUTDIR=$OUTDIR "$@" OUTDIR=$OUTDIR "$@"
$MAKE $MAKE

View File

@ -1,4 +1,3 @@
SOURCES = cups.cpp SOURCES = cups.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lcups LIBS += -lcups

View File

@ -1,4 +1,3 @@
SOURCES = db2.cpp SOURCES = db2.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -ldb2 LIBS += -ldb2

View File

@ -1,3 +1,2 @@
SOURCES = dbus.cpp SOURCES = dbus.cpp
CONFIG -= qt CONFIG -= qt
mac:CONFIG -= app_bundle

View File

@ -1,3 +1,2 @@
SOURCES = main.cpp SOURCES = main.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle

View File

@ -1,4 +1,4 @@
SOURCES = fontconfig.cpp SOURCES = fontconfig.cpp
CONFIG -= qt app_bundle CONFIG -= qt
LIBS += -lfreetype -lfontconfig LIBS += -lfreetype -lfontconfig
include(../../unix/freetype/freetype.pri) include(../../unix/freetype/freetype.pri)

View File

@ -1,4 +1,3 @@
SOURCES = getaddrinfotest.cpp SOURCES = getaddrinfotest.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += $$QMAKE_LIBS_NETWORK LIBS += $$QMAKE_LIBS_NETWORK

View File

@ -1,5 +1,4 @@
SOURCES = getifaddrs.cpp SOURCES = getifaddrs.cpp
CONFIG -= qt CONFIG -= qt
mac:CONFIG -= app_bundle
QT = QT =
LIBS += $$QMAKE_LIBS_NETWORK LIBS += $$QMAKE_LIBS_NETWORK

View File

@ -1,2 +1,2 @@
SOURCES = glib.cpp SOURCES = glib.cpp
CONFIG -= qt app_bundle CONFIG -= qt

View File

@ -1,4 +1,3 @@
SOURCES = gnu-libiconv.cpp SOURCES = gnu-libiconv.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -liconv LIBS += -liconv

View File

@ -1,4 +1,3 @@
SOURCES = ibase.cpp SOURCES = ibase.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lgds LIBS += -lgds

View File

@ -1,3 +1,3 @@
SOURCES = iconv.cpp SOURCES = iconv.cpp
CONFIG -= qt dylib app_bundle CONFIG -= qt dylib
mac|win32-g++*|qnx:LIBS += -liconv mac|win32-g++*|qnx:LIBS += -liconv

View File

@ -1,4 +1,4 @@
SOURCES = icu.cpp SOURCES = icu.cpp
CONFIG -= qt dylib app_bundle CONFIG -= qt dylib
unix:LIBS += -licuuc -licui18n unix:LIBS += -licuuc -licui18n
win32:LIBS += -licuin win32:LIBS += -licuin

View File

@ -1,3 +1,2 @@
SOURCES = inotifytest.cpp SOURCES = inotifytest.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle

View File

@ -1,4 +1,3 @@
SOURCES = iodbc.cpp SOURCES = iodbc.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -liodbc LIBS += -liodbc

View File

@ -1,5 +1,4 @@
SOURCES = ipv6ifname.cpp SOURCES = ipv6ifname.cpp
CONFIG -= qt CONFIG -= qt
mac:CONFIG -= app_bundle
QT = QT =
LIBS += $$QMAKE_LIBS_NETWORK LIBS += $$QMAKE_LIBS_NETWORK

View File

@ -1,4 +1,3 @@
SOURCES = libjpeg.cpp SOURCES = libjpeg.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -ljpeg LIBS += -ljpeg

View File

@ -1,4 +1,3 @@
SOURCES = libpng.cpp SOURCES = libpng.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lpng LIBS += -lpng

View File

@ -1,3 +1,2 @@
SOURCES = mremap.cpp SOURCES = mremap.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle

View File

@ -1,4 +1,3 @@
SOURCES = mysql.cpp SOURCES = mysql.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lmysqlclient LIBS += -lmysqlclient

View File

@ -1,4 +1,3 @@
SOURCES = ../mysql/mysql.cpp SOURCES = ../mysql/mysql.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lmysqlclient_r LIBS += -lmysqlclient_r

View File

@ -1,5 +1,4 @@
SOURCES = nis.cpp SOURCES = nis.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac: CONFIG -= app_bundle
solaris-*:LIBS += -lnsl solaris-*:LIBS += -lnsl
else:LIBS += $$QMAKE_LIBS_NIS else:LIBS += $$QMAKE_LIBS_NIS

View File

@ -1,4 +1,3 @@
SOURCES = oci.cpp SOURCES = oci.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lclntsh LIBS += -lclntsh

View File

@ -1,5 +1,4 @@
SOURCES = odbc.cpp SOURCES = odbc.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
win32-g++*:LIBS += -lodbc32 win32-g++*:LIBS += -lodbc32
else:LIBS += -lodbc else:LIBS += -lodbc

View File

@ -9,4 +9,3 @@ CONFIG -= qt
LIBS += $$QMAKE_LIBS_OPENGL LIBS += $$QMAKE_LIBS_OPENGL
mac:DEFINES += Q_OS_MAC mac:DEFINES += Q_OS_MAC
CONFIG -= app_bundle

View File

@ -9,5 +9,4 @@ CONFIG -= qt
LIBS += $$QMAKE_LIBS_OPENGL_ES1 LIBS += $$QMAKE_LIBS_OPENGL_ES1
mac { mac {
DEFINES += BUILD_ON_MAC DEFINES += BUILD_ON_MAC
CONFIG -= app_bundle
} }

View File

@ -9,5 +9,4 @@ CONFIG -= qt
LIBS += $$QMAKE_LIBS_OPENGL_ES2 LIBS += $$QMAKE_LIBS_OPENGL_ES2
mac { mac {
DEFINES += BUILD_ON_MAC DEFINES += BUILD_ON_MAC
CONFIG -= app_bundle
} }

View File

@ -1,3 +1,2 @@
SOURCES = openssl.cpp SOURCES = openssl.cpp
CONFIG -= x11 qt CONFIG -= x11 qt
mac:CONFIG -= app_bundle

View File

@ -1,3 +1,3 @@
SOURCES = pcre.cpp SOURCES = pcre.cpp
CONFIG -= qt dylib app_bundle CONFIG -= qt dylib
LIBS += -lpcre16 LIBS += -lpcre16

View File

@ -1,4 +1,3 @@
SOURCES = psql.cpp SOURCES = psql.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS *= -lpq LIBS *= -lpq

View File

@ -10,7 +10,7 @@ OUTDIR=$4
# build and run a test program # build and run a test program
test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize" test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize"
"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "CONFIG-=app_bundle" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1
cd "$OUTDIR/config.tests/unix/ptrsize" cd "$OUTDIR/config.tests/unix/ptrsize"
if [ "$VERBOSE" = "yes" ]; then if [ "$VERBOSE" = "yes" ]; then

View File

@ -1,3 +1,2 @@
SOURCES = ptrsizetest.cpp SOURCES = ptrsizetest.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle

View File

@ -1,4 +1,3 @@
SOURCES = slog2.cpp SOURCES = slog2.cpp
CONFIG -= qt CONFIG -= qt
mac:CONFIG -= app_bundle
LIBS += -lslog2 LIBS += -lslog2

View File

@ -1,3 +1,2 @@
SOURCES = sqlite.cpp SOURCES = sqlite.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle

View File

@ -1,4 +1,3 @@
SOURCES = sqlite2.cpp SOURCES = sqlite2.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lsqlite LIBS += -lsqlite

View File

@ -1,4 +1,3 @@
SOURCES = main.cpp SOURCES = main.cpp
CONFIG -= x11 qt CONFIG -= x11 qt
mac:CONFIG -= app_bundle

View File

@ -1,3 +1,2 @@
SOURCES = stltest.cpp SOURCES = stltest.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle

View File

@ -1,2 +1,2 @@
SOURCES = ../gnu-libiconv/gnu-libiconv.cpp SOURCES = ../gnu-libiconv/gnu-libiconv.cpp
CONFIG -= qt dylib app_bundle CONFIG -= qt dylib

View File

@ -1,4 +1,3 @@
SOURCES = tds.cpp SOURCES = tds.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lsybdb LIBS += -lsybdb

View File

@ -1,4 +1,3 @@
SOURCES = zlib.cpp SOURCES = zlib.cpp
CONFIG -= qt dylib CONFIG -= qt dylib
mac:CONFIG -= app_bundle
LIBS += -lz LIBS += -lz