From 33906e74ae0715fea6a8ea01d5257bb157d5234b Mon Sep 17 00:00:00 2001 From: Sergei Ilinykh Date: Thu, 14 Mar 2024 17:29:29 +0300 Subject: [PATCH] Remove obsoleted files --- 3rdparty/stringprep/stringprep.pri | 7 - 3rdparty/stringprep/stringprep.pro | 8 - bundled.cmake | 2 - common.pri | 19 - conf_win.pri.example | 17 - confapp.pri | 6 - confapp_win.pri.example | 17 - configure | 2517 ------------------- configure.exe | Bin 124424 -> 0 bytes iris.pri | 43 - iris.pro | 22 - iris.qc | 31 - qcm/README | 5 - qcm/b2.qcm | 69 - qcm/buildmode.qcm | 184 -- qcm/extra.qcm | 78 - qcm/qca.qcm | 180 -- qcm/qjdns.qcm | 69 - qcm/qt42.qcm | 19 - qcm/universal.qcm | 45 - qcm/zlib.qcm | 52 - src/irisnet/appledns/appledns.pri | 6 - src/irisnet/appledns/appledns.pro | 14 - src/irisnet/appledns/sdtest.pro | 9 - src/irisnet/corelib/corelib.pri | 52 - src/irisnet/corelib/corelib.pro | 17 - src/irisnet/irisnet.pro | 15 - src/irisnet/noncore/cutestuff/cutestuff.pri | 15 - src/irisnet/noncore/legacy/legacy.pri | 7 - src/irisnet/noncore/noncore.pri | 55 - src/irisnet/noncore/noncore.pro | 15 - src/libbase.pri | 8 - src/src.pro | 10 - src/xmpp/base/base.pri | 11 - src/xmpp/base/unittest/unittest.pri | 3 - src/xmpp/base/unittest/unittest.pro | 4 - src/xmpp/blake2/blake2.pri | 18 - src/xmpp/common.pri | 3 - src/xmpp/jid/jid.pri | 8 - src/xmpp/jid/unittest/unittest.pri | 2 - src/xmpp/jid/unittest/unittest.pro | 4 - src/xmpp/modules.pri | 7 - src/xmpp/qa/qttestutil/example/example.pro | 23 - src/xmpp/qa/qttestutil/qttestutil.pri | 5 - src/xmpp/qa/unittest.pri | 28 - src/xmpp/qa/unittest.template/unittest.pri | 2 - src/xmpp/qa/unittest.template/unittest.pro | 4 - src/xmpp/qa/unittests.pri | 4 - src/xmpp/qa/unittests/unittests.pro | 6 - src/xmpp/sasl/sasl.pri | 18 - src/xmpp/sasl/unittest/unittest.pri | 5 - src/xmpp/sasl/unittest/unittest.pro | 12 - src/xmpp/xmpp.pri | 136 - src/xmpp/xmpp.pro | 17 - src/xmpp/zlib/zlib.pri | 10 - tools/icetunnel/icetunnel.pro | 20 - tools/nettool/nettool.pro | 31 - tools/tools.pro | 2 - tools/xmpptest/xmpptest.pro | 10 - 59 files changed, 4006 deletions(-) delete mode 100644 3rdparty/stringprep/stringprep.pri delete mode 100644 3rdparty/stringprep/stringprep.pro delete mode 100644 bundled.cmake delete mode 100644 common.pri delete mode 100644 conf_win.pri.example delete mode 100644 confapp.pri delete mode 100644 confapp_win.pri.example delete mode 100755 configure delete mode 100644 configure.exe delete mode 100644 iris.pri delete mode 100644 iris.pro delete mode 100644 iris.qc delete mode 100644 qcm/README delete mode 100644 qcm/b2.qcm delete mode 100644 qcm/buildmode.qcm delete mode 100644 qcm/extra.qcm delete mode 100644 qcm/qca.qcm delete mode 100644 qcm/qjdns.qcm delete mode 100644 qcm/qt42.qcm delete mode 100644 qcm/universal.qcm delete mode 100644 qcm/zlib.qcm delete mode 100644 src/irisnet/appledns/appledns.pri delete mode 100644 src/irisnet/appledns/appledns.pro delete mode 100644 src/irisnet/appledns/sdtest.pro delete mode 100644 src/irisnet/corelib/corelib.pri delete mode 100644 src/irisnet/corelib/corelib.pro delete mode 100644 src/irisnet/irisnet.pro delete mode 100644 src/irisnet/noncore/cutestuff/cutestuff.pri delete mode 100644 src/irisnet/noncore/legacy/legacy.pri delete mode 100644 src/irisnet/noncore/noncore.pri delete mode 100644 src/irisnet/noncore/noncore.pro delete mode 100644 src/libbase.pri delete mode 100644 src/src.pro delete mode 100644 src/xmpp/base/base.pri delete mode 100644 src/xmpp/base/unittest/unittest.pri delete mode 100644 src/xmpp/base/unittest/unittest.pro delete mode 100644 src/xmpp/blake2/blake2.pri delete mode 100644 src/xmpp/common.pri delete mode 100644 src/xmpp/jid/jid.pri delete mode 100644 src/xmpp/jid/unittest/unittest.pri delete mode 100644 src/xmpp/jid/unittest/unittest.pro delete mode 100644 src/xmpp/modules.pri delete mode 100644 src/xmpp/qa/qttestutil/example/example.pro delete mode 100644 src/xmpp/qa/qttestutil/qttestutil.pri delete mode 100644 src/xmpp/qa/unittest.pri delete mode 100644 src/xmpp/qa/unittest.template/unittest.pri delete mode 100644 src/xmpp/qa/unittest.template/unittest.pro delete mode 100644 src/xmpp/qa/unittests.pri delete mode 100644 src/xmpp/qa/unittests/unittests.pro delete mode 100644 src/xmpp/sasl/sasl.pri delete mode 100644 src/xmpp/sasl/unittest/unittest.pri delete mode 100644 src/xmpp/sasl/unittest/unittest.pro delete mode 100644 src/xmpp/xmpp.pri delete mode 100644 src/xmpp/xmpp.pro delete mode 100644 src/xmpp/zlib/zlib.pri delete mode 100644 tools/icetunnel/icetunnel.pro delete mode 100644 tools/nettool/nettool.pro delete mode 100644 tools/tools.pro delete mode 100644 tools/xmpptest/xmpptest.pro diff --git a/3rdparty/stringprep/stringprep.pri b/3rdparty/stringprep/stringprep.pri deleted file mode 100644 index 9c0767ce..00000000 --- a/3rdparty/stringprep/stringprep.pri +++ /dev/null @@ -1,7 +0,0 @@ -SOURCES *= $$PWD/rfc3454.cpp \ - $$PWD/stringprep.cpp \ - $$PWD/profiles.cpp -HEADERS *= $$PWD/rfc3454.h - $$PWD/qstringprep.h -INCLUDEPATH *= $$PWD -OTHER_FILES *= $$PWD/CMakeLists.txt $$PWD/COPYING diff --git a/3rdparty/stringprep/stringprep.pro b/3rdparty/stringprep/stringprep.pro deleted file mode 100644 index 5845e5c9..00000000 --- a/3rdparty/stringprep/stringprep.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = lib -TARGET = stringprep -DESTDIR = $$IRIS_BASE/lib -CONFIG += staticlib create_prl -OBJECTS_DIR = .obj -MOC_DIR = .moc -UI_DIR = .ui -include($$PWD/stringprep.pri) diff --git a/bundled.cmake b/bundled.cmake deleted file mode 100644 index b9dc4842..00000000 --- a/bundled.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(IRIS_ENABLE_INSTALL OFF CACHE BOOL "Install iris headers" FORCE) -add_subdirectory( ${CMAKE_CURRENT_LIST_DIR} ) diff --git a/common.pri b/common.pri deleted file mode 100644 index 99da6d0a..00000000 --- a/common.pri +++ /dev/null @@ -1,19 +0,0 @@ -# common stuff for iris.pro and iris.pri - -CONFIG -= c++11 -CONFIG += c++14 - -# default build configuration -!iris_build_pri { - # build appledns on mac - mac:CONFIG += appledns - - # bundle appledns inside of irisnetcore on mac - mac:CONFIG += appledns_bundle - - # bundle irisnetcore inside of iris - CONFIG += irisnetcore_bundle - - # don't build iris, app will include iris.pri - #CONFIG += iris_bundle -} diff --git a/conf_win.pri.example b/conf_win.pri.example deleted file mode 100644 index c8ad428b..00000000 --- a/conf_win.pri.example +++ /dev/null @@ -1,17 +0,0 @@ -load(winlocal.prf) - -# qca -CONFIG += crypto - -# zlib -INCLUDEPATH += $$WINLOCAL_PREFIX/include -LIBS += -L$$WINLOCAL_PREFIX/lib - -# zlib may have a different lib name depending on how it was compiled -win32-g++ { - LIBS += -lz -} -else { - LIBS += -lzlib # static - #LIBS += -lzdll # dll -} diff --git a/confapp.pri b/confapp.pri deleted file mode 100644 index 9febe572..00000000 --- a/confapp.pri +++ /dev/null @@ -1,6 +0,0 @@ -unix:exists(confapp_unix.pri):include(confapp_unix.pri) -windows:exists(confapp_win.pri):include(confapp_win.pri) - -include(common.pri) - -mac:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 diff --git a/confapp_win.pri.example b/confapp_win.pri.example deleted file mode 100644 index c8ad428b..00000000 --- a/confapp_win.pri.example +++ /dev/null @@ -1,17 +0,0 @@ -load(winlocal.prf) - -# qca -CONFIG += crypto - -# zlib -INCLUDEPATH += $$WINLOCAL_PREFIX/include -LIBS += -L$$WINLOCAL_PREFIX/lib - -# zlib may have a different lib name depending on how it was compiled -win32-g++ { - LIBS += -lz -} -else { - LIBS += -lzlib # static - #LIBS += -lzdll # dll -} diff --git a/configure b/configure deleted file mode 100755 index 9d8c8370..00000000 --- a/configure +++ /dev/null @@ -1,2517 +0,0 @@ -#!/bin/sh -# -# Generated by qconf 2.0 ( https://github.com/psi-plus/qconf ) -# - -show_usage() { -cat </dev/null` - if echo $WHICH | grep 'shell built-in command' >/dev/null 2>&1; then - WHICH=which - elif [ -z "$WHICH" ]; then - if which which >/dev/null 2>&1; then - WHICH=which - else - for a in /usr/ucb /usr/bin /bin /usr/local/bin; do - if [ -x $a/which ]; then - WHICH=$a/which - break - fi - done - fi - fi - - RET_CODE=1 - if [ -z "$WHICH" ]; then - OLD_IFS=$IFS - IFS=: - for a in $PATH; do - if [ -x $a/$1 ]; then - echo "$a/$1" - RET_CODE=0 - [ -z "$ALL_MATCHES" ] && break - fi - done - IFS=$OLD_IFS - export IFS - else - a=`"$WHICH" "$ALL_MATCHES" "$1" 2>/dev/null` - if [ ! -z "$a" -a -x "$a" ]; then - echo "$a" - RET_CODE=0 - fi - fi - HOME=$OLD_HOME - export HOME - return $RET_CODE -} -WHICH=which_command - -# find a make command -if [ -z "$MAKE" ]; then - MAKE= - for mk in gmake make; do - if $WHICH $mk >/dev/null 2>&1; then - MAKE=`$WHICH $mk` - break - fi - done - if [ -z "$MAKE" ]; then - echo "You don't seem to have 'make' or 'gmake' in your PATH." - echo "Cannot proceed." - exit 1 - fi -fi - -show_qt_info() { - printf "Be sure you have a proper Qt 4.0+ build environment set up. This means not\n" - printf "just Qt, but also a C++ compiler, a make tool, and any other packages\n" - printf "necessary for compiling C++ programs.\n" - printf "\n" - printf "If you are certain everything is installed, then it could be that Qt is not\n" - printf "being recognized or that a different version of Qt is being detected by\n" - printf "mistake (for example, this could happen if \$QTDIR is pointing to a Qt 3\n" - printf "installation). At least one of the following conditions must be satisfied:\n" - printf "\n" - printf " 1) --qtdir is set to the location of Qt\n" - printf " 2) \$QTDIR is set to the location of Qt\n" - printf " 3) QtCore is in the pkg-config database\n" - printf " 4) qmake is in the \$PATH\n" - printf "\n" - printf "This script will use the first one it finds to be true, checked in the above\n" - printf "order. #3 and #4 are the recommended options. #1 and #2 are mainly for\n" - printf "overriding the system configuration.\n" - printf "\n" -} - -while [ $# -gt 0 ]; do - optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - case "$1" in - --qtdir=*) - EX_QTDIR=$optarg - shift - ;; - - --static) - QC_STATIC="Y" - shift - ;; - - --extraconf=*) - QC_EXTRACONF=$optarg - shift - ;; - - --release) - QC_RELEASE="Y" - shift - ;; - - --debug) - QC_DEBUG="Y" - shift - ;; - - --debug-and-release) - QC_DEBUG_AND_RELEASE="Y" - shift - ;; - - --no-separate-debug-info) - QC_NO_SEPARATE_DEBUG_INFO="Y" - shift - ;; - - --separate-debug-info) - QC_SEPARATE_DEBUG_INFO="Y" - shift - ;; - - --no-framework) - QC_NO_FRAMEWORK="Y" - shift - ;; - - --framework) - QC_FRAMEWORK="Y" - shift - ;; - - --universal) - QC_UNIVERSAL="Y" - shift - ;; - - --mac-sdk=*) - QC_MAC_SDK=$optarg - shift - ;; - - --enable-tests) - QC_ENABLE_TESTS="Y" - shift - ;; - - --with-qca-inc=*) - QC_WITH_QCA_INC=$optarg - shift - ;; - - --with-qca-lib=*) - QC_WITH_QCA_LIB=$optarg - shift - ;; - - --with-zlib-inc=*) - QC_WITH_ZLIB_INC=$optarg - shift - ;; - - --with-zlib-lib=*) - QC_WITH_ZLIB_LIB=$optarg - shift - ;; - - --with-qjdns-inc=*) - QC_WITH_QJDNS_INC=$optarg - shift - ;; - - --with-qjdns-lib=*) - QC_WITH_QJDNS_LIB=$optarg - shift - ;; - - --with-b2-inc=*) - QC_WITH_B2_INC=$optarg - shift - ;; - - --with-b2-lib=*) - QC_WITH_B2_LIB=$optarg - shift - ;; - - --verbose) - QC_VERBOSE="Y" - shift - ;; - --qtselect=*) - QC_QTSELECT="${optarg}" - shift - ;; - --help) show_usage; exit ;; - *) echo "configure: WARNING: unrecognized options: $1" >&2; shift; ;; - esac -done - - -echo "Configuring Iris ..." - -if [ "$QC_VERBOSE" = "Y" ]; then -echo -echo EX_QTDIR=$EX_QTDIR -echo QC_STATIC=$QC_STATIC -echo QC_EXTRACONF=$QC_EXTRACONF -echo QC_RELEASE=$QC_RELEASE -echo QC_DEBUG=$QC_DEBUG -echo QC_DEBUG_AND_RELEASE=$QC_DEBUG_AND_RELEASE -echo QC_NO_SEPARATE_DEBUG_INFO=$QC_NO_SEPARATE_DEBUG_INFO -echo QC_SEPARATE_DEBUG_INFO=$QC_SEPARATE_DEBUG_INFO -echo QC_NO_FRAMEWORK=$QC_NO_FRAMEWORK -echo QC_FRAMEWORK=$QC_FRAMEWORK -echo QC_UNIVERSAL=$QC_UNIVERSAL -echo QC_MAC_SDK=$QC_MAC_SDK -echo QC_ENABLE_TESTS=$QC_ENABLE_TESTS -echo QC_WITH_QCA_INC=$QC_WITH_QCA_INC -echo QC_WITH_QCA_LIB=$QC_WITH_QCA_LIB -echo QC_WITH_ZLIB_INC=$QC_WITH_ZLIB_INC -echo QC_WITH_ZLIB_LIB=$QC_WITH_ZLIB_LIB -echo QC_WITH_QJDNS_INC=$QC_WITH_QJDNS_INC -echo QC_WITH_QJDNS_LIB=$QC_WITH_QJDNS_LIB -echo QC_WITH_B2_INC=$QC_WITH_B2_INC -echo QC_WITH_B2_LIB=$QC_WITH_B2_LIB -echo -fi - -printf "Verifying Qt build environment ... " - -if [ -z "$QC_QTSELECT" ]; then - QC_QTSELECT="$(echo $QT_SELECT | tr -d "qt")" -fi - -if [ ! -z "$QC_QTSELECT" ]; then - QTSEARCHTEXT="$QC_QTSELECT" -else - QTSEARCHTEXT="4 or 5" -fi - -# run qmake and check version -qmake_check() { - if [ -x "$1" ]; then - cmd="\"$1\" -query QT_VERSION" - if [ "$QC_VERBOSE" = "Y" ]; then - echo "running: $cmd" - fi - vout=`/bin/sh -c "$cmd" 2>&1` - case "${vout}" in - *.*.*) - vmaj="${vout%%.*}" - if [ ! -z "$QC_QTSELECT" ]; then - if [ "$vmaj" = "$QC_QTSELECT" ]; then - return 0 - fi - else - if [ "$vmaj" = "4" ] || [ "$vmaj" = "5" ]; then - return 0 - fi - fi - ;; - esac - if [ "$QC_VERBOSE" = "Y" ]; then - echo "Warning: $1 not for Qt ${QTSEARCHTEXT}" - fi - fi - return 1 -} - -if [ "$QC_VERBOSE" = "Y" ]; then - echo -fi - -qm="" -qt4_names="qmake-qt4 qmake4" -qt5_names="qmake-qt5 qmake5" -names="qmake" -if [ -z "$QC_QTSELECT" ]; then - names="${qt5_names} ${qt4_names} $names" -else - if [ "$QC_QTSELECT" = "4" ]; then - names="${qt4_names} $names" - elif [ "$QC_QTSELECT" -ge "5" ]; then - names="${qt5_names} $names" - fi -fi - -if [ -z "$qm" ] && [ ! -z "$EX_QTDIR" ]; then - # qt4 check: --qtdir - for n in $names; do - qstr=$EX_QTDIR/bin/$n - if qmake_check "$qstr"; then - qm=$qstr - break - fi - done - if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then - echo "Warning: qmake not found via --qtdir" - fi - -elif [ -z "$qm" ] && [ ! -z "$QTDIR" ]; then - # qt4 check: QTDIR - for n in $names; do - qstr=$QTDIR/bin/$n - if qmake_check "$qstr"; then - qm=$qstr - break - fi - done - if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then - echo "Warning: qmake not found via \$QTDIR" - fi - -else - # Try all other implicit checks - - # qtchooser - if [ -z "$qm" ]; then - qtchooser=$($WHICH qtchooser 2>/dev/null) - if [ ! -z "$qtchooser" ]; then - if [ ! -z "$QC_QTSELECT" ]; then - versions="$QC_QTSELECT" - else - cmd="$qtchooser --list-versions" - if [ "$QC_VERBOSE" = "Y" ]; then - echo "running: $cmd" - fi - versions=`$cmd` - fi - for version in $versions; do - cmd="$qtchooser -run-tool=qmake -qt=${version} -query QT_INSTALL_BINS" - if [ "$QC_VERBOSE" = "Y" ]; then - echo "running: $cmd" - fi - qtbins=`$cmd 2>/dev/null` - if [ ! -z "$qtbins" ] && qmake_check "$qtbins/qmake"; then - qm="$qtbins/qmake" - break - fi - done - fi - fi - if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then - echo "Warning: qmake not found via qtchooser" - fi - - # qt4: pkg-config - if [ -z "$qm" ]; then - cmd="pkg-config QtCore --variable=exec_prefix" - if [ "$QC_VERBOSE" = "Y" ]; then - echo "running: $cmd" - fi - str=`$cmd 2>/dev/null` - if [ ! -z "$str" ]; then - for n in $names; do - qstr=$str/bin/$n - if qmake_check "$qstr"; then - qm=$qstr - break - fi - done - fi - fi - if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then - echo "Warning: qmake not found via pkg-config" - fi - - # qmake in PATH - if [ -z "$qm" ]; then - for n in $names; do - qstr=`$WHICH -a $n 2>/dev/null` - for q in $qstr; do - if qmake_check "$q"; then - qm="$q" - break - fi - done - if [ ! -z "$qm" ]; then - break - fi - done - fi - if [ -z "$qm" ] && [ "$QC_VERBOSE" = "Y" ]; then - echo "Warning: qmake not found via \$PATH" - fi - - # end of implicit checks -fi - -if [ -z "$qm" ]; then - if [ "$QC_VERBOSE" = "Y" ]; then - echo " -> fail" - else - echo "fail" - fi - printf "\n" - printf "Reason: Unable to find the 'qmake' tool for Qt ${QTSEARCHTEXT}.\n" - printf "\n" - show_qt_info - exit 1; -fi -if [ "$QC_VERBOSE" = "Y" ]; then - echo qmake found in "$qm" -fi - -# try to determine the active makespec -defmakespec=$QMAKESPEC -if [ -z "$defmakespec" ]; then - if $WHICH readlink >/dev/null 2>&1; then - READLINK=`$WHICH readlink` - fi - if [ ! -z "$READLINK" ]; then - qt_mkspecsdir=`"$qm" -query QT_INSTALL_DATA`/mkspecs - if [ -d "$qt_mkspecsdir" ] && [ -h "$qt_mkspecsdir/default" ]; then - defmakespec=`$READLINK $qt_mkspecsdir/default` - fi - fi -fi - -if [ "$QC_VERBOSE" = "Y" ]; then - echo makespec is $defmakespec -fi - -qm_spec="" -# if the makespec is macx-xcode, force macx-g++ -if [ "$defmakespec" = "macx-xcode" ]; then - qm_spec=macx-g++ - QMAKESPEC=$qm_spec - export QMAKESPEC - if [ "$QC_VERBOSE" = "Y" ]; then - echo overriding makespec to $qm_spec - fi -fi - -gen_files() { -cat >"$1/modules.cpp" <= 4.2 ------END QCMOD----- -*/ -class qc_qt42 : public ConfObj -{ -public: - qc_qt42(Conf *c) : ConfObj(c) {} - QString name() const { return "Qt >= 4.2"; } - QString shortname() const { return "qt42"; } - bool exec() - { - conf->debug(QString("QT_VERSION = 0x%1").arg(QString::number(QT_VERSION, 16))); - if(QT_VERSION >= 0x040200) - return true; - else - return false; - } -}; -#line 1 "buildmode.qcm" -/* ------BEGIN QCMOD----- -name: buildmode -section: project -arg: release,Build with debugging turned off (default). -arg: debug,Build with debugging turned on. -arg: debug-and-release,Build two versions, with and without debugging turned on (mac only). -arg: no-separate-debug-info,Do not store debug information in a separate file (default for mac). -arg: separate-debug-info,Strip debug information into a separate .debug file (default for non-mac). -arg: no-framework,Do not build as a Mac framework. -arg: framework,Build as a Mac framework (default). ------END QCMOD----- -*/ - -#define QC_BUILDMODE -bool qc_buildmode_release = false; -bool qc_buildmode_debug = false; -bool qc_buildmode_framework = false; -bool qc_buildmode_separate_debug_info = false; - -class qc_buildmode : public ConfObj -{ -public: - qc_buildmode(Conf *c) : ConfObj(c) {} - QString name() const { return "buildmode"; } - QString shortname() const { return "buildmode"; } - - // no output - QString checkString() const { return QString(); } - - bool exec() - { - // first, parse out the options - bool opt_release = false; - bool opt_debug = false; - bool opt_debug_and_release = false; - bool opt_no_framework = false; - bool opt_framework = false; - bool opt_no_separate_debug_info = false; - bool opt_separate_debug_info = false; - - if(conf->getenv("QC_RELEASE") == "Y") - opt_release = true; - if(conf->getenv("QC_DEBUG") == "Y") - opt_debug = true; - if(conf->getenv("QC_DEBUG_AND_RELEASE") == "Y") - opt_debug_and_release = true; - if(conf->getenv("QC_NO_FRAMEWORK") == "Y") - opt_no_framework = true; - if(conf->getenv("QC_FRAMEWORK") == "Y") - opt_framework = true; - if(conf->getenv("QC_NO_SEPARATE_DEBUG_INFO") == "Y") - opt_no_separate_debug_info = true; - if(conf->getenv("QC_SEPARATE_DEBUG_INFO") == "Y") - opt_separate_debug_info = true; - - bool staticmode = false; - if(conf->getenv("QC_STATIC") == "Y") - staticmode = true; - -#ifndef Q_OS_MAC - if(opt_debug_and_release) - { - printf("\\nError: The --debug-and-release option is for mac only.\\n"); - exit(1); - } - - if(opt_framework) - { - printf("\\nError: The --framework option is for mac only.\\n"); - exit(1); - } -#endif - - if(opt_framework && opt_debug) - { - printf("\\nError: Cannot use both --framework and --debug.\\n"); - exit(1); - } - - // sanity check exclusive options - int x; - - // build mode - x = 0; - if(opt_release) - ++x; - if(opt_debug) - ++x; - if(opt_debug_and_release) - ++x; - if(x > 1) - { - printf("\\nError: Use only one of --release, --debug, or --debug-and-release.\\n"); - exit(1); - } - - // framework - if(opt_framework && staticmode) - { - printf("\\nError: Cannot use both --framework and --static.\\n"); - exit(1); - } - - x = 0; - if(opt_no_framework) - ++x; - if(opt_framework) - ++x; - if(x > 1) - { - printf("\\nError: Use only one of --framework or --no-framework.\\n"); - exit(1); - } - - // debug info - x = 0; - if(opt_no_separate_debug_info) - ++x; - if(opt_separate_debug_info) - ++x; - if(x > 1) - { - printf("\\nError: Use only one of --separate-debug-info or --no-separate-debug-info\\n"); - exit(1); - } - - // now process the options - - if(opt_release) - qc_buildmode_release = true; - else if(opt_debug) - qc_buildmode_debug = true; - else if(opt_debug_and_release) - { - qc_buildmode_release = true; - qc_buildmode_debug = true; - } - else // default - qc_buildmode_release = true; - - if(opt_framework) - qc_buildmode_framework = true; - else if(opt_no_framework) - { - // nothing to do - } - else // default - { - if(!staticmode && !opt_debug) - qc_buildmode_framework = true; - } - - if(opt_separate_debug_info) - qc_buildmode_separate_debug_info = true; - else if(opt_no_separate_debug_info) - { - // nothing to do - } - else // default - { -#ifndef Q_OS_MAC - qc_buildmode_separate_debug_info = true; -#endif - } - - // make the string - QStringList opts; - QString other; - - if(qc_buildmode_release && qc_buildmode_debug) - { - opts += "debug_and_release"; - opts += "build_all"; - } - else if(qc_buildmode_release) - opts += "release"; - else // qc_buildmode_debug - opts += "debug"; - -#ifdef Q_OS_MAC - if(qc_buildmode_framework) - opts += "lib_bundle"; -#endif - - if(qc_buildmode_separate_debug_info) - { - opts += "separate_debug_info"; - other += "QMAKE_CFLAGS += -g\\n"; - other += "QMAKE_CXXFLAGS += -g\\n"; - } - - QString str = QString("CONFIG += ") + opts.join(" ") + '\\n'; - conf->addExtra(str); - - if(!other.isEmpty()) - conf->addExtra(other); - - return true; - } -}; -#line 1 "universal.qcm" -/* ------BEGIN QCMOD----- -name: Mac universal binary support -section: project -arg: universal,Build with Mac universal binary support. -arg: mac-sdk=[path],Path to Mac universal SDK (PPC host only). ------END QCMOD----- -*/ - -#define QC_UNIVERSAL -bool qc_universal_enabled = false; -QString qc_universal_sdk; - -//---------------------------------------------------------------------------- -// qc_universal -//---------------------------------------------------------------------------- -class qc_universal : public ConfObj -{ -public: - qc_universal(Conf *c) : ConfObj(c) {} - QString name() const { return "Mac universal binary support"; } - QString shortname() const { return "universal"; } - QString checkString() const { return QString(); } - - bool exec() - { -#ifdef Q_OS_MAC - if(qc_getenv("QC_UNIVERSAL") == "Y") - { - qc_universal_enabled = true; - - QString str = - "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\\n" - " CONFIG += x86 ppc\\n" - "}\\n"; - - QString sdk = qc_getenv("QC_MAC_SDK"); - if(!sdk.isEmpty()) - { - str += QString("QMAKE_MAC_SDK = %1\\n").arg(sdk); - qc_universal_sdk = sdk; - } - - conf->addExtra(str); - } -#endif - return true; - } -}; -#line 1 "qca.qcm" -/* ------BEGIN QCMOD----- -name: QCA >= 2.0 -arg: with-qca-inc=[path],Path to QCA include files -arg: with-qca-lib=[path],Path to QCA library or framework files ------END QCMOD----- -*/ - -// adapted from crypto.prf -static QString internal_crypto_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir) -{ - QString out = QString("QCA_INCDIR = %1\\n" - "QCA_LIBDIR = %2\\n" - "QMAKE_RPATHDIR = %2\\n" - "QCA_FRAMEWORKDIR = %3\\n" - "\\n" - "CONFIG *= qt\\n" - "\\n" - "LINKAGE =\\n" - "QCA_NAME = qca-qt5\\n" - "\\n" - "!isEmpty(QCA_FRAMEWORKDIR): {\\n" - " framework_dir = \$\$QCA_FRAMEWORKDIR\\n" - " exists(\$\$framework_dir/\$\${QCA_NAME}.framework) {\\n" - " #QMAKE_FRAMEWORKPATH *= \$\$framework_dir\\n" - " LIBS *= -F\$\$framework_dir\\n" - " INCLUDEPATH += \$\$framework_dir/\$\${QCA_NAME}.framework/Headers\\n" - " LINKAGE = -framework \$\${QCA_NAME}\\n" - " }\\n" - "}\\n" - "\\n" - "# else, link normally\\n" - "isEmpty(LINKAGE) {\\n" - " !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\\n" - " !isEmpty(QCA_LIBDIR):LIBS += -L\$\$QCA_LIBDIR\\n" - " LINKAGE = -l\$\${QCA_NAME}\\n" - " CONFIG(debug, debug|release) {\\n" - " windows:LINKAGE = -l\$\${QCA_NAME}d\\n" - " mac:LINKAGE = -l\$\${QCA_NAME}_debug\\n" - " }\\n" - "}\\n" - "\\n" - "LIBS += \$\$LINKAGE\\n") - .arg(incdir, libdir, frameworkdir); - return out; -} - -// set either libdir or frameworkdir, but not both -static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release, - bool debug, QString *_prf) -{ - QString proextra; - QString prf; - if (!incdir.isEmpty() || !libdir.isEmpty() || !frameworkdir.isEmpty()) { - prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir); - } else { - prf = "CONFIG += crypto\\n"; - } - proextra = "CONFIG += qt\\n" - "CONFIG -= debug_and_release debug release\\n" - "QT -= gui\\n"; - proextra += prf; - - QString str = "#include \\n" - "\\n" - "int main()\\n" - "{\\n" - " unsigned long x = QCA_VERSION;\\n" - " if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\\n" - "}\\n"; - - // test desired versions, potentially both release and debug - - if (release) { - int ret; - if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\\n", &ret) || ret != 0) - return false; - } - - if (debug) { - int ret; - if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\\n", &ret) || ret != 0) - return false; - } - - *_prf = prf; - return true; -} - -static bool qca_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug, - QString *prf) -{ - return qca_try(conf, incdir, libdir, QString(), release, debug, prf) - || qca_try(conf, incdir + "/Qca-qt5", libdir, QString(), release, debug, prf); -} - -static bool qca_try_framework(Conf *conf, const QString &frameworkdir, bool release, bool debug, QString *prf) -{ - return qca_try(conf, QString(), QString(), frameworkdir, release, debug, prf); -} - -static bool qca_try_ext_prf(Conf *conf, bool release, bool debug, QString *prf) -{ - return qca_try(conf, QString(), QString(), QString(), release, debug, prf); -} - -//---------------------------------------------------------------------------- -// qc_qca -//---------------------------------------------------------------------------- -class qc_qca : public ConfObj { -public: - qc_qca(Conf *c) : ConfObj(c) { } - QString name() const { return "QCA >= 2.0"; } - QString shortname() const { return "qca"; } - bool exec() - { - // get the build mode -#ifdef QC_BUILDMODE - bool release = qc_buildmode_release; - bool debug = qc_buildmode_debug; -#else - // else, default to just release mode - bool release = true; - bool debug = false; -#endif - - QString qca_incdir, qca_libdir, qca_crypto_prf; - qca_incdir = conf->getenv("QC_WITH_QCA_INC"); - qca_libdir = conf->getenv("QC_WITH_QCA_LIB"); - -#if defined(Q_OS_MAC) - if (!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf)) { - conf->addExtra(qca_crypto_prf); - return true; - } -#endif - - if (!qca_incdir.isEmpty() && !qca_libdir.isEmpty() - && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf)) { - conf->addExtra(qca_crypto_prf); - return true; - } - - if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf)) { - conf->addExtra(qca_crypto_prf); - return true; - } - - QStringList incs; - QString version, libs, other; - - if (conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other)) { - for (int n = 0; n < incs.count(); ++n) - conf->addIncludePath(incs[n]); - if (!libs.isEmpty()) - conf->addLib(libs); - return true; - } - - QStringList prefixes; -#ifndef Q_OS_WIN - prefixes += "/usr"; - prefixes += "/usr/local"; -#endif - QString prefix = conf->getenv("PREFIX"); - if (!prefix.isEmpty()) { - prefixes += prefix; - } - - for (int n = 0; n < prefixes.count(); ++n) { - const QString &prefix = prefixes[n]; - if (qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf)) { - conf->addExtra(qca_crypto_prf); - return true; - } - } - - return false; - } -}; -#line 1 "zlib.qcm" -/* ------BEGIN QCMOD----- -name: zlib -arg: with-zlib-inc=[path],Path to zlib include files -arg: with-zlib-lib=[path],Path to zlib library files ------END QCMOD----- -*/ - -//---------------------------------------------------------------------------- -// qc_zlib -//---------------------------------------------------------------------------- -class qc_zlib : public ConfObj -{ -public: - qc_zlib(Conf *c) : ConfObj(c) {} - QString name() const { return "zlib"; } - QString shortname() const { return "zlib"; } - bool exec() - { - QString inc, lib; - QString s; - - s = conf->getenv("QC_WITH_ZLIB_INC"); - if(!s.isEmpty()) { - if(!conf->checkHeader(s, "zlib.h")) - return false; - inc = s; - } - else { - if(!conf->findHeader("zlib.h", QStringList(), &s)) - return false; - inc = s; - } - - s = conf->getenv("QC_WITH_ZLIB_LIB"); - if(!s.isEmpty()) { - if(!conf->checkLibrary(s, "z")) - return false; - lib = s; - } - else { - if(!conf->findLibrary("z", &s)) - return false; - lib = s; - } - - if(!inc.isEmpty()) - conf->addIncludePath(inc); - if(!lib.isEmpty()) - conf->addLib(QString("-L") + s); - conf->addLib("-lz"); - - return true; - } -}; -#line 1 "extra.qcm" -/* ------BEGIN QCMOD----- -name: extra -section: project -arg: enable-tests,Build examples and unittests. ------END QCMOD----- -*/ - -class qc_extra : public ConfObj -{ -public: - qc_extra(Conf *c) : ConfObj(c) {} - QString name() const { return "extra"; } - QString shortname() const { return "extra"; } - - // no output - QString checkString() const { return QString(); } - - bool exec() - { - QString str; - QFile f; - - if(conf->getenv("QC_ENABLE_TESTS") == "Y") - str += "CONFIG += iris_tests\\n"; - - conf->addExtra(str); - - bool release = true; - bool debug = false; - bool debug_info = false; - bool universal = false; - QString sdk; - -#ifdef QC_BUILDMODE - release = qc_buildmode_release; - debug = qc_buildmode_debug; - debug_info = qc_buildmode_separate_debug_info; -#endif - -#ifdef QC_UNIVERSAL - universal = qc_universal_enabled; - sdk = qc_universal_sdk; -#endif - - // write confapp_unix.pri - str = QString(); - QString var = conf->getenv("BINDIR"); - if(!var.isEmpty()) - str += QString("BINDIR = %1\\n").arg(var); - if(debug) // debug or debug-and-release - str += QString("CONFIG += debug\\n"); - else // release - str += QString("CONFIG += release\\n"); - if(debug_info) - { - str += QString("CONFIG += separate_debug_info\\n"); - str += "QMAKE_CFLAGS += -g\\n"; - str += "QMAKE_CXXFLAGS += -g\\n"; - } - if(universal) - { - str += - "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\\n" - " CONFIG += x86 ppc\\n" - "}\\n"; - - if(!sdk.isEmpty()) - str += QString("QMAKE_MAC_SDK = %1\\n").arg(sdk); - } -#ifdef QC_QCA - if(!qc_qca_procode.isEmpty()) - str += qc_qca_procode; -#endif - f.setFileName("confapp_unix.pri"); - if(f.open(QFile::WriteOnly | QFile::Truncate)) - f.write(str.toLatin1()); - f.close(); - - return true; - } -}; -#line 1 "qjdns.qcm" -/* ------BEGIN QCMOD----- -name: jdns -arg: with-qjdns-inc=[path],Path to QJDns include files -arg: with-qjdns-lib=[path],Path to QJDns library files ------END QCMOD----- -*/ - -//---------------------------------------------------------------------------- -// qc_qjdns -//---------------------------------------------------------------------------- -class qc_qjdns : public ConfObj -{ -public: - qc_qjdns(Conf *c) : ConfObj(c) {} - QString name() const { return "QJDns"; } - QString shortname() const { return "qjdns"; } - QString resultString() const - { -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - return "Disabled for Qt5 and above"; -#else - return ConfObj::resultString(); -#endif - } - bool exec() - { -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - return true; // hack. TODO: figure out how to force jdns -#endif - conf->addExtra("CONFIG += need_jdns"); -#if defined Q_OS_WIN || defined Q_OS_MAC - // HACK: on Windows and Mac OS X, always use psi's bundled qjdns - conf->addExtra("CONFIG += iris-qjdns"); - return true; -#else - QStringList incs; - QString version, libs, other; - QString s; - -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - bool found = conf->findPkgConfig("qjdns-qt5", VersionMin, "2.0.3", &version, &incs, &libs, &other); -#else - bool found = conf->findPkgConfig("qjdns-qt4", VersionMin, "2.0.3", &version, &incs, &libs, &other); -#endif - if(!found && !conf->findPkgConfig("qjdns", VersionMin, "2.0.0", &version, &incs, &libs, &other)) { - s = conf->getenv("QC_WITH_QJDNS_INC"); - if ((!s.isEmpty() && conf->checkHeader(s, "qjdns.h")) || - (s.isEmpty() && conf->findHeader("qjdns.h", QStringList(), &s))) { - incs.append(s); - } - - s = conf->getenv("QC_WITH_QJDNS_LIB"); - if((!s.isEmpty() && conf->checkLibrary(s, "qjdns")) || - (s.isEmpty() && conf->findLibrary("qjdns", &s))) { - libs = s.isEmpty()? "-lqjdns -ljdns" : QString("-L%1 -lqjdns -ljdns").arg(s); - } - } - - if (!incs.isEmpty() && !libs.isEmpty()) { - foreach(const QString &inc, incs) { - conf->addIncludePath(inc); - } - conf->addLib(libs); - conf->addExtra("CONFIG += ext-qjdns"); - } - - return true; -#endif - } -}; -#line 1 "b2.qcm" -/* ------BEGIN QCMOD----- -name: libb2 -arg: with-b2-inc=[path],Path to libb2 include files -arg: with-b2-lib=[path],Path to libb2 library or framework files ------END QCMOD----- -*/ - -//---------------------------------------------------------------------------- -// qc_b2 -//---------------------------------------------------------------------------- -class qc_b2 : public ConfObj -{ - bool use_system = false; -public: - qc_b2(Conf *c) : ConfObj(c) {} - QString name() const { return "LibB2"; } - QString shortname() const { return "libb2"; } - QString resultString() const { return use_system? "system":"bundled"; } - bool exec() - { - QString b2_incdir, b2_libdir; - b2_incdir = conf->getenv("QC_WITH_B2_INC"); - b2_libdir = conf->getenv("QC_WITH_B2_LIB"); - - if (b2_incdir.isEmpty() && b2_libdir.isEmpty()) { - if (!checkCustomDirs(b2_incdir, b2_libdir)) { - printf("b2 search paths provided but library is not found there. use bundled"); - return true; - } - use_system = true; - } else { - QStringList incs; - QString version, libs, other; - if(conf->findPkgConfig("libb2", VersionAny, QString::null, &version, &incs, &libs, &other)) - { - for(int n = 0; n < incs.count(); ++n) - conf->addIncludePath(incs[n]); - if(!libs.isEmpty()) - conf->addLib(libs); - use_system = true; - } - } - - if (use_system) { - conf->addExtra("CONFIG += bundled_blake2"); - } - - return true; - } - - bool checkCustomDirs(QString &b2_incdir, QString &b2_libdir) - { - if ((b2_incdir.isEmpty() && !conf->findHeader("blake2.h", QStringList(), &b2_incdir)) || - (!b2_incdir.isEmpty() && !conf->checkHeader(b2_incdir, "blake2.h"))) { - printf("Headers not found!\\n"); - return false; - } - - if((!b2_libdir.isEmpty() && conf->checkLibrary(b2_libdir, "b2")) || - (b2_libdir.isEmpty() && conf->findLibrary("b2", &b2_libdir))) { - conf->addLib(b2_libdir.isEmpty()? "-lb2" : QString("-L%1 -lb2").arg(b2_libdir)); - conf->addIncludePath(b2_incdir); - return true; - } - - printf("Libraries not found!\\n"); - return false; - } -}; - -EOT -cat >"$1/modules_new.cpp" <required = true; - o->disabled = false; - o = new qc_buildmode(conf); - o->required = true; - o->disabled = false; - o = new qc_universal(conf); - o->required = true; - o->disabled = false; - o = new qc_qca(conf); - o->required = true; - o->disabled = false; - o = new qc_zlib(conf); - o->required = true; - o->disabled = false; - o = new qc_extra(conf); - o->required = true; - o->disabled = false; - o = new qc_qjdns(conf); - o->required = true; - o->disabled = false; - o = new qc_b2(conf); - o->required = true; - o->disabled = false; - -EOT -cat >"$1/conf4.h" < - -class Conf; - -enum VersionMode { VersionMin, VersionExact, VersionMax, VersionAny }; - -// ConfObj -// -// Subclass ConfObj to create a new configuration module. -class ConfObj { -public: - Conf *conf; - bool required; - bool disabled; - bool success; - - ConfObj(Conf *c); - virtual ~ConfObj(); - - // long or descriptive name of what is being checked/performed - // example: "KDE >= 3.3" - virtual QString name() const = 0; - - // short name - // example: "kde" - virtual QString shortname() const = 0; - - // string to display during check - // default: "Checking for [name] ..." - virtual QString checkString() const; - - // string to display after check - // default: "yes" or "no", based on result of exec() - virtual QString resultString() const; - - // this is where the checking code goes - virtual bool exec() = 0; -}; - -// Conf -// -// Interact with this class from your ConfObj to perform detection -// operations and to output configuration parameters. -class Conf { -public: - bool debug_enabled; - QString qmake_path; - QString qmakespec; - QString maketool; - - QString DEFINES; - QStringList INCLUDEPATH; - QStringList LIBS; - QString extra; - - QList list; - QMap vars; - - Conf(); - ~Conf(); - - QString getenv(const QString &var); - QString qvar(const QString &s); - QString normalizePath(const QString &s) const; - QString escapeQmakeVar(const QString &s) const; - inline QString escapePath(const QString &s) /* prepare fs path for qmake file */ - { - return escapeQmakeVar(normalizePath(s)); - } - QString escapedIncludes() const; - QString escapedLibs() const; - - bool exec(); - - void debug(const QString &s); - - QString expandIncludes(const QString &inc); - QString expandLibs(const QString &lib); - - int doCommand(const QString &s, QByteArray *out = 0); - int doCommand(const QString &prog, const QStringList &args, QByteArray *out = 0); - - bool doCompileAndLink(const QString &filedata, const QStringList &incs, const QString &libs, - const QString &proextra, int *retcode = 0); - bool checkHeader(const QString &path, const QString &h); - bool findHeader(const QString &h, const QStringList &ext, QString *inc); - bool checkLibrary(const QString &path, const QString &name); - bool findLibrary(const QString &name, QString *lib); - QString findProgram(const QString &prog); - bool findSimpleLibrary(const QString &incvar, const QString &libvar, const QString &incname, const QString &libname, - QString *incpath, QString *libs); - bool findFooConfig(const QString &path, QString *version, QStringList *incs, QString *libs, QString *otherflags); - bool findPkgConfig(const QString &name, VersionMode mode, const QString &req_version, QString *version, - QStringList *incs, QString *libs, QString *otherflags); - - void addDefine(const QString &str); - void addLib(const QString &str); - void addIncludePath(const QString &str); - void addExtra(const QString &str); - -private: - bool first_debug; - - friend class ConfObj; - void added(ConfObj *o); -}; - -#endif - -EOT -cat >"$1/conf4.cpp" < -#include -#include -#ifndef PATH_MAX -#ifdef Q_OS_WIN -#define PATH_MAX 260 -#endif -#endif - -class MocTestObject : public QObject { - - Q_OBJECT -public: - MocTestObject() {} -}; - -QString qc_getenv(const QString &var) -{ - char *p = ::getenv(var.toLatin1().data()); - if (!p) - return QString(); - return QString(p); -} - -QStringList qc_pathlist() -{ - QStringList list; - QString path = qc_getenv("PATH"); - if (!path.isEmpty()) { -#ifdef Q_OS_WIN - list = path.split(';', QString::SkipEmptyParts); -#else - list = path.split(':', QString::SkipEmptyParts); -#endif - } -#ifdef Q_OS_WIN - list.prepend("."); -#endif - return list; -} - -QString qc_findprogram(const QString &prog) -{ - QString out; - QStringList list = qc_pathlist(); - for (int n = 0; n < list.count(); ++n) { - QFileInfo fi(list[n] + '/' + prog); - if (fi.exists() && fi.isExecutable()) { - out = fi.filePath(); - break; - } - -#ifdef Q_OS_WIN - // on windows, be sure to look for .exe - if (prog.right(4).toLower() != ".exe") { - fi = QFileInfo(list[n] + '/' + prog + ".exe"); - if (fi.exists() && fi.isExecutable()) { - out = fi.filePath(); - break; - } - } -#endif - } - return out; -} - -QString qc_findself(const QString &argv0) -{ -#ifdef Q_OS_WIN - if (argv0.contains('\\\\')) -#else - if (argv0.contains('/')) -#endif - return argv0; - else - return qc_findprogram(argv0); -} - -int qc_run_program_or_command(const QString &prog, const QStringList &args, const QString &command, QByteArray *out, - bool showOutput) -{ - if (out) - out->clear(); - - QProcess process; - process.setReadChannel(QProcess::StandardOutput); - - if (!prog.isEmpty()) - process.start(prog, args); - else if (!command.isEmpty()) - process.start(command); - else - return -1; - - if (!process.waitForStarted(-1)) - return -1; - - QByteArray buf; - - while (process.waitForReadyRead(-1)) { - buf = process.readAllStandardOutput(); - if (out) - out->append(buf); - if (showOutput) - fprintf(stdout, "%s", buf.data()); - - buf = process.readAllStandardError(); - if (showOutput) - fprintf(stderr, "%s", buf.data()); - } - - buf = process.readAllStandardError(); - if (showOutput) - fprintf(stderr, "%s", buf.data()); - - // calling waitForReadyRead will cause the process to eventually be - // marked as finished, so we should not need to separately call - // waitForFinished. however, we will do it anyway just to be safe. - // we won't check the return value since false could still mean - // success (if the process had already been marked as finished). - process.waitForFinished(-1); - - if (process.exitStatus() != QProcess::NormalExit) - return -1; - - return process.exitCode(); -} - -int qc_runcommand(const QString &command, QByteArray *out, bool showOutput) -{ - return qc_run_program_or_command(QString(), QStringList(), command, out, showOutput); -} - -int qc_runprogram(const QString &prog, const QStringList &args, QByteArray *out, bool showOutput) -{ - return qc_run_program_or_command(prog, args, QString(), out, showOutput); -} - -bool qc_removedir(const QString &dirPath) -{ - QDir dir(dirPath); - if (!dir.exists()) - return false; - QStringList list = dir.entryList(); - foreach (QString s, list) { - if (s == "." || s == "..") - continue; - QFileInfo fi(dir.filePath(s)); - if (fi.isDir()) { - if (!qc_removedir(fi.filePath())) - return false; - } else { - if (!dir.remove(s)) - return false; - } - } - QString dirName = dir.dirName(); - if (!dir.cdUp()) - return false; - if (!dir.rmdir(dirName)) - return false; - return true; -} - -// simple command line arguemnts splitter able to understand quoted args. -// the splitter removes quotes and unescapes symbols as well. -QStringList qc_splitflags(const QString &flags) -{ - QStringList ret; - bool searchStart = true; - bool inQuotes = false; - bool escaped = false; - QChar quote, backslash = QLatin1Char('\\\\'); - QString buf; -#ifdef PATH_MAX - buf.reserve(PATH_MAX); -#endif - for (int i = 0; i < flags.length(); i++) { - if (searchStart && flags[i].isSpace()) { - continue; - } - if (searchStart) { - searchStart = false; - buf.clear(); - } - if (escaped) { - buf += flags[i]; - escaped = false; - continue; - } - // buf += flags[i]; - if (inQuotes) { - if (quote == QLatin1Char('\\'')) { - if (flags[i] == quote) { - inQuotes = false; - continue; - } - } else { // we are in double quoetes - if (flags[i] == backslash && i < flags.length() - 1 - && (flags[i + 1] == QLatin1Char('"') || flags[i + 1] == backslash)) { - // if next symbol is one of in parentheses ("\\) - escaped = true; - continue; - } - } - } else { - if (flags[i].isSpace()) { - ret.append(buf); - searchStart = true; - buf.clear(); - continue; -#ifndef Q_OS_WIN /* on windows backslash is just a path separator */ - } else if (flags[i] == backslash) { - escaped = true; - continue; // just add next symbol -#endif - } else if (flags[i] == QLatin1Char('\\'') || flags[i] == QLatin1Char('"')) { - inQuotes = true; - quote = flags[i]; - continue; - } - } - buf += flags[i]; - } - if (buf.size()) { - ret.append(buf); - } - return ret; -} - -void qc_splitcflags(const QString &cflags, QStringList *incs, QStringList *otherflags) -{ - incs->clear(); - otherflags->clear(); - - QStringList cflagsList = qc_splitflags(cflags); - for (int n = 0; n < cflagsList.count(); ++n) { - QString str = cflagsList[n]; - if (str.startsWith("-I")) { - // we want everything except the leading "-I" - incs->append(str.remove(0, 2)); - } else { - // we want whatever is left - otherflags->append(str); - } - } -} - -QString qc_escapeArg(const QString &str) -{ - QString out; - for (int n = 0; n < (int)str.length(); ++n) { - if (str[n] == '-') - out += '_'; - else - out += str[n]; - } - return out; -} - -QString qc_trim_char(const QString &s, const QChar &ch) -{ - if (s.startsWith(ch) && s.endsWith(ch)) { - return s.mid(1, s.size() - 2); - } - return s; -} - -// removes surrounding quotes, removes trailing slashes, converts to native separators. -// accepts unescaped but possible quoted path -QString qc_normalize_path(const QString &str) -{ - QString path = str.trimmed(); - path = qc_trim_char(path, QLatin1Char('"')); - path = qc_trim_char(path, QLatin1Char('\\'')); - - // It's OK to use unix style'/' paths on windows Qt handles this without any problems. - // Using Windows-style '\\\\' can leads strange compilation error with MSYS which uses - // unix style. - QLatin1Char nativeSep('/'); -#ifdef Q_OS_WIN - path.replace(QLatin1Char('\\\\'), QLatin1Char('/')); -#endif - // trim trailing slashes - while (path.length() && path[path.length() - 1] == nativeSep) { - path.resize(path.length() - 1); - } - return path; -} - -// escape filesystem path to be added to qmake pro/pri file. -QString qc_escape_string_var(const QString &str) -{ - QString path = str; - path.replace(QLatin1Char('\\\\'), QLatin1String("\\\\\\\\")).replace(QLatin1Char('"'), QLatin1String("\\\\\\"")); - if (path.indexOf(QLatin1Char(' ')) != -1) { // has spaces - return QLatin1Char('"') + path + QLatin1Char('"'); - } - return path; -} - -// escapes each path in incs and join into single string suiable for INCLUDEPATH var -QString qc_prepare_includepath(const QStringList &incs) -{ - if (incs.empty()) { - return QString(); - } - QStringList ret; - foreach (const QString &path, incs) { - ret.append(qc_escape_string_var(path)); - } - return ret.join(QLatin1String(" ")); -} - -// escapes each path in libs and to make it suiable for LIBS var -// notice, entries of libs are every single arg for linker. -QString qc_prepare_libs(const QStringList &libs) -{ - if (libs.isEmpty()) { - return QString(); - } - QSet pathSet; - QStringList paths; - QStringList ordered; - foreach (const QString &arg, libs) { - if (arg.startsWith(QLatin1String("-L"))) { - QString path = qc_escape_string_var(arg.mid(2)); - if (!pathSet.contains(path)) { - pathSet.insert(path); - paths.append(path); - } - } else if (arg.startsWith(QLatin1String("-l"))) { - ordered.append(arg); - } else { - ordered.append(qc_escape_string_var(arg)); - } - } - QString ret; - if (paths.size()) { - ret += (QLatin1String(" -L") + paths.join(QLatin1String(" -L")) + QLatin1Char(' ')); - } - return ret + ordered.join(QLatin1String(" ")); -} - -//---------------------------------------------------------------------------- -// ConfObj -//---------------------------------------------------------------------------- -ConfObj::ConfObj(Conf *c) -{ - conf = c; - conf->added(this); - required = false; - disabled = false; - success = false; -} - -ConfObj::~ConfObj() {} - -QString ConfObj::checkString() const { return QString("Checking for %1 ...").arg(name()); } - -QString ConfObj::resultString() const -{ - if (success) - return "yes"; - else - return "no"; -} - -//---------------------------------------------------------------------------- -// qc_internal_pkgconfig -//---------------------------------------------------------------------------- -class qc_internal_pkgconfig : public ConfObj { -public: - QString pkgname, desc; - VersionMode mode; - QString req_ver; - - qc_internal_pkgconfig(Conf *c, const QString &_name, const QString &_desc, VersionMode _mode, - const QString &_req_ver) : - ConfObj(c), - pkgname(_name), desc(_desc), mode(_mode), req_ver(_req_ver) - { - } - - QString name() const { return desc; } - QString shortname() const { return pkgname; } - - bool exec() - { - QStringList incs; - QString version, libs, other; - if (!conf->findPkgConfig(pkgname, mode, req_ver, &version, &incs, &libs, &other)) - return false; - - for (int n = 0; n < incs.count(); ++n) - conf->addIncludePath(incs[n]); - if (!libs.isEmpty()) - conf->addLib(libs); - // if(!other.isEmpty()) - // conf->addExtra(QString("QMAKE_CFLAGS += %1\\n").arg(other)); - - if (!required) - conf->addDefine("HAVE_PKG_" + qc_escapeArg(pkgname).toUpper()); - - return true; - } -}; - -//---------------------------------------------------------------------------- -// Conf -//---------------------------------------------------------------------------- -Conf::Conf() -{ - // TODO: no more vars? - // vars.insert("QMAKE_INCDIR_X11", new QString(X11_INC)); - // vars.insert("QMAKE_LIBDIR_X11", new QString(X11_LIBDIR)); - // vars.insert("QMAKE_LIBS_X11", new QString(X11_LIB)); - // vars.insert("QMAKE_CC", CC); - - debug_enabled = false; - first_debug = true; -} - -Conf::~Conf() { qDeleteAll(list); } - -void Conf::added(ConfObj *o) { list.append(o); } - -QString Conf::getenv(const QString &var) { return qc_getenv(var); } - -void Conf::debug(const QString &s) -{ - if (debug_enabled) { - if (first_debug) - printf("\\n"); - first_debug = false; - printf(" * %s\\n", qPrintable(s)); - } -} - -bool Conf::exec() -{ - for (int n = 0; n < list.count(); ++n) { - ConfObj *o = list[n]; - - // if this was a disabled-by-default option, check if it was enabled - if (o->disabled) { - QString v = QString("QC_ENABLE_") + qc_escapeArg(o->shortname()); - if (getenv(v) != "Y") - continue; - } - // and the opposite? - else { - QString v = QString("QC_DISABLE_") + qc_escapeArg(o->shortname()); - if (getenv(v) == "Y") - continue; - } - - bool output = true; - QString check = o->checkString(); - if (check.isEmpty()) - output = false; - - if (output) { - printf("%s", check.toLatin1().data()); - fflush(stdout); - } - - first_debug = true; - bool ok = o->exec(); - o->success = ok; - - if (output) { - QString result = o->resultString(); - if (!first_debug) - printf(" -> %s\\n", result.toLatin1().data()); - else - printf(" %s\\n", result.toLatin1().data()); - } - - if (!ok && o->required) { - printf("\\nError: need %s!\\n", o->name().toLatin1().data()); - return false; - } - } - return true; -} - -QString Conf::qvar(const QString &s) { return vars.value(s); } - -QString Conf::normalizePath(const QString &s) const { return qc_normalize_path(s); } - -QString Conf::escapeQmakeVar(const QString &s) const { return qc_escape_string_var(s); } - -QString Conf::escapedIncludes() const { return qc_prepare_includepath(INCLUDEPATH); } - -QString Conf::escapedLibs() const { return qc_prepare_libs(LIBS); } - -QString Conf::expandIncludes(const QString &inc) { return QLatin1String("-I") + inc; } - -QString Conf::expandLibs(const QString &lib) { return QLatin1String("-L") + lib; } - -int Conf::doCommand(const QString &s, QByteArray *out) -{ - debug(QString("[%1]").arg(s)); - int r = qc_runcommand(s, out, debug_enabled); - debug(QString("returned: %1").arg(r)); - return r; -} - -int Conf::doCommand(const QString &prog, const QStringList &args, QByteArray *out) -{ - QString fullcmd = prog; - QString argstr = args.join(QLatin1String(" ")); - if (!argstr.isEmpty()) - fullcmd += QString(" ") + argstr; - debug(QString("[%1]").arg(fullcmd)); - int r = qc_runprogram(prog, args, out, debug_enabled); - debug(QString("returned: %1").arg(r)); - return r; -} - -bool Conf::doCompileAndLink(const QString &filedata, const QStringList &incs, const QString &libs, - const QString &proextra, int *retcode) -{ -#ifdef Q_OS_WIN - QDir tmp("qconftemp"); -#else - QDir tmp(".qconftemp"); -#endif - QStringList normalizedLibs; - foreach (const QString &l, qc_splitflags(libs)) { - normalizedLibs.append(qc_normalize_path(l)); - } - - if (!tmp.mkdir("atest")) { - debug(QString("unable to create atest dir: %1").arg(tmp.absoluteFilePath("atest"))); - return false; - } - QDir dir(tmp.filePath("atest")); - if (!dir.exists()) { - debug("atest dir does not exist"); - return false; - } - - QString fname = dir.filePath("atest.cpp"); - QString out = "atest"; - QFile f(fname); - if (!f.open(QFile::WriteOnly | QFile::Truncate)) { - debug("unable to open atest.cpp for writing"); - return false; - } - if (f.write(filedata.toLatin1()) == -1) { - debug("error writing to atest.cpp"); - return false; - } - f.close(); - - debug(QString("Wrote atest.cpp:\\n%1").arg(filedata)); - - QString pro = QString("CONFIG += console\\n" - "CONFIG -= qt app_bundle\\n" - "DESTDIR = \$\$PWD\\n" - "SOURCES += atest.cpp\\n"); - QString inc = qc_prepare_includepath(incs); - if (!inc.isEmpty()) - pro += "INCLUDEPATH += " + inc + '\\n'; - QString escaped_libs = qc_prepare_libs(normalizedLibs); - if (!escaped_libs.isEmpty()) - pro += "LIBS += " + escaped_libs + '\\n'; - pro += proextra; - - fname = dir.filePath("atest.pro"); - f.setFileName(fname); - if (!f.open(QFile::WriteOnly | QFile::Truncate)) { - debug("unable to open atest.pro for writing"); - return false; - } - if (f.write(pro.toLatin1()) == -1) { - debug("error writing to atest.pro"); - return false; - } - f.close(); - - debug(QString("Wrote atest.pro:\\n%1").arg(pro)); - - QString oldpath = QDir::currentPath(); - QDir::setCurrent(dir.path()); - - bool ok = false; - int r = doCommand(qmake_path, QStringList() << "atest.pro"); - if (r == 0) { - r = doCommand(maketool, QStringList()); - if (r == 0) { - ok = true; - if (retcode) { - QString runatest = out; -#ifdef Q_OS_UNIX - runatest.prepend("./"); -#endif - *retcode = doCommand(runatest, QStringList()); - } - } - r = doCommand(maketool, QStringList() << "distclean"); - if (r != 0) - debug("error during atest distclean"); - } - - QDir::setCurrent(oldpath); - - // cleanup - // dir.remove("atest.pro"); - // dir.remove("atest.cpp"); - // tmp.rmdir("atest"); - - // remove whole dir since distclean doesn't always work - qc_removedir(tmp.filePath("atest")); - - if (!ok) - return false; - return true; -} - -bool Conf::checkHeader(const QString &path, const QString &h) { return QDir(path).exists(h); } - -bool Conf::findHeader(const QString &h, const QStringList &ext, QString *inc) -{ - if (checkHeader("/usr/include", h)) { - *inc = ""; - return true; - } - QStringList dirs; - dirs += "/usr/local/include"; - dirs += ext; - - QString prefix = qc_getenv("PREFIX"); - if (!prefix.isEmpty()) { - prefix += "/include"; - prefix = qc_normalize_path(prefix); - if (!dirs.contains(prefix)) - dirs << prefix; - } - - for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) { - if (checkHeader(*it, h)) { - *inc = *it; - return true; - } - } - return false; -} - -bool Conf::checkLibrary(const QString &path, const QString &name) -{ - QString str = - //"#include \\n" - "int main()\\n" - "{\\n" - //" printf(\\"library checker running\\\\\\\\n\\");\\n" - " return 0;\\n" - "}\\n"; - - QString libs; - if (!path.isEmpty()) - libs += QString("-L") + path + ' '; - libs += QString("-l") + name; - if (!doCompileAndLink(str, QStringList(), libs, QString())) - return false; - return true; -} - -bool Conf::findLibrary(const QString &name, QString *lib) -{ - if (checkLibrary("", name)) { - *lib = ""; - return true; - } - if (checkLibrary("/usr/local/lib", name)) { - *lib = "/usr/local/lib"; - return true; - } - - QString prefix = qc_getenv("PREFIX"); - if (!prefix.isEmpty()) { - prefix += "/lib"; - prefix = qc_normalize_path(prefix); - if (checkLibrary(prefix, name)) { - *lib = prefix; - return true; - } - } - - return false; -} - -QString Conf::findProgram(const QString &prog) { return qc_findprogram(prog); } - -bool Conf::findSimpleLibrary(const QString &incvar, const QString &libvar, const QString &incname, - const QString &libname, QString *incpath, QString *libs) -{ - QString inc, lib; - QString s; - - s = getenv(incvar).trimmed(); - if (!s.isEmpty()) { - if (!checkHeader(s, incname)) { - if (debug_enabled) - printf("%s is not found in \\"%s\\"\\n", qPrintable(incname), qPrintable(s)); - return false; - } - inc = s; - } else { - if (!findHeader(incname, QStringList(), &s)) { - if (debug_enabled) - printf("%s is not found anywhere\\n", qPrintable(incname)); - return false; - } - inc = s; - } - - s = getenv(libvar).trimmed(); - if (!s.isEmpty()) { - if (!checkLibrary(s, libname)) { - if (debug_enabled) - printf("%s is not found in \\"%s\\"\\n", qPrintable(libname), qPrintable(s)); - return false; - } - lib = s; - } else { - if (!findLibrary(libname, &s)) { - if (debug_enabled) - printf("%s is not found anywhere\\n", qPrintable(libname)); - return false; - } - lib = s; - } - - QString lib_out; - if (!lib.isEmpty()) - lib_out += QString("-L") + s + " "; - lib_out += QString("-l") + libname; - - *incpath = inc; - *libs = lib_out; - return true; -} - -bool Conf::findFooConfig(const QString &path, QString *version, QStringList *incs, QString *libs, QString *otherflags) -{ - QStringList args; - QByteArray out; - int ret; - - args += "--version"; - ret = doCommand(path, args, &out); - if (ret != 0) - return false; - - QString version_out = QString::fromLatin1(out).trimmed(); - - args.clear(); - args += "--libs"; - ret = doCommand(path, args, &out); - if (ret != 0) - return false; - - QString libs_out = QString::fromLatin1(out).trimmed(); - - args.clear(); - args += "--cflags"; - ret = doCommand(path, args, &out); - if (ret != 0) - return false; - - QString cflags = QString::fromLatin1(out).trimmed(); - - QStringList incs_out, otherflags_out; - qc_splitcflags(cflags, &incs_out, &otherflags_out); - - *version = version_out; - *incs = incs_out; - *libs = libs_out; - *otherflags = otherflags_out.join(QLatin1String(" ")); - return true; -} - -bool Conf::findPkgConfig(const QString &name, VersionMode mode, const QString &req_version, QString *version, - QStringList *incs, QString *libs, QString *otherflags) -{ - QStringList args; - QByteArray out; - int ret; - - args += name; - args += "--exists"; - ret = doCommand("pkg-config", args, &out); - if (ret != 0) - return false; - - if (mode != VersionAny) { - args.clear(); - args += name; - if (mode == VersionMin) - args += QString("--atleast-version=%1").arg(req_version); - else if (mode == VersionMax) - args += QString("--max-version=%1").arg(req_version); - else - args += QString("--exact-version=%1").arg(req_version); - ret = doCommand("pkg-config", args, &out); - if (ret != 0) - return false; - } - - args.clear(); - args += name; - args += "--modversion"; - ret = doCommand("pkg-config", args, &out); - if (ret != 0) - return false; - - QString version_out = QString::fromLatin1(out).trimmed(); - - args.clear(); - args += name; - args += "--libs"; - ret = doCommand("pkg-config", args, &out); - if (ret != 0) - return false; - - QString libs_out = QString::fromLatin1(out).trimmed(); - - args.clear(); - args += name; - args += "--cflags"; - ret = doCommand("pkg-config", args, &out); - if (ret != 0) - return false; - - QString cflags = QString::fromLatin1(out).trimmed(); - - QStringList incs_out, otherflags_out; - qc_splitcflags(cflags, &incs_out, &otherflags_out); - - *version = version_out; - *incs = incs_out; - *libs = libs_out; - *otherflags = otherflags_out.join(QLatin1String(" ")); - return true; -} - -void Conf::addDefine(const QString &str) -{ - if (DEFINES.isEmpty()) - DEFINES = str; - else - DEFINES += QString(" ") + str; - debug(QString("DEFINES += %1").arg(str)); -} - -void Conf::addLib(const QString &str) -{ - QStringList libs = qc_splitflags(str); - foreach (const QString &lib, libs) { - if (lib.startsWith("-l")) { - LIBS.append(lib); - } else { - LIBS.append(qc_normalize_path(lib)); // we don't care about -L prefix since normalier does not touch it. - } - } - debug(QString("LIBS += %1").arg(str)); -} - -void Conf::addIncludePath(const QString &str) -{ - INCLUDEPATH.append(qc_normalize_path(str)); - debug(QString("INCLUDEPATH += %1").arg(str)); -} - -void Conf::addExtra(const QString &str) -{ - extra += str + '\\n'; - debug(QString("extra += %1").arg(str)); -} - -//---------------------------------------------------------------------------- -// main -//---------------------------------------------------------------------------- -#include "conf4.moc" - -#ifdef HAVE_MODULES -#include "modules.cpp" -#endif - -int main(int argc, char **argv) -{ - QCoreApplication app(argc, argv); - Conf * conf = new Conf; - ConfObj * o = 0; - Q_UNUSED(o); -#ifdef HAVE_MODULES -#include "modules_new.cpp" -#endif - - conf->debug_enabled = (qc_getenv("QC_VERBOSE") == "Y") ? true : false; - if (conf->debug_enabled) - printf(" -> ok\\n"); - else - printf("ok\\n"); - - QString confCommand = qc_getenv("QC_COMMAND"); - QString proName = qc_getenv("QC_PROFILE"); - conf->qmake_path = qc_getenv("QC_QMAKE"); - conf->qmakespec = qc_getenv("QC_QMAKESPEC"); - conf->maketool = qc_getenv("QC_MAKETOOL"); - - if (conf->debug_enabled) - printf("conf command: [%s]\\n", qPrintable(confCommand)); - - QString confPath = qc_findself(confCommand); - if (confPath.isEmpty()) { - printf("Error: cannot find myself; rerun with an absolute path\\n"); - return 1; - } - - QString srcdir = QFileInfo(confPath).absolutePath(); - QString builddir = QDir::current().absolutePath(); - QString proPath = QDir(srcdir).filePath(proName); - - if (conf->debug_enabled) { - printf("conf path: [%s]\\n", qPrintable(confPath)); - printf("srcdir: [%s]\\n", qPrintable(srcdir)); - printf("builddir: [%s]\\n", qPrintable(builddir)); - printf("profile: [%s]\\n", qPrintable(proPath)); - printf("qmake path: [%s]\\n", qPrintable(conf->qmake_path)); - printf("qmakespec: [%s]\\n", qPrintable(conf->qmakespec)); - printf("make tool: [%s]\\n", qPrintable(conf->maketool)); - printf("\\n"); - } - - bool success = false; - if (conf->exec()) { - QFile f("conf.pri"); - if (!f.open(QFile::WriteOnly | QFile::Truncate)) { - printf("Error writing %s\\n", qPrintable(f.fileName())); - return 1; - } - - QString str; - str += "# qconf\\n\\n"; - str += "greaterThan(QT_MAJOR_VERSION, 4):CONFIG += c++11\\n"; - - QString var; - var = qc_normalize_path(qc_getenv("PREFIX")); - if (!var.isEmpty()) - str += QString("PREFIX = %1\\n").arg(var); - var = qc_normalize_path(qc_getenv("BINDIR")); - if (!var.isEmpty()) - str += QString("BINDIR = %1\\n").arg(var); - var = qc_normalize_path(qc_getenv("INCDIR")); - if (!var.isEmpty()) - str += QString("INCDIR = %1\\n").arg(var); - var = qc_normalize_path(qc_getenv("LIBDIR")); - if (!var.isEmpty()) - str += QString("LIBDIR = %1\\n").arg(var); - var = qc_normalize_path(qc_getenv("DATADIR")); - if (!var.isEmpty()) - str += QString("DATADIR = %1\\n").arg(var); - str += '\\n'; - - if (qc_getenv("QC_STATIC") == "Y") - str += "CONFIG += staticlib\\n"; - - // TODO: don't need this? - // str += "QT_PATH_PLUGINS = " + QString(qInstallPathPlugins()) + '\\n'; - - if (!conf->DEFINES.isEmpty()) - str += "DEFINES += " + conf->DEFINES + '\\n'; - if (!conf->INCLUDEPATH.isEmpty()) - str += "INCLUDEPATH += " + qc_prepare_includepath(conf->INCLUDEPATH) + '\\n'; - if (!conf->LIBS.isEmpty()) - str += "LIBS += " + qc_prepare_libs(conf->LIBS) + '\\n'; - if (!conf->extra.isEmpty()) - str += conf->extra; - str += '\\n'; - - var = qc_getenv("QC_EXTRACONF"); - if (!var.isEmpty()) - str += ("\\n# Extra conf from command line\\n" + var + "\\n"); - - QByteArray cs = str.toLatin1(); - f.write(cs); - f.close(); - success = true; - } - QString qmake_path = conf->qmake_path; - QString qmakespec = conf->qmakespec; - delete conf; - - if (!success) - return 1; - - // run qmake on the project file - QStringList args; - if (!qmakespec.isEmpty()) { - args += "-spec"; - args += qmakespec; - } - args += proPath; - int ret = qc_runprogram(qmake_path, args, 0, true); - if (ret != 0) - return 1; - - return 0; -} - -EOT -cat >"$1/conf4.pro" </dev/null - else - "$qm" conf4.pro >/dev/null - fi - $MAKE clean >/dev/null 2>&1 - $MAKE >../conf.log 2>&1 -) - -if [ "$?" != "0" ]; then - rm -rf ".qconftemp" - if [ "$QC_VERBOSE" = "Y" ]; then - echo " -> fail" - else - echo "fail" - fi - printf "\n" - printf "Reason: There was an error compiling 'conf'. See conf.log for details.\n" - printf "\n" - show_qt_info - if [ "$QC_VERBOSE" = "Y" ]; then - echo "conf.log:" - cat conf.log - fi - exit 1; -fi - -QC_COMMAND=$0 -export QC_COMMAND -QC_PROFILE=iris.pro -export QC_PROFILE -QC_QMAKE="$qm" -export QC_QMAKE -QC_QMAKESPEC=$qm_spec -export QC_QMAKESPEC -QC_MAKETOOL=$MAKE -export QC_MAKETOOL -".qconftemp/conf" -ret="$?" -if [ "$ret" = "1" ]; then - rm -rf ".qconftemp" - echo - exit 1; -else - if [ "$ret" != "0" ]; then - rm -rf ".qconftemp" - if [ "$QC_VERBOSE" = "Y" ]; then - echo " -> fail" - else - echo "fail" - fi - echo - echo "Reason: Unexpected error launching 'conf'" - echo - exit 1; - fi -fi -rm -rf ".qconftemp" - -echo -echo "Good, your configure finished. Now run $MAKE." -echo diff --git a/configure.exe b/configure.exe deleted file mode 100644 index 953703b782d714abe37b682ecdb78f0b507c5af8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124424 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 Jnc=|g{|DLWcZL7} diff --git a/iris.pri b/iris.pri deleted file mode 100644 index eaf40ccc..00000000 --- a/iris.pri +++ /dev/null @@ -1,43 +0,0 @@ -IRIS_BASE = $$PWD -include(common.pri) - -CONFIG *= link_prl # doesn't seems to work but at least it's documented unlike dependp_prl -unix { # most of devs are on Linux anyway - PRE_TARGETDEPS += $$top_iris_builddir/lib/libiris.a - PRE_TARGETDEPS += $$top_iris_builddir/lib/libirisnet.a -} - -INCLUDEPATH += $$IRIS_BASE/include $$IRIS_BASE/include/iris $$IRIS_BASE/src - -iris_bundle:{ - include(src/xmpp/xmpp.pri) -} -else { - isEmpty(top_iris_builddir):top_iris_builddir = $$PWD - LIBS += -L$$top_iris_builddir/lib -liris -} - -# force on all windows, plus qca ordering workaround -windows { - DEFINES += IRISNET_STATIC # from irisnet - LIBS += -L$$top_iris_builddir/lib -lirisnet # from iris - LIBS += -lWs2_32 -lAdvapi32 # from jdns - contains(LIBS, -lqca) { - LIBS -= -lqca - LIBS += -lqca - } - contains(LIBS, -lqcad) { - LIBS -= -lqcad - LIBS += -lqcad - } - - contains(LIBS, -lz) { - LIBS -= -lz - LIBS += -lz - } - - contains(LIBS, -lzlib) { - LIBS -= -lzlib - LIBS += -lzlib - } -} diff --git a/iris.pro b/iris.pro deleted file mode 100644 index 4612f91f..00000000 --- a/iris.pro +++ /dev/null @@ -1,22 +0,0 @@ -TEMPLATE = subdirs - -IRIS_BASE = $$PWD -isEmpty(top_iris_builddir):top_iris_builddir = . -include($$top_iris_builddir/conf.pri) - -include(common.pri) - -# do we have a reason to enter the src dir? -appledns:!appledns_bundle:CONFIG *= build_src -!irisnetcore_bundle:CONFIG *= build_src -!iris_bundle:CONFIG *= build_src - -sub_src.subdir = src -sub_tools.subdir = tools -sub_tools.depends = sub_src - -build_src:SUBDIRS += sub_src - -iris_tests:SUBDIRS += sub_tools - -OTHER_FILES += README.md CMakeLists.txt diff --git a/iris.qc b/iris.qc deleted file mode 100644 index 8ac35ae3..00000000 --- a/iris.qc +++ /dev/null @@ -1,31 +0,0 @@ - - Iris - iris.pro - - - qcm - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qcm/README b/qcm/README deleted file mode 100644 index 4ca5ce2a..00000000 --- a/qcm/README +++ /dev/null @@ -1,5 +0,0 @@ -qt42, buildmode, and universal modules are all copied from qca. -do not modify them here. - -the qca module is copied from qca, but modified here. we should consider -pushing the changes back. diff --git a/qcm/b2.qcm b/qcm/b2.qcm deleted file mode 100644 index fd50d855..00000000 --- a/qcm/b2.qcm +++ /dev/null @@ -1,69 +0,0 @@ -/* ------BEGIN QCMOD----- -name: libb2 -arg: with-b2-inc=[path],Path to libb2 include files -arg: with-b2-lib=[path],Path to libb2 library or framework files ------END QCMOD----- -*/ - -//---------------------------------------------------------------------------- -// qc_b2 -//---------------------------------------------------------------------------- -class qc_b2 : public ConfObj { - bool use_system = false; - -public: - qc_b2(Conf *c) : ConfObj(c) { } - QString name() const { return "LibB2"; } - QString shortname() const { return "libb2"; } - QString resultString() const { return use_system ? "system" : "bundled"; } - bool exec() - { - QString b2_incdir, b2_libdir; - b2_incdir = conf->getenv("QC_WITH_B2_INC"); - b2_libdir = conf->getenv("QC_WITH_B2_LIB"); - - if (b2_incdir.isEmpty() && b2_libdir.isEmpty()) { - if (!checkCustomDirs(b2_incdir, b2_libdir)) { - printf("b2 search paths provided but library is not found there. use bundled"); - return true; - } - use_system = true; - } else { - QStringList incs; - QString version, libs, other; - if (conf->findPkgConfig("libb2", VersionAny, QString::null, &version, &incs, &libs, &other)) { - for (int n = 0; n < incs.count(); ++n) - conf->addIncludePath(incs[n]); - if (!libs.isEmpty()) - conf->addLib(libs); - use_system = true; - } - } - - if (use_system) { - conf->addExtra("CONFIG += bundled_blake2"); - } - - return true; - } - - bool checkCustomDirs(QString &b2_incdir, QString &b2_libdir) - { - if ((b2_incdir.isEmpty() && !conf->findHeader("blake2.h", QStringList(), &b2_incdir)) - || (!b2_incdir.isEmpty() && !conf->checkHeader(b2_incdir, "blake2.h"))) { - printf("Headers not found!\n"); - return false; - } - - if ((!b2_libdir.isEmpty() && conf->checkLibrary(b2_libdir, "b2")) - || (b2_libdir.isEmpty() && conf->findLibrary("b2", &b2_libdir))) { - conf->addLib(b2_libdir.isEmpty() ? "-lb2" : QString("-L%1 -lb2").arg(b2_libdir)); - conf->addIncludePath(b2_incdir); - return true; - } - - printf("Libraries not found!\n"); - return false; - } -}; diff --git a/qcm/buildmode.qcm b/qcm/buildmode.qcm deleted file mode 100644 index 2f4836fd..00000000 --- a/qcm/buildmode.qcm +++ /dev/null @@ -1,184 +0,0 @@ -/* ------BEGIN QCMOD----- -name: buildmode -section: project -arg: release,Build with debugging turned off (default). -arg: debug,Build with debugging turned on. -arg: debug-and-release,Build two versions, with and without debugging turned on (mac only). -arg: no-separate-debug-info,Do not store debug information in a separate file (default for mac). -arg: separate-debug-info,Strip debug information into a separate .debug file (default for non-mac). -arg: no-framework,Do not build as a Mac framework. -arg: framework,Build as a Mac framework (default). ------END QCMOD----- -*/ - -#define QC_BUILDMODE -bool qc_buildmode_release = false; -bool qc_buildmode_debug = false; -bool qc_buildmode_framework = false; -bool qc_buildmode_separate_debug_info = false; - -class qc_buildmode : public ConfObj { -public: - qc_buildmode(Conf *c) : ConfObj(c) { } - QString name() const { return "buildmode"; } - QString shortname() const { return "buildmode"; } - - // no output - QString checkString() const { return QString(); } - - bool exec() - { - // first, parse out the options - bool opt_release = false; - bool opt_debug = false; - bool opt_debug_and_release = false; - bool opt_no_framework = false; - bool opt_framework = false; - bool opt_no_separate_debug_info = false; - bool opt_separate_debug_info = false; - - if (conf->getenv("QC_RELEASE") == "Y") - opt_release = true; - if (conf->getenv("QC_DEBUG") == "Y") - opt_debug = true; - if (conf->getenv("QC_DEBUG_AND_RELEASE") == "Y") - opt_debug_and_release = true; - if (conf->getenv("QC_NO_FRAMEWORK") == "Y") - opt_no_framework = true; - if (conf->getenv("QC_FRAMEWORK") == "Y") - opt_framework = true; - if (conf->getenv("QC_NO_SEPARATE_DEBUG_INFO") == "Y") - opt_no_separate_debug_info = true; - if (conf->getenv("QC_SEPARATE_DEBUG_INFO") == "Y") - opt_separate_debug_info = true; - - bool staticmode = false; - if (conf->getenv("QC_STATIC") == "Y") - staticmode = true; - -#ifndef Q_OS_MAC - if (opt_debug_and_release) { - printf("\nError: The --debug-and-release option is for mac only.\n"); - exit(1); - } - - if (opt_framework) { - printf("\nError: The --framework option is for mac only.\n"); - exit(1); - } -#endif - - if (opt_framework && opt_debug) { - printf("\nError: Cannot use both --framework and --debug.\n"); - exit(1); - } - - // sanity check exclusive options - int x; - - // build mode - x = 0; - if (opt_release) - ++x; - if (opt_debug) - ++x; - if (opt_debug_and_release) - ++x; - if (x > 1) { - printf("\nError: Use only one of --release, --debug, or --debug-and-release.\n"); - exit(1); - } - - // framework - if (opt_framework && staticmode) { - printf("\nError: Cannot use both --framework and --static.\n"); - exit(1); - } - - x = 0; - if (opt_no_framework) - ++x; - if (opt_framework) - ++x; - if (x > 1) { - printf("\nError: Use only one of --framework or --no-framework.\n"); - exit(1); - } - - // debug info - x = 0; - if (opt_no_separate_debug_info) - ++x; - if (opt_separate_debug_info) - ++x; - if (x > 1) { - printf("\nError: Use only one of --separate-debug-info or --no-separate-debug-info\n"); - exit(1); - } - - // now process the options - - if (opt_release) - qc_buildmode_release = true; - else if (opt_debug) - qc_buildmode_debug = true; - else if (opt_debug_and_release) { - qc_buildmode_release = true; - qc_buildmode_debug = true; - } else // default - qc_buildmode_release = true; - - if (opt_framework) - qc_buildmode_framework = true; - else if (opt_no_framework) { - // nothing to do - } else // default - { - if (!staticmode && !opt_debug) - qc_buildmode_framework = true; - } - - if (opt_separate_debug_info) - qc_buildmode_separate_debug_info = true; - else if (opt_no_separate_debug_info) { - // nothing to do - } else // default - { -#ifndef Q_OS_MAC - qc_buildmode_separate_debug_info = true; -#endif - } - - // make the string - QStringList opts; - QString other; - - if (qc_buildmode_release && qc_buildmode_debug) { - opts += "debug_and_release"; - opts += "build_all"; - } else if (qc_buildmode_release) - opts += "release"; - else // qc_buildmode_debug - opts += "debug"; - -#ifdef Q_OS_MAC - if (qc_buildmode_framework) - opts += "lib_bundle"; -#endif - - if (qc_buildmode_separate_debug_info) { - opts += "separate_debug_info"; - other += "QMAKE_CFLAGS += -g\n"; - other += "QMAKE_CXXFLAGS += -g\n"; - } - - QString str = QString("CONFIG += ") + opts.join(" ") + '\n'; - conf->addExtra(str); - - if (!other.isEmpty()) - conf->addExtra(other); - - return true; - } -}; diff --git a/qcm/extra.qcm b/qcm/extra.qcm deleted file mode 100644 index bf73ff86..00000000 --- a/qcm/extra.qcm +++ /dev/null @@ -1,78 +0,0 @@ -/* ------BEGIN QCMOD----- -name: extra -section: project -arg: enable-tests,Build examples and unittests. ------END QCMOD----- -*/ - -class qc_extra : public ConfObj { -public: - qc_extra(Conf *c) : ConfObj(c) { } - QString name() const { return "extra"; } - QString shortname() const { return "extra"; } - - // no output - QString checkString() const { return QString(); } - - bool exec() - { - QString str; - QFile f; - - if (conf->getenv("QC_ENABLE_TESTS") == "Y") - str += "CONFIG += iris_tests\n"; - - conf->addExtra(str); - - bool release = true; - bool debug = false; - bool debug_info = false; - bool universal = false; - QString sdk; - -#ifdef QC_BUILDMODE - release = qc_buildmode_release; - debug = qc_buildmode_debug; - debug_info = qc_buildmode_separate_debug_info; -#endif - -#ifdef QC_UNIVERSAL - universal = qc_universal_enabled; - sdk = qc_universal_sdk; -#endif - - // write confapp_unix.pri - str = QString(); - QString var = conf->getenv("BINDIR"); - if (!var.isEmpty()) - str += QString("BINDIR = %1\n").arg(var); - if (debug) // debug or debug-and-release - str += QString("CONFIG += debug\n"); - else // release - str += QString("CONFIG += release\n"); - if (debug_info) { - str += QString("CONFIG += separate_debug_info\n"); - str += "QMAKE_CFLAGS += -g\n"; - str += "QMAKE_CXXFLAGS += -g\n"; - } - if (universal) { - str += "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n" - " CONFIG += x86 ppc\n" - "}\n"; - - if (!sdk.isEmpty()) - str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk); - } -#ifdef QC_QCA - if (!qc_qca_procode.isEmpty()) - str += qc_qca_procode; -#endif - f.setFileName("confapp_unix.pri"); - if (f.open(QFile::WriteOnly | QFile::Truncate)) - f.write(str.toLatin1()); - f.close(); - - return true; - } -}; diff --git a/qcm/qca.qcm b/qcm/qca.qcm deleted file mode 100644 index ca7591d5..00000000 --- a/qcm/qca.qcm +++ /dev/null @@ -1,180 +0,0 @@ -/* ------BEGIN QCMOD----- -name: QCA >= 2.0 -arg: with-qca-inc=[path],Path to QCA include files -arg: with-qca-lib=[path],Path to QCA library or framework files ------END QCMOD----- -*/ - -// adapted from crypto.prf -static QString internal_crypto_prf(const QString &incdir, const QString &libdir, const QString &frameworkdir) -{ - QString out = QString("QCA_INCDIR = %1\n" - "QCA_LIBDIR = %2\n" - "QMAKE_RPATHDIR = %2\n" - "QCA_FRAMEWORKDIR = %3\n" - "\n" - "CONFIG *= qt\n" - "\n" - "LINKAGE =\n" - "QCA_NAME = qca-qt5\n" - "\n" - "!isEmpty(QCA_FRAMEWORKDIR): {\n" - " framework_dir = $$QCA_FRAMEWORKDIR\n" - " exists($$framework_dir/$${QCA_NAME}.framework) {\n" - " #QMAKE_FRAMEWORKPATH *= $$framework_dir\n" - " LIBS *= -F$$framework_dir\n" - " INCLUDEPATH += $$framework_dir/$${QCA_NAME}.framework/Headers\n" - " LINKAGE = -framework $${QCA_NAME}\n" - " }\n" - "}\n" - "\n" - "# else, link normally\n" - "isEmpty(LINKAGE) {\n" - " !isEmpty(QCA_INCDIR):INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n" - " !isEmpty(QCA_LIBDIR):LIBS += -L$$QCA_LIBDIR\n" - " LINKAGE = -l$${QCA_NAME}\n" - " CONFIG(debug, debug|release) {\n" - " windows:LINKAGE = -l$${QCA_NAME}d\n" - " mac:LINKAGE = -l$${QCA_NAME}_debug\n" - " }\n" - "}\n" - "\n" - "LIBS += $$LINKAGE\n") - .arg(incdir, libdir, frameworkdir); - return out; -} - -// set either libdir or frameworkdir, but not both -static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release, - bool debug, QString *_prf) -{ - QString proextra; - QString prf; - if (!incdir.isEmpty() || !libdir.isEmpty() || !frameworkdir.isEmpty()) { - prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir); - } else { - prf = "CONFIG += crypto\n"; - } - proextra = "CONFIG += qt\n" - "CONFIG -= debug_and_release debug release\n" - "QT -= gui\n"; - proextra += prf; - - QString str = "#include \n" - "\n" - "int main()\n" - "{\n" - " unsigned long x = QCA_VERSION;\n" - " if(x >= 0x020000 && x < 0x030000) return 0; else return 1;\n" - "}\n"; - - // test desired versions, potentially both release and debug - - if (release) { - int ret; - if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += release\n", &ret) || ret != 0) - return false; - } - - if (debug) { - int ret; - if (!conf->doCompileAndLink(str, QStringList(), QString(), proextra + "CONFIG += debug\n", &ret) || ret != 0) - return false; - } - - *_prf = prf; - return true; -} - -static bool qca_try_lib(Conf *conf, const QString &incdir, const QString &libdir, bool release, bool debug, - QString *prf) -{ - return qca_try(conf, incdir, libdir, QString(), release, debug, prf) - || qca_try(conf, incdir + "/Qca-qt5", libdir, QString(), release, debug, prf); -} - -static bool qca_try_framework(Conf *conf, const QString &frameworkdir, bool release, bool debug, QString *prf) -{ - return qca_try(conf, QString(), QString(), frameworkdir, release, debug, prf); -} - -static bool qca_try_ext_prf(Conf *conf, bool release, bool debug, QString *prf) -{ - return qca_try(conf, QString(), QString(), QString(), release, debug, prf); -} - -//---------------------------------------------------------------------------- -// qc_qca -//---------------------------------------------------------------------------- -class qc_qca : public ConfObj { -public: - qc_qca(Conf *c) : ConfObj(c) { } - QString name() const { return "QCA >= 2.0"; } - QString shortname() const { return "qca"; } - bool exec() - { - // get the build mode -#ifdef QC_BUILDMODE - bool release = qc_buildmode_release; - bool debug = qc_buildmode_debug; -#else - // else, default to just release mode - bool release = true; - bool debug = false; -#endif - - QString qca_incdir, qca_libdir, qca_crypto_prf; - qca_incdir = conf->getenv("QC_WITH_QCA_INC"); - qca_libdir = conf->getenv("QC_WITH_QCA_LIB"); - -#if defined(Q_OS_MAC) - if (!qca_libdir.isEmpty() && qca_try_framework(conf, qca_libdir, release, debug, &qca_crypto_prf)) { - conf->addExtra(qca_crypto_prf); - return true; - } -#endif - - if (!qca_incdir.isEmpty() && !qca_libdir.isEmpty() - && qca_try_lib(conf, qca_incdir, qca_libdir, release, debug, &qca_crypto_prf)) { - conf->addExtra(qca_crypto_prf); - return true; - } - - if (qca_try_ext_prf(conf, release, debug, &qca_crypto_prf)) { - conf->addExtra(qca_crypto_prf); - return true; - } - - QStringList incs; - QString version, libs, other; - - if (conf->findPkgConfig("qca2-qt5", VersionMin, "2.0.0", &version, &incs, &libs, &other)) { - for (int n = 0; n < incs.count(); ++n) - conf->addIncludePath(incs[n]); - if (!libs.isEmpty()) - conf->addLib(libs); - return true; - } - - QStringList prefixes; -#ifndef Q_OS_WIN - prefixes += "/usr"; - prefixes += "/usr/local"; -#endif - QString prefix = conf->getenv("PREFIX"); - if (!prefix.isEmpty()) { - prefixes += prefix; - } - - for (int n = 0; n < prefixes.count(); ++n) { - const QString &prefix = prefixes[n]; - if (qca_try_lib(conf, prefix + "/include", prefix + "/lib", release, debug, &qca_crypto_prf)) { - conf->addExtra(qca_crypto_prf); - return true; - } - } - - return false; - } -}; diff --git a/qcm/qjdns.qcm b/qcm/qjdns.qcm deleted file mode 100644 index 4e1769fd..00000000 --- a/qcm/qjdns.qcm +++ /dev/null @@ -1,69 +0,0 @@ -/* ------BEGIN QCMOD----- -name: jdns -arg: with-qjdns-inc=[path],Path to QJDns include files -arg: with-qjdns-lib=[path],Path to QJDns library files ------END QCMOD----- -*/ - -//---------------------------------------------------------------------------- -// qc_qjdns -//---------------------------------------------------------------------------- -class qc_qjdns : public ConfObj { -public: - qc_qjdns(Conf *c) : ConfObj(c) { } - QString name() const { return "QJDns"; } - QString shortname() const { return "qjdns"; } - QString resultString() const - { -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - return "Disabled for Qt5 and above"; -#else - return ConfObj::resultString(); -#endif - } - bool exec() - { -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - return true; // hack. TODO: figure out how to force jdns -#endif - conf->addExtra("CONFIG += need_jdns"); -#if defined Q_OS_WIN || defined Q_OS_MAC - // HACK: on Windows and Mac OS X, always use psi's bundled qjdns - conf->addExtra("CONFIG += iris-qjdns"); - return true; -#else - QStringList incs; - QString version, libs, other; - QString s; - -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - bool found = conf->findPkgConfig("qjdns-qt5", VersionMin, "2.0.3", &version, &incs, &libs, &other); -#else - bool found = conf->findPkgConfig("qjdns-qt4", VersionMin, "2.0.3", &version, &incs, &libs, &other); -#endif - if (!found && !conf->findPkgConfig("qjdns", VersionMin, "2.0.0", &version, &incs, &libs, &other)) { - s = conf->getenv("QC_WITH_QJDNS_INC"); - if ((!s.isEmpty() && conf->checkHeader(s, "qjdns.h")) - || (s.isEmpty() && conf->findHeader("qjdns.h", QStringList(), &s))) { - incs.append(s); - } - - s = conf->getenv("QC_WITH_QJDNS_LIB"); - if ((!s.isEmpty() && conf->checkLibrary(s, "qjdns")) || (s.isEmpty() && conf->findLibrary("qjdns", &s))) { - libs = s.isEmpty() ? "-lqjdns -ljdns" : QString("-L%1 -lqjdns -ljdns").arg(s); - } - } - - if (!incs.isEmpty() && !libs.isEmpty()) { - foreach (const QString &inc, incs) { - conf->addIncludePath(inc); - } - conf->addLib(libs); - conf->addExtra("CONFIG += ext-qjdns"); - } - - return true; -#endif - } -}; diff --git a/qcm/qt42.qcm b/qcm/qt42.qcm deleted file mode 100644 index 2a97da17..00000000 --- a/qcm/qt42.qcm +++ /dev/null @@ -1,19 +0,0 @@ -/* ------BEGIN QCMOD----- -name: Qt >= 4.2 ------END QCMOD----- -*/ -class qc_qt42 : public ConfObj { -public: - qc_qt42(Conf *c) : ConfObj(c) { } - QString name() const { return "Qt >= 4.2"; } - QString shortname() const { return "qt42"; } - bool exec() - { - conf->debug(QString("QT_VERSION = 0x%1").arg(QString::number(QT_VERSION, 16))); - if (QT_VERSION >= 0x040200) - return true; - else - return false; - } -}; diff --git a/qcm/universal.qcm b/qcm/universal.qcm deleted file mode 100644 index dcfa9b62..00000000 --- a/qcm/universal.qcm +++ /dev/null @@ -1,45 +0,0 @@ -/* ------BEGIN QCMOD----- -name: Mac universal binary support -section: project -arg: universal,Build with Mac universal binary support. -arg: mac-sdk=[path],Path to Mac universal SDK (PPC host only). ------END QCMOD----- -*/ - -#define QC_UNIVERSAL -bool qc_universal_enabled = false; -QString qc_universal_sdk; - -//---------------------------------------------------------------------------- -// qc_universal -//---------------------------------------------------------------------------- -class qc_universal : public ConfObj { -public: - qc_universal(Conf *c) : ConfObj(c) { } - QString name() const { return "Mac universal binary support"; } - QString shortname() const { return "universal"; } - QString checkString() const { return QString(); } - - bool exec() - { -#ifdef Q_OS_MAC - if (qc_getenv("QC_UNIVERSAL") == "Y") { - qc_universal_enabled = true; - - QString str = "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n" - " CONFIG += x86 ppc\n" - "}\n"; - - QString sdk = qc_getenv("QC_MAC_SDK"); - if (!sdk.isEmpty()) { - str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk); - qc_universal_sdk = sdk; - } - - conf->addExtra(str); - } -#endif - return true; - } -}; diff --git a/qcm/zlib.qcm b/qcm/zlib.qcm deleted file mode 100644 index fbed96f5..00000000 --- a/qcm/zlib.qcm +++ /dev/null @@ -1,52 +0,0 @@ -/* ------BEGIN QCMOD----- -name: zlib -arg: with-zlib-inc=[path],Path to zlib include files -arg: with-zlib-lib=[path],Path to zlib library files ------END QCMOD----- -*/ - -//---------------------------------------------------------------------------- -// qc_zlib -//---------------------------------------------------------------------------- -class qc_zlib : public ConfObj { -public: - qc_zlib(Conf *c) : ConfObj(c) { } - QString name() const { return "zlib"; } - QString shortname() const { return "zlib"; } - bool exec() - { - QString inc, lib; - QString s; - - s = conf->getenv("QC_WITH_ZLIB_INC"); - if (!s.isEmpty()) { - if (!conf->checkHeader(s, "zlib.h")) - return false; - inc = s; - } else { - if (!conf->findHeader("zlib.h", QStringList(), &s)) - return false; - inc = s; - } - - s = conf->getenv("QC_WITH_ZLIB_LIB"); - if (!s.isEmpty()) { - if (!conf->checkLibrary(s, "z")) - return false; - lib = s; - } else { - if (!conf->findLibrary("z", &s)) - return false; - lib = s; - } - - if (!inc.isEmpty()) - conf->addIncludePath(inc); - if (!lib.isEmpty()) - conf->addLib(QString("-L") + s); - conf->addLib("-lz"); - - return true; - } -}; diff --git a/src/irisnet/appledns/appledns.pri b/src/irisnet/appledns/appledns.pri deleted file mode 100644 index ff4c190f..00000000 --- a/src/irisnet/appledns/appledns.pri +++ /dev/null @@ -1,6 +0,0 @@ -QT *= network - -HEADERS += $$PWD/qdnssd.h -SOURCES += $$PWD/qdnssd.cpp $$PWD/appledns.cpp - -!mac:LIBS += -ldns_sd diff --git a/src/irisnet/appledns/appledns.pro b/src/irisnet/appledns/appledns.pro deleted file mode 100644 index ff2bcf57..00000000 --- a/src/irisnet/appledns/appledns.pro +++ /dev/null @@ -1,14 +0,0 @@ -IRIS_BASE = ../../.. -include(../../libbase.pri) - -TEMPLATE = lib -CONFIG += plugin -QT -= gui -DESTDIR = $$IRIS_BASE/plugins - -VERSION = 1.0.0 - -INCLUDEPATH *= $$PWD/../corelib -LIBS += -L$$IRIS_BASE/lib -lirisnetcore - -include(appledns.pri) diff --git a/src/irisnet/appledns/sdtest.pro b/src/irisnet/appledns/sdtest.pro deleted file mode 100644 index 0f914347..00000000 --- a/src/irisnet/appledns/sdtest.pro +++ /dev/null @@ -1,9 +0,0 @@ -CONFIG += console -CONFIG -= app_bundle -QT -= gui -QT += network - -HEADERS += qdnssd.h -SOURCES += qdnssd.cpp sdtest.cpp - -!mac:LIBS += -ldns_sd diff --git a/src/irisnet/corelib/corelib.pri b/src/irisnet/corelib/corelib.pri deleted file mode 100644 index f188bbfe..00000000 --- a/src/irisnet/corelib/corelib.pri +++ /dev/null @@ -1,52 +0,0 @@ -QT *= network - -HEADERS += \ - $$PWD/objectsession.h \ - $$PWD/irisnetexport.h \ - $$PWD/irisnetplugin.h \ - $$PWD/irisnetglobal.h \ - $$PWD/irisnetglobal_p.h \ - $$PWD/netinterface.h \ - $$PWD/netavailability.h \ - $$PWD/netnames.h \ - $$PWD/addressresolver.h - -SOURCES += \ - $$PWD/objectsession.cpp \ - $$PWD/irisnetplugin.cpp \ - $$PWD/irisnetglobal.cpp \ - $$PWD/netinterface.cpp \ - $$PWD/netavailability.cpp \ - $$PWD/netnames.cpp \ - $$PWD/addressresolver.cpp - -unix { - SOURCES += \ - $$PWD/netinterface_unix.cpp -} - -need_jdns|lessThan(QT_MAJOR_VERSION, 5) { - !ext-qjdns { - include(../../jdns/jdns.pri) - INCLUDEPATH += $$PWD/../../jdns - } - - SOURCES += \ - $$PWD/netnames_jdns.cpp - - DEFINES += NEED_JDNS -} else { - SOURCES += $$PWD/netinterface_qtname.cpp \ -} - -equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 15) { - SOURCES += $$PWD/netinterface_qtnet.cpp - DEFINES += HAVE_QTNET -} - -#include(legacy/legacy.pri) - -appledns:appledns_bundle { - DEFINES += APPLEDNS_STATIC - include(../appledns/appledns.pri) -} diff --git a/src/irisnet/corelib/corelib.pro b/src/irisnet/corelib/corelib.pro deleted file mode 100644 index 1df24aaa..00000000 --- a/src/irisnet/corelib/corelib.pro +++ /dev/null @@ -1,17 +0,0 @@ -IRIS_BASE = ../../.. - -TEMPLATE = lib -QT -= gui -TARGET = irisnetcore -DESTDIR = $$IRIS_BASE/lib -windows:DLLDESTDIR = $$IRIS_BASE/bin - -VERSION = 1.0.0 - -include(../../libbase.pri) -include(corelib.pri) - -# fixme: irisnetcore builds as dll or bundled, never static? -CONFIG += create_prl -windows:!staticlib:DEFINES += IRISNET_MAKEDLL -staticlib:PRL_EXPORT_DEFINES += IRISNET_STATIC diff --git a/src/irisnet/irisnet.pro b/src/irisnet/irisnet.pro deleted file mode 100644 index 092e139d..00000000 --- a/src/irisnet/irisnet.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = subdirs - -include(../libbase.pri) - -sub_corelib.subdir = corelib -sub_appledns.subdir = appledns -sub_appledns.depends = sub_corelib -sub_noncore.subdir = noncore -!irisnetcore_bundle:sub_noncore.depends = sub_corelib - -!irisnetcore_bundle:SUBDIRS += sub_corelib -appledns:!appledns_bundle:SUBDIRS += sub_appledns -!iris_bundle:SUBDIRS += sub_noncore - -OTHER_FILES += CMakeLists.txt diff --git a/src/irisnet/noncore/cutestuff/cutestuff.pri b/src/irisnet/noncore/cutestuff/cutestuff.pri deleted file mode 100644 index f3fd8606..00000000 --- a/src/irisnet/noncore/cutestuff/cutestuff.pri +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDEPATH += $$PWD - -HEADERS += \ - $$PWD/bytestream.h \ - $$PWD/bsocket.h \ - $$PWD/httpconnect.h \ - $$PWD/httppoll.h \ - $$PWD/socks.h - -SOURCES += \ - $$PWD/bytestream.cpp \ - $$PWD/bsocket.cpp \ - $$PWD/httpconnect.cpp \ - $$PWD/httppoll.cpp \ - $$PWD/socks.cpp diff --git a/src/irisnet/noncore/legacy/legacy.pri b/src/irisnet/noncore/legacy/legacy.pri deleted file mode 100644 index 7c8838da..00000000 --- a/src/irisnet/noncore/legacy/legacy.pri +++ /dev/null @@ -1,7 +0,0 @@ -HEADERS += \ - $$PWD/ndns.h \ - $$PWD/srvresolver.h - -SOURCES += \ - $$PWD/ndns.cpp \ - $$PWD/srvresolver.cpp diff --git a/src/irisnet/noncore/noncore.pri b/src/irisnet/noncore/noncore.pri deleted file mode 100644 index 9a4bcf16..00000000 --- a/src/irisnet/noncore/noncore.pri +++ /dev/null @@ -1,55 +0,0 @@ -IRIS_BASE = $$PWD/../../.. - -QT *= network - -irisnetcore_bundle:{ - include(../corelib/corelib.pri) -} -else { - LIBS += -L$$IRIS_BASE/lib -lirisnetcore -} - -INCLUDEPATH += $$PWD/../corelib - -include($$PWD/cutestuff/cutestuff.pri) - -HEADERS += \ - $$PWD/dtls.h \ - $$PWD/iceagent.h \ - $$PWD/processquit.h \ - $$PWD/stunutil.h \ - $$PWD/stunmessage.h \ - $$PWD/stuntypes.h \ - $$PWD/stuntransaction.h \ - $$PWD/stunbinding.h \ - $$PWD/stunallocate.h \ - $$PWD/turnclient.h \ - $$PWD/udpportreserver.h \ - $$PWD/icetransport.h \ - $$PWD/icelocaltransport.h \ - $$PWD/iceturntransport.h \ - $$PWD/icecomponent.h \ - $$PWD/ice176.h \ - $$PWD/tcpportreserver.h - -SOURCES += \ - $$PWD/dtls.cpp \ - $$PWD/iceagent.cpp \ - $$PWD/processquit.cpp \ - $$PWD/stunutil.cpp \ - $$PWD/stunmessage.cpp \ - $$PWD/stuntypes.cpp \ - $$PWD/stuntransaction.cpp \ - $$PWD/stunbinding.cpp \ - $$PWD/stunallocate.cpp \ - $$PWD/turnclient.cpp \ - $$PWD/udpportreserver.cpp \ - $$PWD/icetransport.cpp \ - $$PWD/icelocaltransport.cpp \ - $$PWD/iceturntransport.cpp \ - $$PWD/icecomponent.cpp \ - $$PWD/ice176.cpp \ - $$PWD/tcpportreserver.cpp - -INCLUDEPATH += $$PWD/legacy -include(legacy/legacy.pri) diff --git a/src/irisnet/noncore/noncore.pro b/src/irisnet/noncore/noncore.pro deleted file mode 100644 index 29ee6f57..00000000 --- a/src/irisnet/noncore/noncore.pro +++ /dev/null @@ -1,15 +0,0 @@ -IRIS_BASE = ../../.. - -TEMPLATE = lib -QT -= gui -TARGET = irisnet -DESTDIR = $$IRIS_BASE/lib -CONFIG += staticlib create_prl crypto - -VERSION = 1.0.0 - -include(../../libbase.pri) -include(noncore.pri) - -windows:!staticlib:DEFINES += IRISNET_MAKEDLL -staticlib:PRL_EXPORT_DEFINES += IRISNET_STATIC diff --git a/src/libbase.pri b/src/libbase.pri deleted file mode 100644 index 62b58536..00000000 --- a/src/libbase.pri +++ /dev/null @@ -1,8 +0,0 @@ -IRIS_BASE = $$PWD/.. - -isEmpty(top_iris_builddir):top_iris_builddir = . -include($$top_iris_builddir/../conf.pri) - -include(../common.pri) - -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index a5a5ca0c..00000000 --- a/src/src.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = subdirs - -include(libbase.pri) - -sub_irisnet.subdir = irisnet -sub_xmpp.subdir = xmpp -sub_xmpp.depends = sub_irisnet - -SUBDIRS += sub_irisnet -!iris_bundle:SUBDIRS += sub_xmpp diff --git a/src/xmpp/base/base.pri b/src/xmpp/base/base.pri deleted file mode 100644 index e9c463d4..00000000 --- a/src/xmpp/base/base.pri +++ /dev/null @@ -1,11 +0,0 @@ -INCLUDEPATH += $$PWD/../.. -DEPENDPATH += $$PWD/../.. - -HEADERS += \ - $$PWD/randomnumbergenerator.h \ - $$PWD/randrandomnumbergenerator.h \ - $$PWD/timezone.h - -SOURCES += \ - $$PWD/randomnumbergenerator.cpp \ - $$PWD/timezone.cpp diff --git a/src/xmpp/base/unittest/unittest.pri b/src/xmpp/base/unittest/unittest.pri deleted file mode 100644 index 0014eb89..00000000 --- a/src/xmpp/base/unittest/unittest.pri +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES += \ - $$PWD/randrandomnumbergeneratortest.cpp \ - $$PWD/randomnumbergeneratortest.cpp diff --git a/src/xmpp/base/unittest/unittest.pro b/src/xmpp/base/unittest/unittest.pro deleted file mode 100644 index 2a0edb78..00000000 --- a/src/xmpp/base/unittest/unittest.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../../modules.pri) -include($$IRIS_XMPP_QA_UNITTEST_MODULE) -include($$IRIS_XMPP_BASE_MODULE) -include(unittest.pri) diff --git a/src/xmpp/blake2/blake2.pri b/src/xmpp/blake2/blake2.pri deleted file mode 100644 index 6ed4bd71..00000000 --- a/src/xmpp/blake2/blake2.pri +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDEPATH *= $$PWD/../.. -DEPENDPATH *= $$PWD/../.. - -SOURCES += $$PWD/blake2qt.cpp - -bundled_blake2 { - SOURCES += \ - $$PWD/blake2s-ref.c \ - $$PWD/blake2b-ref.c - HEADERS += $$PWD/blake2.h - INCLUDEPATH += $PWD -} else { - DEFINES += IRIS_SYSTEM_BLAKE2 -} - -HEADERS += $$PWD/blake2qt.h - -OTHER_FILES += $$PWD/README.md diff --git a/src/xmpp/common.pri b/src/xmpp/common.pri deleted file mode 100644 index 6cd8bb4f..00000000 --- a/src/xmpp/common.pri +++ /dev/null @@ -1,3 +0,0 @@ -OBJECTS_DIR = .obj -MOC_DIR = .moc -UI_DIR = .ui diff --git a/src/xmpp/jid/jid.pri b/src/xmpp/jid/jid.pri deleted file mode 100644 index b67e6ff3..00000000 --- a/src/xmpp/jid/jid.pri +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDEPATH *= $$PWD/../.. -DEPENDPATH *= $$PWD/../.. - -HEADERS += \ - $$PWD/jid.h - -SOURCES += \ - $$PWD/jid.cpp diff --git a/src/xmpp/jid/unittest/unittest.pri b/src/xmpp/jid/unittest/unittest.pri deleted file mode 100644 index e0994628..00000000 --- a/src/xmpp/jid/unittest/unittest.pri +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += \ - $$PWD/jidtest.cpp diff --git a/src/xmpp/jid/unittest/unittest.pro b/src/xmpp/jid/unittest/unittest.pro deleted file mode 100644 index fd9fa52b..00000000 --- a/src/xmpp/jid/unittest/unittest.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../../modules.pri) -include($$IRIS_XMPP_QA_UNITTEST_MODULE) -include($$IRIS_XMPP_JID_MODULE) -include(unittest.pri) diff --git a/src/xmpp/modules.pri b/src/xmpp/modules.pri deleted file mode 100644 index cc0a3632..00000000 --- a/src/xmpp/modules.pri +++ /dev/null @@ -1,7 +0,0 @@ -IRIS_XMPP_QA_UNITTEST_MODULE = $$PWD/qa/unittest.pri -IRIS_XMPP_JID_MODULE = $$PWD/jid/jid.pri -IRIS_XMPP_SASL_MODULE = $$PWD/sasl/sasl.pri -IRIS_XMPP_BASE_MODULE = $$PWD/base/base.pri -IRIS_XMPP_ZLIB_MODULE = $$PWD/zlib/zlib.pri -IRIS_XMPP_BLAKE2_MODULE = $$PWD/blake2/blake2.pri -IRIS_XMPP_STRINGPREP_MODULE = $$PWD/../../3rdparty/stringprep/stringprep.pri diff --git a/src/xmpp/qa/qttestutil/example/example.pro b/src/xmpp/qa/qttestutil/example/example.pro deleted file mode 100644 index 086b4790..00000000 --- a/src/xmpp/qa/qttestutil/example/example.pro +++ /dev/null @@ -1,23 +0,0 @@ -# -# Example unit test module with 2 unit test suites. -# - -include(../qttestutil.pri) - -QT += testlib -QT -= gui -CONFIG -= app_bundle - -TARGET = checker - -SOURCES += \ - myfirstclasstest.cpp \ - mysecondclasstest.cpp \ - ../simplechecker.cpp - -# Add an extra 'make check' target. -QMAKE_EXTRA_TARGETS = check -check.commands = \$(MAKE) && ./$(QMAKE_TARGET) - -# Cleanup the checker on 'make clean' -QMAKE_CLEAN += $(QMAKE_TARGET) diff --git a/src/xmpp/qa/qttestutil/qttestutil.pri b/src/xmpp/qa/qttestutil/qttestutil.pri deleted file mode 100644 index e11607b3..00000000 --- a/src/xmpp/qa/qttestutil/qttestutil.pri +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDEPATH *= $$PWD/.. -DEPENDPATH *= $$PWD/.. - -SOURCES += \ - $$PWD/testregistry.cpp diff --git a/src/xmpp/qa/unittest.pri b/src/xmpp/qa/unittest.pri deleted file mode 100644 index 85267535..00000000 --- a/src/xmpp/qa/unittest.pri +++ /dev/null @@ -1,28 +0,0 @@ -# -# Declares all common settings/includes for a unittest module. -# -# Include this file from your module's unittest project file to create a -# standalone checker for the module. -# - -CONFIG += crypto - -include($$PWD/qttestutil/qttestutil.pri) -include($$PWD/../common.pri) - -QT += testlib -QT -= gui -CONFIG -= app_bundle - -INCLUDEPATH *= $$PWD -DEPENDPATH *= $$PWD - -TARGET = checker - -SOURCES += \ - $$PWD/qttestutil/simplechecker.cpp - -QMAKE_EXTRA_TARGETS = check -check.commands = \$(MAKE) && ./checker - -QMAKE_CLEAN += $(QMAKE_TARGET) diff --git a/src/xmpp/qa/unittest.template/unittest.pri b/src/xmpp/qa/unittest.template/unittest.pri deleted file mode 100644 index fd93c47b..00000000 --- a/src/xmpp/qa/unittest.template/unittest.pri +++ /dev/null @@ -1,2 +0,0 @@ -SOURCES += \ - $$PWD/myclasstest.cpp diff --git a/src/xmpp/qa/unittest.template/unittest.pro b/src/xmpp/qa/unittest.template/unittest.pro deleted file mode 100644 index e2574cbf..00000000 --- a/src/xmpp/qa/unittest.template/unittest.pro +++ /dev/null @@ -1,4 +0,0 @@ -include(../../modules.pri) -include($$IRIS_XMPP_QA_UNITTEST_MODULE) -include($$MYMODULE) -include(unittest.pri) diff --git a/src/xmpp/qa/unittests.pri b/src/xmpp/qa/unittests.pri deleted file mode 100644 index 2509e1e5..00000000 --- a/src/xmpp/qa/unittests.pri +++ /dev/null @@ -1,4 +0,0 @@ -# All available unit tests - -include($$PWD/../base/unittest/unittest.pri) -include($$PWD/../sasl/unittest/unittest.pri) diff --git a/src/xmpp/qa/unittests/unittests.pro b/src/xmpp/qa/unittests/unittests.pro deleted file mode 100644 index 00176049..00000000 --- a/src/xmpp/qa/unittests/unittests.pro +++ /dev/null @@ -1,6 +0,0 @@ -include(../../../../iris.pri) -include(../unittests.pri) -include(../unittest.pri) - -# FIXME -include(../../../../../third-party/qca/qca.pri) diff --git a/src/xmpp/sasl/sasl.pri b/src/xmpp/sasl/sasl.pri deleted file mode 100644 index 1248370c..00000000 --- a/src/xmpp/sasl/sasl.pri +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDEPATH *= $$PWD/../.. -DEPENDPATH *= $$PWD/../.. - -HEADERS += \ - $$PWD/plainmessage.h \ - $$PWD/digestmd5proplist.h \ - $$PWD/digestmd5response.h \ - $$PWD/scramsha1message.h \ - $$PWD/scramsha1response.h \ - $$PWD/scramsha1signature.cpp - -SOURCES += \ - $$PWD/plainmessage.cpp \ - $$PWD/digestmd5proplist.cpp \ - $$PWD/digestmd5response.cpp \ - $$PWD/scramsha1message.cpp \ - $$PWD/scramsha1response.cpp \ - $$PWD/scramsha1signature.cpp diff --git a/src/xmpp/sasl/unittest/unittest.pri b/src/xmpp/sasl/unittest/unittest.pri deleted file mode 100644 index a4e78d02..00000000 --- a/src/xmpp/sasl/unittest/unittest.pri +++ /dev/null @@ -1,5 +0,0 @@ -SOURCES += \ - $$PWD/plainmessagetest.cpp \ - $$PWD/digestmd5responsetest.cpp \ - $$PWD/scramsha1messagetest.cpp \ - $$PWD/scramsha1responsetest.cpp diff --git a/src/xmpp/sasl/unittest/unittest.pro b/src/xmpp/sasl/unittest/unittest.pro deleted file mode 100644 index 055d8665..00000000 --- a/src/xmpp/sasl/unittest/unittest.pro +++ /dev/null @@ -1,12 +0,0 @@ -include(../../modules.pri) -include($$IRIS_XMPP_QA_UNITTEST_MODULE) -include($$IRIS_XMPP_SASL_MODULE) -include($$IRIS_XMPP_BASE_MODULE) -include($$IRIS_XMPP_BASE64_MODULE) -include($$IRIS_XMPP_JID_MODULE) -include(unittest.pri) - -# QCA stuff. -# TODO: Remove the dependency on QCA from this module -include(../../../../../third-party/qca/qca.pri) -include(../../../../../third-party/qca/qca-ossl.pri) diff --git a/src/xmpp/xmpp.pri b/src/xmpp/xmpp.pri deleted file mode 100644 index e5d2268e..00000000 --- a/src/xmpp/xmpp.pri +++ /dev/null @@ -1,136 +0,0 @@ -IRIS_BASE = $PWD/../.. -include(../libbase.pri) -include($$PWD/modules.pri) - -QT *= xml network - -INCLUDEPATH += $$PWD/../irisnet/corelib $$PWD/../irisnet/noncore $$PWD/../irisnet/noncore/legacy $$PWD/../irisnet/noncore/cutestuff -iris_bundle:{ - include(../irisnet/noncore/noncore.pri) -} -else { - LIBS += -L$$top_iris_builddir/lib -lirisnet -} - -include($$IRIS_XMPP_BASE_MODULE) -include($$IRIS_XMPP_ZLIB_MODULE) -include($$IRIS_XMPP_JID_MODULE) -include($$IRIS_XMPP_SASL_MODULE) -include($$IRIS_XMPP_BLAKE2_MODULE) -include($$IRIS_XMPP_STRINGPREP_MODULE) - -DEFINES += XMPP_TEST - -INCLUDEPATH += \ - $$PWD/ \ - $$PWD/.. \ - $$PWD/xmpp-core \ - $$PWD/xmpp-im - -HEADERS += \ - $$PWD/xmpp-core/compressionhandler.h \ - $$PWD/xmpp-core/parser.h \ - $$PWD/xmpp-core/protocol.h \ - $$PWD/xmpp-core/securestream.h \ - $$PWD/xmpp-core/sm.h \ - $$PWD/xmpp-core/td.h \ - $$PWD/xmpp-core/xmlprotocol.h \ - $$PWD/xmpp-core/xmpp_clientstream.h \ - $$PWD/xmpp-core/xmpp.h \ - $$PWD/xmpp-core/xmpp_stanza.h \ - $$PWD/xmpp-core/xmpp_stream.h \ - $$PWD/xmpp-im/filetransfer.h \ - $$PWD/xmpp-im/httpfileupload.h \ - $$PWD/xmpp-im/im.h \ - $$PWD/xmpp-im/jingle-ice.h \ - $$PWD/xmpp-im/jingle.h \ - $$PWD/xmpp-im/jingle-transport.h \ - $$PWD/xmpp-im/jingle-nstransportslist.h \ - $$PWD/xmpp-im/jingle-application.h \ - $$PWD/xmpp-im/jingle-session.h \ - $$PWD/xmpp-im/jingle-ft.h \ - $$PWD/xmpp-im/jingle-ibb.h \ - $$PWD/xmpp-im/jingle-s5b.h \ - $$PWD/xmpp-im/s5b.h \ - $$PWD/xmpp-im/xmpp_address.h \ - $$PWD/xmpp-im/xmpp_agentitem.h \ - $$PWD/xmpp-im/xmpp_bitsofbinary.h \ - $$PWD/xmpp-im/xmpp_bytestream.h \ - $$PWD/xmpp-im/xmpp_caps.h \ - $$PWD/xmpp-im/xmpp_captcha.h \ - $$PWD/xmpp-im/xmpp_chatstate.h \ - $$PWD/xmpp-im/xmpp_client.h \ - $$PWD/xmpp-im/xmpp_discoinfotask.h \ - $$PWD/xmpp-im/xmpp_discoitem.h \ - $$PWD/xmpp-im/xmpp_features.h \ - $$PWD/xmpp-im/xmpp_form.h \ - $$PWD/xmpp-im/xmpp_hash.h \ - $$PWD/xmpp-im/xmpp_htmlelement.h \ - $$PWD/xmpp-im/xmpp_httpauthrequest.h \ - $$PWD/xmpp-im/xmpp_ibb.h \ - $$PWD/xmpp-im/xmpp_liveroster.h \ - $$PWD/xmpp-im/xmpp_liverosteritem.h \ - $$PWD/xmpp-im/xmpp_message.h \ - $$PWD/xmpp-im/xmpp_muc.h \ - $$PWD/xmpp-im/xmpp_pubsubitem.h \ - $$PWD/xmpp-im/xmpp_receipts.h \ - $$PWD/xmpp-im/xmpp_reference.h \ - $$PWD/xmpp-im/xmpp_resource.h \ - $$PWD/xmpp-im/xmpp_resourcelist.h \ - $$PWD/xmpp-im/xmpp_roster.h \ - $$PWD/xmpp-im/xmpp_rosteritem.h \ - $$PWD/xmpp-im/xmpp_rosterx.h \ - $$PWD/xmpp-im/xmpp_serverinfomanager.h \ - $$PWD/xmpp-im/xmpp_status.h \ - $$PWD/xmpp-im/xmpp_subsets.h \ - $$PWD/xmpp-im/xmpp_task.h \ - $$PWD/xmpp-im/xmpp_tasks.h \ - $$PWD/xmpp-im/xmpp_thumbs.h \ - $$PWD/xmpp-im/xmpp_url.h \ - $$PWD/xmpp-im/xmpp_vcard.h \ - $$PWD/xmpp-im/xmpp_xdata.h \ - $$PWD/xmpp-im/xmpp_xmlcommon.h - -SOURCES += \ - $$PWD/xmpp-core/connector.cpp \ - $$PWD/xmpp-core/tlshandler.cpp \ - $$PWD/xmpp-core/securestream.cpp \ - $$PWD/xmpp-core/parser.cpp \ - $$PWD/xmpp-core/xmlprotocol.cpp \ - $$PWD/xmpp-core/protocol.cpp \ - $$PWD/xmpp-core/sm.cpp \ - $$PWD/xmpp-core/compressionhandler.cpp \ - $$PWD/xmpp-core/stream.cpp \ - $$PWD/xmpp-core/simplesasl.cpp \ - $$PWD/xmpp-core/xmpp_stanza.cpp \ - $$PWD/xmpp-im/jingle-ice.cpp \ - $$PWD/xmpp-im/types.cpp \ - $$PWD/xmpp-im/client.cpp \ - $$PWD/xmpp-im/xmpp_features.cpp \ - $$PWD/xmpp-im/xmpp_discoitem.cpp \ - $$PWD/xmpp-im/xmpp_discoinfotask.cpp \ - $$PWD/xmpp-im/xmpp_xdata.cpp \ - $$PWD/xmpp-im/xmpp_subsets.cpp \ - $$PWD/xmpp-im/xmpp_task.cpp \ - $$PWD/xmpp-im/xmpp_tasks.cpp \ - $$PWD/xmpp-im/xmpp_xmlcommon.cpp \ - $$PWD/xmpp-im/xmpp_vcard.cpp \ - $$PWD/xmpp-im/xmpp_bytestream.cpp \ - $$PWD/xmpp-im/s5b.cpp \ - $$PWD/xmpp-im/xmpp_ibb.cpp \ - $$PWD/xmpp-im/xmpp_reference.cpp \ - $$PWD/xmpp-im/filetransfer.cpp \ - $$PWD/xmpp-im/httpfileupload.cpp \ - $$PWD/xmpp-im/xmpp_bitsofbinary.cpp \ - $$PWD/xmpp-im/xmpp_caps.cpp \ - $$PWD/xmpp-im/xmpp_serverinfomanager.cpp \ - $$PWD/xmpp-im/jingle.cpp \ - $$PWD/xmpp-im/jingle-transport.cpp \ - $$PWD/xmpp-im/jingle-application.cpp \ - $$PWD/xmpp-im/jingle-nstransportslist.cpp \ - $$PWD/xmpp-im/jingle-session.cpp \ - $$PWD/xmpp-im/jingle-ft.cpp \ - $$PWD/xmpp-im/jingle-s5b.cpp \ - $$PWD/xmpp-im/jingle-ibb.cpp - -OTHER_FILES += $$PWD/CMakeLists.txt diff --git a/src/xmpp/xmpp.pro b/src/xmpp/xmpp.pro deleted file mode 100644 index 32b0b236..00000000 --- a/src/xmpp/xmpp.pro +++ /dev/null @@ -1,17 +0,0 @@ -IRIS_BASE = ../.. - -TEMPLATE = lib -#QT -= gui -TARGET = iris -DESTDIR = $$IRIS_BASE/lib -CONFIG += staticlib create_prl crypto -OBJECTS_DIR = .obj -MOC_DIR = .moc -UI_DIR = .ui - -VERSION = 1.0.0 - -# static targets don't pick up prl defines -DEFINES += IRISNET_STATIC - -include(xmpp.pri) diff --git a/src/xmpp/zlib/zlib.pri b/src/xmpp/zlib/zlib.pri deleted file mode 100644 index 9be9dac4..00000000 --- a/src/xmpp/zlib/zlib.pri +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDEPATH *= $$PWD/../.. -DEPENDPATH *= $$PWD/../.. - -HEADERS += \ - $$PWD/zlibcompressor.h \ - $$PWD/zlibdecompressor.h - -SOURCES += \ - $$PWD/zlibcompressor.cpp \ - $$PWD/zlibdecompressor.cpp diff --git a/tools/icetunnel/icetunnel.pro b/tools/icetunnel/icetunnel.pro deleted file mode 100644 index 11bd64d3..00000000 --- a/tools/icetunnel/icetunnel.pro +++ /dev/null @@ -1,20 +0,0 @@ -IRIS_BASE = ../.. -include(../../confapp.pri) - -CONFIG += console crypto -CONFIG -= app_bundle -QT -= gui -QT += network - -CONFIG *= depend_prl - -INCLUDEPATH += ../../include ../../include/iris - -iris_bundle:{ - include(../../src/irisnet/noncore/noncore.pri) -} -else { - LIBS += -L$$IRIS_BASE/lib -lirisnet -} - -SOURCES += main.cpp diff --git a/tools/nettool/nettool.pro b/tools/nettool/nettool.pro deleted file mode 100644 index 0820fe4c..00000000 --- a/tools/nettool/nettool.pro +++ /dev/null @@ -1,31 +0,0 @@ -IRIS_BASE = ../.. -include(../../confapp.pri) - -CONFIG += console -CONFIG -= app_bundle -QT -= gui -QT += network -DESTDIR = ../../bin - -CONFIG *= depend_prl - -INCLUDEPATH += ../../include ../../include/iris - -iris_bundle:{ - include(../../src/irisnet/noncore/noncore.pri) -} -else { - LIBS += -L$$IRIS_BASE/lib -lirisnet -} - -# qt < 4.4 doesn't enable link_prl by default. we could just enable it, -# except that in 4.3 or earlier the link_prl feature is too aggressive and -# pulls in unnecessary deps. so, for 4.3 and earlier, we'll just explicitly -# specify the stuff the prl should have given us. -# also, mingw seems to have broken prl support?? -win32-g++|contains($$list($$[QT_VERSION]), 4.0.*|4.1.*|4.2.*|4.3.*) { - DEFINES += IRISNET_STATIC # from irisnet - windows:LIBS += -lWs2_32 -lAdvapi32 # from jdns -} - -SOURCES += main.cpp diff --git a/tools/tools.pro b/tools/tools.pro deleted file mode 100644 index e677169a..00000000 --- a/tools/tools.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = nettool icetunnel xmpptest diff --git a/tools/xmpptest/xmpptest.pro b/tools/xmpptest/xmpptest.pro deleted file mode 100644 index eee8edef..00000000 --- a/tools/xmpptest/xmpptest.pro +++ /dev/null @@ -1,10 +0,0 @@ -IRIS_BASE = ../.. -include(../../confapp.pri) - -CONFIG -= app_bundle -QT += xml network widgets - -include(../../iris.pri) - -SOURCES += xmpptest.cpp -INTERFACES += test.ui