diff options
93 files changed, 0 insertions, 2403 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ca8517bd..e0f8ce287 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -77,13 +77,6 @@ jobs: cacheid: 'cmake', } - { - name: 'Build on Linux (QMake)', - script: './scripts/build-qbs-with-qmake.sh', - image: 'focal', - options: 'CONFIG+=ccache', - cacheid: 'qmake', - } - - { name: 'Build on Linux (gcc, Qt 6.2)', image: 'focal-qt6', script: './scripts/build-qbs-with-qbs.sh', diff --git a/doc/doc.pri b/doc/doc.pri deleted file mode 100644 index cd05a9450..000000000 --- a/doc/doc.pri +++ /dev/null @@ -1,18 +0,0 @@ -include(../src/install_prefix.pri) - -include(doc_shared.pri) - -DOC_OUTDIR_POSTFIX = /html -DOC_HTML_INSTALLDIR = $$QBS_INSTALL_PREFIX/share/doc/qbs -DOC_QCH_OUTDIR = $$OUT_PWD/doc -DOC_QCH_INSTALLDIR = $$QBS_INSTALL_PREFIX/share/doc/qbs - -include(doc_targets.pri) - -fixnavi.commands = \ - cd $$shell_path($$PWD) && \ - perl fixnavi.pl -Dqcmanual -Dqtquick \ - qbs.qdoc -QMAKE_EXTRA_TARGETS += fixnavi - -include(man/man.pri) diff --git a/doc/doc_shared.pri b/doc/doc_shared.pri deleted file mode 100644 index 3e4eccf48..000000000 --- a/doc/doc_shared.pri +++ /dev/null @@ -1,14 +0,0 @@ -include(../qbs_version.pri) - -qbsdoc_version.name = QBS_VERSION -qbsdoc_version.value = $$QBS_VERSION -qbsdoc_versiontag.name = QBS_VERSION_TAG -qbsdoc_versiontag.value = $$replace(QBS_VERSION, "[-.]", ) -qbsdoc_qtdocs.name = QT_INSTALL_DOCS -qbsdoc_qtdocs.value = $$[QT_INSTALL_DOCS/src] -QDOC_ENV += qbsdoc_version qbsdoc_versiontag qbsdoc_qtdocs - -build_online_docs: \ - DOC_FILES += $$PWD/qbs-online.qdocconf -else: \ - DOC_FILES += $$PWD/qbs.qdocconf diff --git a/doc/doc_targets.pri b/doc/doc_targets.pri deleted file mode 100644 index 0636be2b5..000000000 --- a/doc/doc_targets.pri +++ /dev/null @@ -1,86 +0,0 @@ -# Creates targets for building documentation -# (adapted from qt_docs.prf) -# -# Usage: Define variables (details below) and include this pri file afterwards. -# -# QDOC_ENV - environment variables to set for the qdoc call (see example below) -# DOC_INDEX_PATHS - list of paths where qdoc should search for index files of dependent -# modules (Qt index path is included by default) -# DOC_FILES - list of qdocconf files -# DOC_OUTDIR_POSTFIX - html is generated in $$OUT_PWD/<qdocconf_name>$$DOC_OUTDIR_POSTFIX -# DOC_HTML_INSTALLDIR - path were to install the directory of html files -# DOC_QCH_OUTDIR - path where to generated the qch files -# DOC_QCH_INSTALLDIR - path where to install the qch files -# DOC_TARGET_PREFIX - prefix for generated target names -# -# Example for QDOC_ENV: -# ver.name = VERSION -# ver.value = 1.0.2 -# foo.name = FOO -# foo.value = foo -# QDOC_ENV = ver foo - -isEmpty(DOC_FILES): error("Set DOC_FILES before including doc_targets.pri") -isEmpty(DOC_HTML_INSTALLDIR): error("Set DOC_HTML_INSTALLDIR before including doc_targets.pri") -isEmpty(DOC_QCH_OUTDIR): error("Set DOC_QCH_OUTDIR before including doc_targets.pri") -isEmpty(DOC_QCH_INSTALLDIR): error("Set DOC_QCH_INSTALLDIR before including doc_targets.pri") - -QT_TOOL_ENV = $$QDOC_ENV -qtPrepareTool(QDOC, qdoc) -QT_TOOL_ENV = - -!build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator) - -DOCS_BASE_OUTDIR = $$OUT_PWD/doc -DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS]) -for (index_path, DOC_INDEX_PATHS): \ - DOC_INDEXES += -indexdir $$shell_quote($$index_path) - -DTP = $$DOC_TARGET_PREFIX -for (doc_file, DOC_FILES) { - !exists($$doc_file): error("Cannot find documentation specification file $$doc_file") - DOC_TARGET = $$replace(doc_file, ^(.*/)?(.*)\\.qdocconf$, \\2) - DOC_TARGETDIR = $$DOC_TARGET - DOC_OUTPUTDIR = $${DOCS_BASE_OUTDIR}/$${DOC_TARGETDIR}$${DOC_OUTDIR_POSTFIX} - - $${DTP}html_docs_$${DOC_TARGET}.commands = $$QDOC -outputdir $$shell_quote($$DOC_OUTPUTDIR) $$doc_file $$DOC_INDEXES - QMAKE_EXTRA_TARGETS += $${DTP}html_docs_$${DOC_TARGET} - - !isEmpty($${DTP}html_docs.commands): $${DTP}html_docs.commands += && - $${DTP}html_docs.commands += $$eval($${DTP}html_docs_$${DOC_TARGET}.commands) - - $${DTP}inst_html_docs.files += $$DOC_OUTPUTDIR - - !build_online_docs { - $${DTP}qch_docs_$${DOC_TARGET}.commands = $$QHELPGENERATOR $$shell_quote($$DOC_OUTPUTDIR/$${DOC_TARGET}.qhp) -o $$shell_quote($$DOC_QCH_OUTDIR/$${DOC_TARGET}.qch) - $${DTP}qch_docs_$${DOC_TARGET}.depends = $${DTP}html_docs_$${DOC_TARGET} - QMAKE_EXTRA_TARGETS += $${DTP}qch_docs_$${DOC_TARGET} - - !isEmpty($${DTP}qch_docs.commands): $${DTP}qch_docs.commands += && - $${DTP}qch_docs.commands += $$eval($${DTP}qch_docs_$${DOC_TARGET}.commands) - - $${DTP}inst_qch_docs.files += $$DOC_QCH_OUTDIR/$${DOC_TARGET}.qch - } -} - -!build_online_docs { - $${DTP}qch_docs.depends = $${DTP}html_docs - $${DTP}inst_qch_docs.path = $$DOC_QCH_INSTALLDIR - $${DTP}inst_qch_docs.CONFIG += no_check_exist no_default_install no_build - install_$${DTP}docs.depends = install_$${DTP}inst_qch_docs - $${DTP}docs.depends = $${DTP}qch_docs - INSTALLS += $${DTP}inst_qch_docs - QMAKE_EXTRA_TARGETS += $${DTP}qch_docs install_$${DTP}docs -} else { - $${DTP}docs.depends = $${DTP}html_docs -} - -$${DTP}inst_html_docs.path = $$DOC_HTML_INSTALLDIR -$${DTP}inst_html_docs.CONFIG += no_check_exist no_default_install directory -INSTALLS += $${DTP}inst_html_docs -install_$${DTP}docs.depends += install_$${DTP}inst_html_docs - -QMAKE_EXTRA_TARGETS += $${DTP}html_docs $${DTP}docs - -unset(DTP) - diff --git a/doc/man/man.pri b/doc/man/man.pri deleted file mode 100644 index 2e29f9112..000000000 --- a/doc/man/man.pri +++ /dev/null @@ -1,5 +0,0 @@ -qbs_no_man_install: return() - -man.files = $$PWD/qbs.1 -man.path = $${QBS_INSTALL_PREFIX}/share/man/man1 -INSTALLS += man diff --git a/qbs.pro b/qbs.pro deleted file mode 100644 index 9777615f4..000000000 --- a/qbs.pro +++ /dev/null @@ -1,77 +0,0 @@ -requires(!cross_compile) -include(src/lib/bundledlibs.pri) - -defineTest(minQtVersion) { - maj = $$1 - min = $$2 - patch = $$3 - isEqual(QT_MAJOR_VERSION, $$maj) { - isEqual(QT_MINOR_VERSION, $$min) { - isEqual(QT_PATCH_VERSION, $$patch) { - return(true) - } - greaterThan(QT_PATCH_VERSION, $$patch) { - return(true) - } - } - greaterThan(QT_MINOR_VERSION, $$min) { - return(true) - } - } - greaterThan(QT_MAJOR_VERSION, $$maj) { - return(true) - } - return(false) -} - -!minQtVersion(5, 14, 0) { - message("Cannot build qbs with Qt version $${QT_VERSION}.") - error("Use at least Qt 5.14.0.") -} - -TEMPLATE = subdirs -pkgconfig.file = src/lib/pkgconfig/pkgconfig.pro -corelib.file = src/lib/corelib/corelib.pro -corelib.depends = pkgconfig -msbuildlib.subdir = src/lib/msbuild -msbuildlib.depends = corelib -src_app.subdir = src/app -src_app.depends = corelib -CONFIG(static, static|shared): src_app.depends += src_plugins -src_libexec.subdir = src/libexec -src_plugins.subdir = src/plugins -CONFIG(shared, static|shared): src_plugins.depends = corelib -src_plugins.depends += msbuildlib -tests.depends = static_res -static_res.file = static-res.pro -static_res.depends = src_app src_libexec src_plugins static.pro -qbs_use_bundled_qtscript { - scriptenginelib.file = src/lib/scriptengine/scriptengine.pro - corelib.depends += scriptenginelib - SUBDIRS += scriptenginelib -} -SUBDIRS += \ - pkgconfig \ - corelib\ - msbuildlib\ - src_app\ - src_libexec\ - src_plugins\ - static.pro\ - static_res - -!CONFIG(nomake_tests): SUBDIRS += tests - -OTHER_FILES += \ - doc/*.qdoc \ - doc/reference/*.qdoc \ - doc/reference/items/convenience/*.qdoc \ - doc/reference/items/language/*.qdoc \ - doc/reference/jsextensions/*.qdoc \ - doc/reference/modules/*.qdoc \ - doc/targets/*.qdoc* \ - doc/qbs.qdocconf \ - doc/config/qbs-project.qdocconf - -include(qbs_version.pri) -include(doc/doc.pri) @@ -48,11 +48,6 @@ Project { } Product { - name: "qmake project files for qbs" - files: ["**/*.pr[io]"] - } - - Product { name: "cmake project files for qbs" files: ["**/CMakeLists.txt"] } diff --git a/qbs_version.pri b/qbs_version.pri deleted file mode 100644 index 97c4c799e..000000000 --- a/qbs_version.pri +++ /dev/null @@ -1,4 +0,0 @@ -QBS_VERSION = $$cat($$PWD/VERSION) -QBS_VERSION_MAJ = $$section(QBS_VERSION, ., 0, 0) -QBS_VERSION_MIN = $$section(QBS_VERSION, ., 1, 1) -DEFINES += QBS_VERSION=\\\"$$QBS_VERSION\\\" diff --git a/scripts/build-qbs-with-qmake.sh b/scripts/build-qbs-with-qmake.sh deleted file mode 100755 index 69ea75a21..000000000 --- a/scripts/build-qbs-with-qmake.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env bash -############################################################################# -## -## Copyright (C) 2019 Richard Weickelt. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of Qbs. -## -## $QT_BEGIN_LICENSE:LGPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 3 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL3 included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 3 requirements -## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 2.0 or (at your option) the GNU General -## Public license version 3 or any later version approved by the KDE Free -## Qt Foundation. The licenses are as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-2.0.html and -## https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# -set -e - -# -# It might be desired to keep settings for Qbs testing -# in a separate folder. -# -export QBS_AUTOTEST_SETTINGS_DIR="${QBS_AUTOTEST_SETTINGS_DIR:-/tmp/qbs-settings}" - -# -# Build all default products of Qbs -# -qmake -r qbs.pro \ - CONFIG+=qbs_enable_unit_tests \ - ${BUILD_OPTIONS} -make -j $(nproc --all) -make docs - -# -# Set up profiles for the freshly built Qbs if not -# explicitly specified otherwise -# -if [ -z "${QBS_AUTOTEST_PROFILE}" ]; then - - export QBS_AUTOTEST_PROFILE=autotestprofile - RUN_OPTIONS="\ - --settings-dir ${QBS_AUTOTEST_SETTINGS_DIR} \ - " - - ./bin/qbs setup-toolchains \ - ${RUN_OPTIONS} \ - --detect - - ./bin/qbs setup-qt \ - ${RUN_OPTIONS} \ - "${QMAKE_PATH:-$(which qmake)}" ${QBS_AUTOTEST_PROFILE} - - ./bin/qbs config \ - ${RUN_OPTIONS} \ - ${QBS_AUTOTEST_PROFILE}.baseProfile gcc - -fi - - -make check -j $(nproc --all) diff --git a/src/app/app.pri b/src/app/app.pri deleted file mode 100644 index 5cd9cb4aa..000000000 --- a/src/app/app.pri +++ /dev/null @@ -1,23 +0,0 @@ -include(../install_prefix.pri) - -QT = core -TEMPLATE = app -DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_PROCESS_COMBINED_ARGUMENT_START -!isEmpty(QBS_APPS_DESTDIR):DESTDIR = $${QBS_APPS_DESTDIR} -else:DESTDIR = ../../../bin - -!isEmpty(QBS_APPS_RPATH_DIR) { - linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${QBS_APPS_RPATH_DIR}\' - macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR} -} - -CONFIG += console -CONFIG -= app_bundle -CONFIG += c++17 - -include($${PWD}/../lib/corelib/use_corelib.pri) -include($${PWD}/shared/logging/logging.pri) - -!isEmpty(QBS_APPS_INSTALL_DIR):target.path = $${QBS_APPS_INSTALL_DIR} -else:target.path = $${QBS_INSTALL_PREFIX}/bin -INSTALLS += target diff --git a/src/app/app.pro b/src/app/app.pro deleted file mode 100644 index 935ce1776..000000000 --- a/src/app/app.pro +++ /dev/null @@ -1,10 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS =\ - qbs\ - qbs-create-project \ - qbs-setup-android \ - qbs-setup-toolchains \ - qbs-setup-qt \ - config - -!isEmpty(QT.widgets.name):SUBDIRS += config-ui diff --git a/src/app/config-ui/config-ui.pro b/src/app/config-ui/config-ui.pro deleted file mode 100644 index 84d3b3e4d..000000000 --- a/src/app/config-ui/config-ui.pro +++ /dev/null @@ -1,26 +0,0 @@ -include(../app.pri) - -CONFIG -= console -QT += gui widgets - -TARGET = qbs-config-ui - -HEADERS += \ - commandlineparser.h \ - mainwindow.h - -SOURCES += \ - commandlineparser.cpp \ - main.cpp \ - mainwindow.cpp - -OTHER_FILES += \ - Info.plist - -osx { - QMAKE_LFLAGS += -sectcreate __TEXT __info_plist $$shell_quote($$PWD/Info.plist) - OBJECTIVE_SOURCES += fgapp.mm - LIBS += -framework ApplicationServices -framework Cocoa -} - -FORMS += mainwindow.ui diff --git a/src/app/config/config.pro b/src/app/config/config.pro deleted file mode 100644 index 278c481d1..000000000 --- a/src/app/config/config.pro +++ /dev/null @@ -1,13 +0,0 @@ -include(../app.pri) - -TARGET = qbs-config - -SOURCES += \ - configcommandexecutor.cpp \ - configcommandlineparser.cpp \ - configmain.cpp - -HEADERS += \ - configcommand.h \ - configcommandexecutor.h \ - configcommandlineparser.h diff --git a/src/app/qbs-create-project/qbs-create-project.pro b/src/app/qbs-create-project/qbs-create-project.pro deleted file mode 100644 index 1edb85214..000000000 --- a/src/app/qbs-create-project/qbs-create-project.pro +++ /dev/null @@ -1,9 +0,0 @@ -include(../app.pri) - -TARGET = qbs-create-project - -HEADERS += \ - createproject.h -SOURCES += \ - createproject.cpp \ - create-project-main.cpp diff --git a/src/app/qbs-setup-android/qbs-setup-android.pro b/src/app/qbs-setup-android/qbs-setup-android.pro deleted file mode 100644 index b5e57761d..000000000 --- a/src/app/qbs-setup-android/qbs-setup-android.pro +++ /dev/null @@ -1,12 +0,0 @@ -include(../app.pri) - -TARGET = qbs-setup-android - -SOURCES += \ - android-setup.cpp \ - commandlineparser.cpp \ - main.cpp - -HEADERS += \ - android-setup.h \ - commandlineparser.h diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.pro b/src/app/qbs-setup-qt/qbs-setup-qt.pro deleted file mode 100644 index a5694d6b7..000000000 --- a/src/app/qbs-setup-qt/qbs-setup-qt.pro +++ /dev/null @@ -1,16 +0,0 @@ -include(../app.pri) - -TARGET = qbs-setup-qt - -SOURCES += \ - commandlineparser.cpp \ - main.cpp \ - setupqt.cpp - -HEADERS += \ - commandlineparser.h \ - setupqt.h - -mingw { - RC_FILE = qbs-setup-qt.rc -} diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro deleted file mode 100644 index 69d6552ee..000000000 --- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro +++ /dev/null @@ -1,36 +0,0 @@ -include(../app.pri) - -TARGET = qbs-setup-toolchains - -HEADERS += \ - clangclprobe.h \ - commandlineparser.h \ - cosmicprobe.h \ - dmcprobe.h \ - gccprobe.h \ - iarewprobe.h \ - keilprobe.h \ - msvcprobe.h \ - probe.h \ - sdccprobe.h \ - watcomprobe.h \ - xcodeprobe.h \ - -SOURCES += \ - clangclprobe.cpp \ - commandlineparser.cpp \ - cosmicprobe.cpp \ - dmcprobe.cpp \ - gccprobe.cpp \ - iarewprobe.cpp \ - keilprobe.cpp \ - main.cpp \ - msvcprobe.cpp \ - probe.cpp \ - sdccprobe.cpp \ - watcomprobe.cpp \ - xcodeprobe.cpp \ - -mingw { - RC_FILE = qbs-setup-toolchains.rc -} diff --git a/src/app/qbs/parser/parser.pri b/src/app/qbs/parser/parser.pri deleted file mode 100644 index f708f1135..000000000 --- a/src/app/qbs/parser/parser.pri +++ /dev/null @@ -1,16 +0,0 @@ -SOURCES += \ - $$PWD/commandlineparser.cpp \ - $$PWD/commandpool.cpp \ - $$PWD/commandlineoption.cpp \ - $$PWD/commandlineoptionpool.cpp \ - $$PWD/parsercommand.cpp - -HEADERS += \ - $$PWD/commandlineparser.h \ - $$PWD/commandpool.h \ - $$PWD/commandlineoption.h \ - $$PWD/commandlineoptionpool.h \ - $$PWD/commandtype.h \ - $$PWD/parsercommand.h - -include(../../../../qbs_version.pri) diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro deleted file mode 100644 index 6ce449aad..000000000 --- a/src/app/qbs/qbs.pro +++ /dev/null @@ -1,54 +0,0 @@ -include(../app.pri) -include(parser/parser.pri) - -TARGET = qbs - -SOURCES += main.cpp \ - ctrlchandler.cpp \ - application.cpp \ - session.cpp \ - sessionpacket.cpp \ - sessionpacketreader.cpp \ - stdinreader.cpp \ - status.cpp \ - consoleprogressobserver.cpp \ - commandlinefrontend.cpp \ - qbstool.cpp - -HEADERS += \ - ctrlchandler.h \ - application.h \ - session.h \ - sessionpacket.h \ - sessionpacketreader.h \ - stdinreader.h \ - status.h \ - consoleprogressobserver.h \ - commandlinefrontend.h \ - qbstool.h - -include(../../library_dirname.pri) -isEmpty(QBS_RELATIVE_LIBEXEC_PATH) { - win32:QBS_RELATIVE_LIBEXEC_PATH=. - else:QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs -} -isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME} -isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=.. -DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" -DEFINES += QBS_RELATIVE_PLUGINS_PATH=\\\"$${QBS_RELATIVE_PLUGINS_PATH}\\\" -DEFINES += QBS_RELATIVE_SEARCH_PATH=\\\"$${QBS_RELATIVE_SEARCH_PATH}\\\" - -CONFIG(static, static|shared) { - include(../../plugins/qbs_plugin_common.pri) - LIBS += -L$$qbsPluginDestDir - scannerPlugins = cpp qt - for (scannerPlugin, scannerPlugins) { - include(../../plugins/scanner/$$scannerPlugin/$${scannerPlugin}.pri) \ - include(../../plugins/use_plugin.pri) - } - generatorPlugins = clangcompilationdb iarew keiluv makefilegenerator visualstudio - for (generatorPlugin, generatorPlugins) { - include(../../plugins/generator/$$generatorPlugin/$${generatorPlugin}.pri) \ - include(../../plugins/use_plugin.pri) - } -} diff --git a/src/app/shared/logging/logging.pri b/src/app/shared/logging/logging.pri deleted file mode 100644 index e24f33e10..000000000 --- a/src/app/shared/logging/logging.pri +++ /dev/null @@ -1,2 +0,0 @@ -HEADERS += $$PWD/consolelogger.h $$PWD/coloredoutput.h -SOURCES += $$PWD/consolelogger.cpp $$PWD/coloredoutput.cpp diff --git a/src/install_prefix.pri b/src/install_prefix.pri deleted file mode 100644 index 34aef1d5f..000000000 --- a/src/install_prefix.pri +++ /dev/null @@ -1 +0,0 @@ -unix: isEmpty(QBS_INSTALL_PREFIX): QBS_INSTALL_PREFIX = /usr/local diff --git a/src/lib/bundledlibs.pri b/src/lib/bundledlibs.pri deleted file mode 100644 index 6ffedbbd8..000000000 --- a/src/lib/bundledlibs.pri +++ /dev/null @@ -1,3 +0,0 @@ -!qbs_use_bundled_qtscript:!qtHaveModule(script) { - CONFIG += qbs_use_bundled_qtscript -} diff --git a/src/lib/corelib/CMakeLists.txt b/src/lib/corelib/CMakeLists.txt index 7c358722d..113013479 100644 --- a/src/lib/corelib/CMakeLists.txt +++ b/src/lib/corelib/CMakeLists.txt @@ -471,6 +471,4 @@ if(INSTALL_PUBLIC_HEADERS) install(FILES ${LOGGING_HEADERS} DESTINATION ${QBS_HEADERS_INSTALL_DIR}/logging) install(FILES ${LANGUAGE_HEADERS} DESTINATION ${QBS_HEADERS_INSTALL_DIR}/language) install(FILES ${TOOLS_HEADERS} DESTINATION ${QBS_HEADERS_INSTALL_DIR}/tools) - set(QMAKE_PRI_FILES use_installed_corelib.pri ../../../qbs_version.pri) - install(FILES ${QMAKE_PRI_FILES} DESTINATION ${QBS_HEADERS_INSTALL_DIR}) endif() diff --git a/src/lib/corelib/api/api.pri b/src/lib/corelib/api/api.pri deleted file mode 100644 index 69443dffc..000000000 --- a/src/lib/corelib/api/api.pri +++ /dev/null @@ -1,49 +0,0 @@ -include(../../../install_prefix.pri) - -HEADERS += \ - $$PWD/internaljobs.h \ - $$PWD/projectdata.h \ - $$PWD/runenvironment.h \ - $$PWD/jobs.h \ - $$PWD/languageinfo.h \ - $$PWD/project.h \ - $$PWD/project_p.h \ - $$PWD/propertymap_p.h \ - $$PWD/projectdata_p.h \ - $$PWD/rulecommand.h \ - $$PWD/rulecommand_p.h \ - $$PWD/transformerdata.h \ - $$PWD/transformerdata_p.h - -SOURCES += \ - $$PWD/internaljobs.cpp \ - $$PWD/runenvironment.cpp \ - $$PWD/projectdata.cpp \ - $$PWD/jobs.cpp \ - $$PWD/languageinfo.cpp \ - $$PWD/project.cpp \ - $$PWD/rulecommand.cpp \ - $$PWD/transformerdata.cpp - -!qbs_no_dev_install { - api_headers.files = \ - $$PWD/jobs.h \ - $$PWD/languageinfo.h \ - $$PWD/project.h \ - $$PWD/projectdata.h \ - $$PWD/rulecommand.h \ - $$PWD/runenvironment.h \ - $$PWD/transformerdata.h - api_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/api - INSTALLS += api_headers -} - -HEADERS += \ - $$PWD/changeset.h \ - $$PWD/projectfileupdater.h \ - $$PWD/qmljsrewriter.h - -SOURCES += \ - $$PWD/changeset.cpp \ - $$PWD/projectfileupdater.cpp \ - $$PWD/qmljsrewriter.cpp diff --git a/src/lib/corelib/buildgraph/buildgraph.pri b/src/lib/corelib/buildgraph/buildgraph.pri deleted file mode 100644 index 2ed6be4fd..000000000 --- a/src/lib/corelib/buildgraph/buildgraph.pri +++ /dev/null @@ -1,89 +0,0 @@ -include(../../../install_prefix.pri) - -SOURCES += \ - $$PWD/abstractcommandexecutor.cpp \ - $$PWD/artifact.cpp \ - $$PWD/artifactcleaner.cpp \ - $$PWD/artifactsscriptvalue.cpp \ - $$PWD/artifactvisitor.cpp \ - $$PWD/buildgraph.cpp \ - $$PWD/buildgraphloader.cpp \ - $$PWD/buildgraphnode.cpp \ - $$PWD/cycledetector.cpp \ - $$PWD/dependencyparametersscriptvalue.cpp \ - $$PWD/depscanner.cpp \ - $$PWD/emptydirectoriesremover.cpp \ - $$PWD/environmentscriptrunner.cpp \ - $$PWD/executor.cpp \ - $$PWD/executorjob.cpp \ - $$PWD/filedependency.cpp \ - $$PWD/inputartifactscanner.cpp \ - $$PWD/jscommandexecutor.cpp \ - $$PWD/nodeset.cpp \ - $$PWD/nodetreedumper.cpp \ - $$PWD/processcommandexecutor.cpp \ - $$PWD/productbuilddata.cpp \ - $$PWD/productinstaller.cpp \ - $$PWD/projectbuilddata.cpp \ - $$PWD/qtmocscanner.cpp \ - $$PWD/rawscanneddependency.cpp \ - $$PWD/rawscanresults.cpp \ - $$PWD/requestedartifacts.cpp \ - $$PWD/requesteddependencies.cpp \ - $$PWD/rulecommands.cpp \ - $$PWD/rulegraph.cpp \ - $$PWD/rulenode.cpp \ - $$PWD/rulesapplicator.cpp \ - $$PWD/rulesevaluationcontext.cpp \ - $$PWD/timestampsupdater.cpp \ - $$PWD/transformerchangetracking.cpp \ - $$PWD/transformer.cpp - -HEADERS += \ - $$PWD/abstractcommandexecutor.h \ - $$PWD/artifact.h \ - $$PWD/artifactcleaner.h \ - $$PWD/artifactsscriptvalue.h \ - $$PWD/artifactvisitor.h \ - $$PWD/buildgraph.h \ - $$PWD/buildgraphloader.h \ - $$PWD/buildgraphnode.h \ - $$PWD/buildgraphvisitor.h \ - $$PWD/cycledetector.h \ - $$PWD/dependencyparametersscriptvalue.h \ - $$PWD/depscanner.h \ - $$PWD/emptydirectoriesremover.h \ - $$PWD/environmentscriptrunner.h \ - $$PWD/executor.h \ - $$PWD/executorjob.h \ - $$PWD/filedependency.h \ - $$PWD/forward_decls.h \ - $$PWD/inputartifactscanner.h \ - $$PWD/jscommandexecutor.h \ - $$PWD/nodeset.h \ - $$PWD/nodetreedumper.h \ - $$PWD/processcommandexecutor.h \ - $$PWD/productbuilddata.h \ - $$PWD/productinstaller.h \ - $$PWD/projectbuilddata.h \ - $$PWD/qtmocscanner.h \ - $$PWD/rawscanneddependency.h \ - $$PWD/rawscanresults.h \ - $$PWD/requestedartifacts.h \ - $$PWD/requesteddependencies.h \ - $$PWD/rescuableartifactdata.h \ - $$PWD/rulecommands.h \ - $$PWD/rulegraph.h \ - $$PWD/rulenode.h \ - $$PWD/rulesapplicator.h \ - $$PWD/rulesevaluationcontext.h \ - $$PWD/scriptclasspropertyiterator.h \ - $$PWD/timestampsupdater.h \ - $$PWD/transformerchangetracking.h \ - $$PWD/transformer.h - -!qbs_no_dev_install { - buildgraph_headers.files = $$PWD/forward_decls.h - buildgraph_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/buildgraph - INSTALLS += buildgraph_headers -} diff --git a/src/lib/corelib/corelib.pro b/src/lib/corelib/corelib.pro deleted file mode 100644 index afe07f48f..000000000 --- a/src/lib/corelib/corelib.pro +++ /dev/null @@ -1,43 +0,0 @@ -TARGET = qbscore -include(../library.pri) -include(../bundledlibs.pri) - -qbs_use_bundled_qtscript { - include(../scriptengine/use_scriptengine.pri) -} else { - QT += script -} - -include(../pkgconfig/use_pkgconfig.pri) - -isEmpty(QBS_RELATIVE_LIBEXEC_PATH) { - win32:QBS_RELATIVE_LIBEXEC_PATH=../bin - else:QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs -} -DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" - -QT += core-private network - -INCLUDEPATH += $$PWD - -include(api/api.pri) -include(buildgraph/buildgraph.pri) -include(generators/generators.pri) -include(jsextensions/jsextensions.pri) -include(language/language.pri) -include(logging/logging.pri) -include(parser/parser.pri) -include(tools/tools.pri) - -win32:LIBS += -lpsapi -lshell32 - -HEADERS += \ - qbs.h - -!qbs_no_dev_install { - qbs_h.files = qbs.h - qbs_h.path = $${QBS_INSTALL_PREFIX}/include/qbs - use_pri.files = use_installed_corelib.pri ../../../qbs_version.pri - use_pri.path = $${qbs_h.path} - INSTALLS += qbs_h use_pri -} diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 91532c14e..169def5cb 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -525,13 +525,4 @@ QbsLibrary { "applecodesignutils.h" ] } - Group { - name: "use_installed.pri" - files: [ - "use_installed_corelib.pri", - "../../../qbs_version.pri" - ] - qbs.install: qbsbuildconfig.installApiHeaders - qbs.installDir: headerInstallPrefix - } } diff --git a/src/lib/corelib/generators/generators.pri b/src/lib/corelib/generators/generators.pri deleted file mode 100644 index e9730d895..000000000 --- a/src/lib/corelib/generators/generators.pri +++ /dev/null @@ -1,38 +0,0 @@ -include(../../../install_prefix.pri) - -SOURCES += \ - $$PWD/generatableprojectiterator.cpp \ - $$PWD/generator.cpp \ - $$PWD/generatordata.cpp \ - $$PWD/generatorutils.cpp \ - $$PWD/generatorversioninfo.cpp \ - $$PWD/xmlproject.cpp \ - $$PWD/xmlprojectwriter.cpp\ - $$PWD/xmlproperty.cpp \ - $$PWD/xmlpropertygroup.cpp \ - $$PWD/xmlworkspace.cpp \ - $$PWD/xmlworkspacewriter.cpp - -HEADERS += \ - $$PWD/generatableprojectiterator.h \ - $$PWD/generator.h \ - $$PWD/generatordata.h \ - $$PWD/generatorutils.h \ - $$PWD/generatorversioninfo.h \ - $$PWD/igeneratableprojectvisitor.h \ - $$PWD/ixmlnodevisitor.h \ - $$PWD/ixmlnodevisitor.h \ - $$PWD/xmlproject.h \ - $$PWD/xmlprojectwriter.h \ - $$PWD/xmlproperty.h \ - $$PWD/xmlpropertygroup.h \ - $$PWD/xmlworkspace.h \ - $$PWD/xmlworkspacewriter.h - -!qbs_no_dev_install { - generators_headers.files = \ - $$PWD/generator.h \ - $$PWD/generatordata.h - generators_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/generators - INSTALLS += generators_headers -} diff --git a/src/lib/corelib/jsextensions/jsextensions.pri b/src/lib/corelib/jsextensions/jsextensions.pri deleted file mode 100644 index 0d6ec25b0..000000000 --- a/src/lib/corelib/jsextensions/jsextensions.pri +++ /dev/null @@ -1,29 +0,0 @@ -QT += xml - -HEADERS += \ - $$PWD/moduleproperties.h \ - $$PWD/jsextensions.h \ - $$PWD/pkgconfigjs.h - -SOURCES += \ - $$PWD/environmentextension.cpp \ - $$PWD/file.cpp \ - $$PWD/fileinfoextension.cpp \ - $$PWD/host.cpp \ - $$PWD/temporarydir.cpp \ - $$PWD/textfile.cpp \ - $$PWD/binaryfile.cpp \ - $$PWD/pkgconfigjs.cpp \ - $$PWD/process.cpp \ - $$PWD/moduleproperties.cpp \ - $$PWD/domxml.cpp \ - $$PWD/jsextensions.cpp \ - $$PWD/utilitiesextension.cpp - -darwin { - HEADERS += $$PWD/propertylistutils.h $$PWD/propertylist_darwin.h - SOURCES += $$PWD/propertylist_darwin.mm $$PWD/propertylistutils.mm - LIBS += -framework Foundation -} else { - SOURCES += $$PWD/propertylist.cpp -} diff --git a/src/lib/corelib/language/language.pri b/src/lib/corelib/language/language.pri deleted file mode 100644 index 0b4cfbd08..000000000 --- a/src/lib/corelib/language/language.pri +++ /dev/null @@ -1,86 +0,0 @@ -include(../../../install_prefix.pri) - -HEADERS += \ - $$PWD/artifactproperties.h \ - $$PWD/astimportshandler.h \ - $$PWD/astpropertiesitemhandler.h \ - $$PWD/asttools.h \ - $$PWD/builtindeclarations.h \ - $$PWD/deprecationinfo.h \ - $$PWD/evaluationdata.h \ - $$PWD/evaluator.h \ - $$PWD/evaluatorscriptclass.h \ - $$PWD/filecontext.h \ - $$PWD/filecontextbase.h \ - $$PWD/filetags.h \ - $$PWD/forward_decls.h \ - $$PWD/identifiersearch.h \ - $$PWD/item.h \ - $$PWD/itemdeclaration.h \ - $$PWD/itemobserver.h \ - $$PWD/itempool.h \ - $$PWD/itemreader.h \ - $$PWD/itemreaderastvisitor.h \ - $$PWD/itemreadervisitorstate.h \ - $$PWD/itemtype.h \ - $$PWD/jsimports.h \ - $$PWD/language.h \ - $$PWD/loader.h \ - $$PWD/moduleloader.h \ - $$PWD/modulemerger.h \ - $$PWD/moduleproviderinfo.h \ - $$PWD/moduleproviderloader.h \ - $$PWD/preparescriptobserver.h \ - $$PWD/probesresolver.h \ - $$PWD/projectresolver.h \ - $$PWD/property.h \ - $$PWD/propertydeclaration.h \ - $$PWD/propertymapinternal.h \ - $$PWD/qualifiedid.h \ - $$PWD/resolvedfilecontext.h \ - $$PWD/scriptengine.h \ - $$PWD/scriptimporter.h \ - $$PWD/scriptpropertyobserver.h \ - $$PWD/value.h - -SOURCES += \ - $$PWD/artifactproperties.cpp \ - $$PWD/astimportshandler.cpp \ - $$PWD/astpropertiesitemhandler.cpp \ - $$PWD/asttools.cpp \ - $$PWD/builtindeclarations.cpp \ - $$PWD/evaluator.cpp \ - $$PWD/evaluatorscriptclass.cpp \ - $$PWD/filecontext.cpp \ - $$PWD/filecontextbase.cpp \ - $$PWD/filetags.cpp \ - $$PWD/identifiersearch.cpp \ - $$PWD/item.cpp \ - $$PWD/itemdeclaration.cpp \ - $$PWD/itempool.cpp \ - $$PWD/itemreader.cpp \ - $$PWD/itemreaderastvisitor.cpp \ - $$PWD/itemreadervisitorstate.cpp \ - $$PWD/language.cpp \ - $$PWD/loader.cpp \ - $$PWD/moduleloader.cpp \ - $$PWD/modulemerger.cpp \ - $$PWD/moduleproviderloader.cpp \ - $$PWD/preparescriptobserver.cpp \ - $$PWD/scriptpropertyobserver.cpp \ - $$PWD/probesresolver.cpp \ - $$PWD/projectresolver.cpp \ - $$PWD/property.cpp \ - $$PWD/propertydeclaration.cpp \ - $$PWD/propertymapinternal.cpp \ - $$PWD/qualifiedid.cpp \ - $$PWD/resolvedfilecontext.cpp \ - $$PWD/scriptengine.cpp \ - $$PWD/scriptimporter.cpp \ - $$PWD/value.cpp - -!qbs_no_dev_install { - language_headers.files = $$PWD/forward_decls.h - language_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/language - INSTALLS += language_headers -} diff --git a/src/lib/corelib/logging/logging.pri b/src/lib/corelib/logging/logging.pri deleted file mode 100644 index 3a4379a9a..000000000 --- a/src/lib/corelib/logging/logging.pri +++ /dev/null @@ -1,18 +0,0 @@ -include(../../../install_prefix.pri) - -HEADERS += \ - $$PWD/categories.h \ - $$PWD/logger.h \ - $$PWD/translator.h \ - $$PWD/ilogsink.h - -SOURCES += \ - $$PWD/categories.cpp \ - $$PWD/logger.cpp \ - $$PWD/ilogsink.cpp - -!qbs_no_dev_install { - logging_headers.files = $$PWD/ilogsink.h - logging_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/logging - INSTALLS += logging_headers -} diff --git a/src/lib/corelib/parser/parser.pri b/src/lib/corelib/parser/parser.pri deleted file mode 100644 index e6a8a5345..000000000 --- a/src/lib/corelib/parser/parser.pri +++ /dev/null @@ -1,21 +0,0 @@ -HEADERS += \ - $$PWD/qmljsast_p.h \ - $$PWD/qmljsastfwd_p.h \ - $$PWD/qmljsastvisitor_p.h \ - $$PWD/qmljsengine_p.h \ - $$PWD/qmljsgrammar_p.h \ - $$PWD/qmljslexer_p.h \ - $$PWD/qmljsmemorypool_p.h \ - $$PWD/qmljsparser_p.h \ - $$PWD/qmljsglobal_p.h \ - $$PWD/qmlerror.h \ - $$PWD/qmljskeywords_p.h \ - -SOURCES += \ - $$PWD/qmljsast.cpp \ - $$PWD/qmljsastvisitor.cpp \ - $$PWD/qmljsengine_p.cpp \ - $$PWD/qmljsgrammar.cpp \ - $$PWD/qmljslexer.cpp \ - $$PWD/qmljsparser.cpp \ - $$PWD/qmlerror.cpp \ diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri deleted file mode 100644 index 835fbbfda..000000000 --- a/src/lib/corelib/tools/tools.pri +++ /dev/null @@ -1,150 +0,0 @@ -include(../../../install_prefix.pri) - -INCLUDEPATH += $$PWD/../.. # for plugins - -QBS_SYSTEM_SETTINGS_DIR = $$(QBS_SYSTEM_SETTINGS_DIR) -!isEmpty(QBS_SYSTEM_SETTINGS_DIR) { - DEFINES += QBS_SYSTEM_SETTINGS_DIR=\\\"$$QBS_SYSTEM_SETTINGS_DIR\\\" -} - -HEADERS += \ - $$PWD/architectures.h \ - $$PWD/buildgraphlocker.h \ - $$PWD/clangclinfo.h \ - $$PWD/codelocation.h \ - $$PWD/commandechomode.h \ - $$PWD/deprecationwarningmode.h \ - $$PWD/dynamictypecheck.h \ - $$PWD/error.h \ - $$PWD/executablefinder.h \ - $$PWD/fileinfo.h \ - $$PWD/filesaver.h \ - $$PWD/filetime.h \ - $$PWD/generateoptions.h \ - $$PWD/id.h \ - $$PWD/iosutils.h \ - $$PWD/joblimits.h \ - $$PWD/jsliterals.h \ - $$PWD/jsonhelper.h \ - $$PWD/launcherinterface.h \ - $$PWD/launcherpackets.h \ - $$PWD/launchersocket.h \ - $$PWD/msvcinfo.h \ - $$PWD/persistence.h \ - $$PWD/porting.h \ - $$PWD/scannerpluginmanager.h \ - $$PWD/scripttools.h \ - $$PWD/set.h \ - $$PWD/settings.h \ - $$PWD/settingsmodel.h \ - $$PWD/settingsrepresentation.h \ - $$PWD/pathutils.h \ - $$PWD/preferences.h \ - $$PWD/profile.h \ - $$PWD/profiling.h \ - $$PWD/processresult.h \ - $$PWD/processresult_p.h \ - $$PWD/processutils.h \ - $$PWD/progressobserver.h \ - $$PWD/projectgeneratormanager.h \ - $$PWD/qbspluginmanager.h \ - $$PWD/qbsprocess.h \ - $$PWD/shellutils.h \ - $$PWD/stlutils.h \ - $$PWD/stringutils.h \ - $$PWD/toolchains.h \ - $$PWD/hostosinfo.h \ - $$PWD/buildoptions.h \ - $$PWD/installoptions.h \ - $$PWD/cleanoptions.h \ - $$PWD/setupprojectparameters.h \ - $$PWD/weakpointer.h \ - $$PWD/qbs_export.h \ - $$PWD/qbsassert.h \ - $$PWD/qttools.h \ - $$PWD/settingscreator.h \ - $$PWD/stringconstants.h \ - $$PWD/version.h \ - $$PWD/visualstudioversioninfo.h \ - $$PWD/vsenvironmentdetector.h - -SOURCES += \ - $$PWD/architectures.cpp \ - $$PWD/buildgraphlocker.cpp \ - $$PWD/clangclinfo.cpp \ - $$PWD/codelocation.cpp \ - $$PWD/commandechomode.cpp \ - $$PWD/deprecationwarningmode.cpp \ - $$PWD/error.cpp \ - $$PWD/executablefinder.cpp \ - $$PWD/fileinfo.cpp \ - $$PWD/filesaver.cpp \ - $$PWD/filetime.cpp \ - $$PWD/generateoptions.cpp \ - $$PWD/id.cpp \ - $$PWD/joblimits.cpp \ - $$PWD/jsliterals.cpp \ - $$PWD/launcherinterface.cpp \ - $$PWD/launcherpackets.cpp \ - $$PWD/launchersocket.cpp \ - $$PWD/msvcinfo.cpp \ - $$PWD/persistence.cpp \ - $$PWD/scannerpluginmanager.cpp \ - $$PWD/scripttools.cpp \ - $$PWD/settings.cpp \ - $$PWD/settingsmodel.cpp \ - $$PWD/settingsrepresentation.cpp \ - $$PWD/preferences.cpp \ - $$PWD/processresult.cpp \ - $$PWD/processutils.cpp \ - $$PWD/profile.cpp \ - $$PWD/profiling.cpp \ - $$PWD/progressobserver.cpp \ - $$PWD/projectgeneratormanager.cpp \ - $$PWD/qbspluginmanager.cpp \ - $$PWD/qbsprocess.cpp \ - $$PWD/shellutils.cpp \ - $$PWD/buildoptions.cpp \ - $$PWD/installoptions.cpp \ - $$PWD/cleanoptions.cpp \ - $$PWD/setupprojectparameters.cpp \ - $$PWD/qbsassert.cpp \ - $$PWD/qttools.cpp \ - $$PWD/settingscreator.cpp \ - $$PWD/toolchains.cpp \ - $$PWD/version.cpp \ - $$PWD/visualstudioversioninfo.cpp \ - $$PWD/vsenvironmentdetector.cpp - -osx { - HEADERS += $$PWD/applecodesignutils.h - SOURCES += $$PWD/applecodesignutils.cpp - LIBS += -framework Security -} - -!qbs_no_dev_install { - tools_headers.files = \ - $$PWD/architectures.h \ - $$PWD/buildoptions.h \ - $$PWD/cleanoptions.h \ - $$PWD/codelocation.h \ - $$PWD/commandechomode.h \ - $$PWD/deprecationwarningmode.h \ - $$PWD/error.h \ - $$PWD/generateoptions.h \ - $$PWD/installoptions.h \ - $$PWD/joblimits.h \ - $$PWD/preferences.h \ - $$PWD/processresult.h \ - $$PWD/profile.h \ - $$PWD/projectgeneratormanager.h \ - $$PWD/qbs_export.h \ - $$PWD/settings.h \ - $$PWD/settingsmodel.h \ - $$PWD/settingsrepresentation.h \ - $$PWD/setupprojectparameters.h \ - $$PWD/toolchains.h \ - $$PWD/version.h - tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools - INSTALLS += tools_headers -} diff --git a/src/lib/corelib/use_corelib.pri b/src/lib/corelib/use_corelib.pri deleted file mode 100644 index e1d74ca0d..000000000 --- a/src/lib/corelib/use_corelib.pri +++ /dev/null @@ -1,47 +0,0 @@ -include(../../../qbs_version.pri) -include(../../library_dirname.pri) -include(../scriptengine/use_scriptengine.pri) - -isEmpty(QBSLIBDIR) { - QBSLIBDIR = $$OUT_PWD/../../../$${QBS_LIBRARY_DIRNAME} -} - -unix { - LIBS += -L$$QBSLIBDIR -lqbscore -} - -isEmpty(QBS_RPATH): QBS_RPATH = ../$$QBS_LIBRARY_DIRNAME -!qbs_disable_rpath { - linux-*: QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/$${QBS_RPATH}\' - macx: QMAKE_LFLAGS += -Wl,-rpath,@loader_path/$${QBS_RPATH} -} - -!CONFIG(static, static|shared) { - QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ -} - -win32 { - CONFIG(debug, debug|release) { - QBSCORELIB = qbscored$$QBSCORELIBSUFFIX - } - CONFIG(release, debug|release) { - QBSCORELIB = qbscore$$QBSCORELIBSUFFIX - } - msvc { - LIBS += /LIBPATH:$$QBSLIBDIR - QBSCORELIB = $${QBSCORELIB}.lib - LIBS += Shell32.lib - } else { - LIBS += -L$${QBSLIBDIR} - QBSCORELIB = lib$${QBSCORELIB} - } - LIBS += $$QBSCORELIB -} - -INCLUDEPATH += \ - $$PWD - -CONFIG(static, static|shared) { - DEFINES += QBS_STATIC_LIB -} -qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS diff --git a/src/lib/corelib/use_installed_corelib.pri b/src/lib/corelib/use_installed_corelib.pri deleted file mode 100644 index 48e020c7b..000000000 --- a/src/lib/corelib/use_installed_corelib.pri +++ /dev/null @@ -1,37 +0,0 @@ -include(qbs_version.pri) - -QBSLIBDIR=$${PWD}/../../lib -unix { - LIBS += -L$$QBSLIBDIR -lqbscore -} - -!qbs_disable_rpath:unix:QMAKE_LFLAGS += -Wl,-rpath,$${QBSLIBDIR} - -!CONFIG(static, static|shared) { - QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ -} - -win32 { - CONFIG(debug, debug|release) { - QBSCORELIB = qbscored$$QBSCORELIBSUFFIX - } - CONFIG(release, debug|release) { - QBSCORELIB = qbscore$$QBSCORELIBSUFFIX - } - msvc { - LIBS += /LIBPATH:$$QBSLIBDIR - QBSCORELIB = $${QBSCORELIB}.lib - LIBS += Shell32.lib - } else { - LIBS += -L$${QBSLIBDIR} - QBSCORELIB = lib$${QBSCORELIB} - } - LIBS += $$QBSCORELIB -} - -INCLUDEPATH += $${PWD} - -CONFIG(static, static|shared) { - DEFINES += QBS_STATIC_LIB -} -qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS diff --git a/src/lib/library.pri b/src/lib/library.pri deleted file mode 100644 index 7d12e1070..000000000 --- a/src/lib/library.pri +++ /dev/null @@ -1,32 +0,0 @@ -include(library_base.pri) - -CONFIG(static, static|shared) { - DEFINES += QBS_STATIC_LIB -} else { - DEFINES += QBS_LIBRARY -} - -qbs_disable_rpath { - osx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,$$QBS_INSTALL_PREFIX/$$QBS_LIBRARY_DIRNAME/ -} else { - osx:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ -} - -linux { - # Turn off absurd qmake's soname "logic" and directly add the linker flag. - QMAKE_LFLAGS_SONAME = - QMAKE_LFLAGS += -Wl,-soname=lib$${TARGET}.so.$${QBS_VERSION_MAJ}.$${QBS_VERSION_MIN} -} - -win32 { - dlltarget.path = $${QBS_INSTALL_PREFIX}/bin - INSTALLS += dlltarget -} - -!win32|!qbs_no_dev_install { - !isEmpty(QBS_LIB_INSTALL_DIR): \ - target.path = $${QBS_LIB_INSTALL_DIR} - else: \ - target.path = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME} - INSTALLS += target -} diff --git a/src/lib/library_base.pri b/src/lib/library_base.pri deleted file mode 100644 index 1fde46e3a..000000000 --- a/src/lib/library_base.pri +++ /dev/null @@ -1,21 +0,0 @@ -include(../library_dirname.pri) -include(../install_prefix.pri) - -TEMPLATE = lib -QT = core -!isEmpty(QBS_DLLDESTDIR):DLLDESTDIR = $${QBS_DLLDESTDIR} -else:DLLDESTDIR = ../../../bin -!isEmpty(QBS_DESTDIR):DESTDIR = $${QBS_DESTDIR} -else:DESTDIR = ../../../$${QBS_LIBRARY_DIRNAME} - -DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_PROCESS_COMBINED_ARGUMENT_START -qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS -INCLUDEPATH += $${PWD}/../ -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -win32:CONFIG(debug, debug|release):TARGET = $${TARGET}d -CONFIG(debug, debug|release):DEFINES += QT_STRICT_ITERATORS -CONFIG += c++17 -CONFIG += create_prl - -include(../../qbs_version.pri) -VERSION = $${QBS_VERSION} diff --git a/src/lib/msbuild/msbuild.pro b/src/lib/msbuild/msbuild.pro deleted file mode 100644 index f724df793..000000000 --- a/src/lib/msbuild/msbuild.pro +++ /dev/null @@ -1,58 +0,0 @@ -TARGET = qbsmsbuild -include(../staticlibrary.pri) -include(../corelib/use_corelib.pri) - -HEADERS += \ - io/msbuildprojectwriter.h \ - io/visualstudiosolutionwriter.h \ - msbuild/imsbuildgroup.h \ - msbuild/imsbuildnode.h \ - msbuild/imsbuildnodevisitor.h \ - msbuild/items/msbuildclcompile.h \ - msbuild/items/msbuildclinclude.h \ - msbuild/items/msbuildfileitem.h \ - msbuild/items/msbuildfilter.h \ - msbuild/items/msbuildlink.h \ - msbuild/items/msbuildnone.h \ - msbuild/msbuildimport.h \ - msbuild/msbuildimportgroup.h \ - msbuild/msbuilditem.h \ - msbuild/msbuilditemdefinitiongroup.h \ - msbuild/msbuilditemgroup.h \ - msbuild/msbuilditemmetadata.h \ - msbuild/msbuildproject.h \ - msbuild/msbuildproperty.h \ - msbuild/msbuildpropertybase.h \ - msbuild/msbuildpropertygroup.h \ - solution/ivisualstudiosolutionproject.h \ - solution/visualstudiosolution.h \ - solution/visualstudiosolutionfileproject.h \ - solution/visualstudiosolutionfolderproject.h \ - solution/visualstudiosolutionglobalsection.h - -SOURCES += \ - io/msbuildprojectwriter.cpp \ - io/visualstudiosolutionwriter.cpp \ - msbuild/imsbuildgroup.cpp \ - msbuild/imsbuildnode.cpp \ - msbuild/items/msbuildclcompile.cpp \ - msbuild/items/msbuildclinclude.cpp \ - msbuild/items/msbuildfileitem.cpp \ - msbuild/items/msbuildfilter.cpp \ - msbuild/items/msbuildlink.cpp \ - msbuild/items/msbuildnone.cpp \ - msbuild/msbuildimport.cpp \ - msbuild/msbuildimportgroup.cpp \ - msbuild/msbuilditem.cpp \ - msbuild/msbuilditemdefinitiongroup.cpp \ - msbuild/msbuilditemgroup.cpp \ - msbuild/msbuilditemmetadata.cpp \ - msbuild/msbuildproject.cpp \ - msbuild/msbuildproperty.cpp \ - msbuild/msbuildpropertybase.cpp \ - msbuild/msbuildpropertygroup.cpp \ - solution/ivisualstudiosolutionproject.cpp \ - solution/visualstudiosolution.cpp \ - solution/visualstudiosolutionfileproject.cpp \ - solution/visualstudiosolutionfolderproject.cpp \ - solution/visualstudiosolutionglobalsection.cpp diff --git a/src/lib/msbuild/use_installed_msbuild.pri b/src/lib/msbuild/use_installed_msbuild.pri deleted file mode 100644 index af89b2550..000000000 --- a/src/lib/msbuild/use_installed_msbuild.pri +++ /dev/null @@ -1,20 +0,0 @@ -include(use_installed_corelib.pri) - -LIBNAME=qbsmsbuild - -unix:LIBS += -l$${LIBNAME} - -win32 { - CONFIG(debug, debug|release) { - QBSMSBUILDLIB = $${LIBNAME}d$${QBSCORELIBSUFFIX} - } - CONFIG(release, debug|release) { - QBSMSBUILDLIB = $${LIBNAME}$${QBSCORELIBSUFFIX} - } - msvc { - QBSMSBUILDLIB = $${QBSMSBUILDLIB}.lib - } else { - QBSMSBUILDLIB = lib$${QBSMSBUILDLIB} - } - LIBS += $${QBSMSBUILDLIB} -} diff --git a/src/lib/msbuild/use_msbuild.pri b/src/lib/msbuild/use_msbuild.pri deleted file mode 100644 index bb69968d5..000000000 --- a/src/lib/msbuild/use_msbuild.pri +++ /dev/null @@ -1,38 +0,0 @@ -include(../../library_dirname.pri) - -isEmpty(QBSLIBDIR) { - QBSLIBDIR = $${OUT_PWD}/../../../$${QBS_LIBRARY_DIRNAME} -} - -LIBNAME=qbsmsbuild - -unix { - LIBS += -L$${QBSLIBDIR} -l$${LIBNAME} -} - -win32 { - CONFIG(debug, debug|release) { - QBSMSBUILDLIB = $${LIBNAME}d - } - CONFIG(release, debug|release) { - QBSMSBUILDLIB = $${LIBNAME} - } - msvc { - LIBS += /LIBPATH:$$QBSLIBDIR - QBSMSBUILDLIB = $${QBSMSBUILDLIB}.lib - LIBS += Shell32.lib - } else { - LIBS += -L$${QBSLIBDIR} - QBSMSBUILDLIB = lib$${QBSMSBUILDLIB} - } - LIBS += $${QBSMSBUILDLIB} -} - -INCLUDEPATH += \ - $$PWD - -CONFIG += depend_includepath - -CONFIG(static, static|shared) { - DEFINES += QBS_STATIC_LIB -} diff --git a/src/lib/pkgconfig/pkgconfig.pro b/src/lib/pkgconfig/pkgconfig.pro deleted file mode 100644 index dcabf0ba1..000000000 --- a/src/lib/pkgconfig/pkgconfig.pro +++ /dev/null @@ -1,25 +0,0 @@ -TARGET = qbspkgconfig -include(../staticlibrary.pri) -include(../../shared/variant/variant.pri) - -DEFINES += \ - PKG_CONFIG_PC_PATH=\\\"/usr/lib/pkgconfig:/usr/share/pkgconfig\\\" \ - PKG_CONFIG_SYSTEM_LIBRARY_PATH=\\\"/usr/$${QBS_LIBRARY_DIRNAME}/\\\" \ - QBS_PC_WITH_QT_SUPPORT=1 - -macos|win32-g++ { - DEFINES += HAS_STD_FILESYSTEM=0 -} else { - DEFINES += HAS_STD_FILESYSTEM=1 -} - -HEADERS += \ - pcpackage.h \ - pcparser.h \ - pkgconfig.h - -SOURCES += \ - pcpackage.cpp \ - pcparser.cpp \ - pkgconfig.cpp \ - diff --git a/src/lib/pkgconfig/use_pkgconfig.pri b/src/lib/pkgconfig/use_pkgconfig.pri deleted file mode 100644 index 4620aec7f..000000000 --- a/src/lib/pkgconfig/use_pkgconfig.pri +++ /dev/null @@ -1,52 +0,0 @@ -include(../../library_dirname.pri) -include(../../shared/variant/variant.pri) - -isEmpty(QBSLIBDIR) { - QBSLIBDIR = $${OUT_PWD}/../../../$${QBS_LIBRARY_DIRNAME} -} - -QBSPKGCONFIG_LIBNAME=qbspkgconfig - -unix { - LIBS += -L$${QBSLIBDIR} -l$${QBSPKGCONFIG_LIBNAME} -} - -win32 { - CONFIG(debug, debug|release) { - QBSPKGCONFIG_LIB = $${QBSPKGCONFIG_LIBNAME}d - } - CONFIG(release, debug|release) { - QBSPKGCONFIG_LIB = $${QBSPKGCONFIG_LIBNAME} - } - msvc { - LIBS += /LIBPATH:$$QBSLIBDIR - QBSPKGCONFIG_LIB = $${QBSPKGCONFIG_LIB}.lib - LIBS += Shell32.lib - } else { - LIBS += -L$${QBSLIBDIR} - QBSPKGCONFIG_LIB = lib$${QBSPKGCONFIG_LIB} - } - LIBS += $${QBSPKGCONFIG_LIB} -} - -gcc:!clang { - isEmpty(COMPILER_VERSION) { - COMPILER_VERSION = $$system($$QMAKE_CXX " -dumpversion") - COMPILER_MAJOR_VERSION = $$str_member($$COMPILER_VERSION) - lessThan(COMPILER_MAJOR_VERSION, 9) { - LIBS += -lstdc++fs - } - } -} - -INCLUDEPATH += \ - $$PWD - -CONFIG += depend_includepath - -CONFIG(static, static|shared) { - DEFINES += QBS_STATIC_LIB -} - -DEFINES += \ - QBS_PC_WITH_QT_SUPPORT=1 diff --git a/src/lib/scriptengine/scriptengine.pro b/src/lib/scriptengine/scriptengine.pro deleted file mode 100644 index 34fd5a5f8..000000000 --- a/src/lib/scriptengine/scriptengine.pro +++ /dev/null @@ -1,98 +0,0 @@ -TARGET = qbsscriptengine -include(../library.pri) - -QT = core-private - -versionAtLeast(QT_VERSION, 6.0.0) { - QT += core5compat -} - -DEFINES += QT_BUILD_SCRIPT_LIB - -DEFINES += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror WTF=QTWTF -DEFINES += QT_NO_USING_NAMESPACE - -CONFIG += building-libs - -GENERATED_SOURCES_DIR = generated - -CONFIG += QTDIR_build -include(../../shared/qtscript/src/3rdparty/javascriptcore/WebKit.pri) - -# Disable a few warnings on Windows. -# These are in addition to the ones disabled in WebKit.pri -msvc: QMAKE_CXXFLAGS += -wd4396 -wd4099 -else: QMAKE_CXXFLAGS += -Wno-deprecated - -# We cannot afford -O0 for QtScript even in debug builds. -QMAKE_CXXFLAGS_DEBUG += -O2 - -darwin { - DEFINES += ENABLE_JSC_MULTIPLE_THREADS=0 - contains(QT_CONFIG, coreservices) { - LIBS_PRIVATE += -framework CoreServices - } else { - LIBS_PRIVATE += -framework CoreFoundation - } -} -win32 { - LIBS += -lwinmm -} - -# Suppress 'LEAK' messages (see QTBUG-18201) -DEFINES += LOG_DISABLED=1 - -JAVASCRIPTCORE_JIT = no -include(../../shared/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri) - -# This line copied from WebCore.pro -DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 - -CONFIG(release, debug|release): DEFINES += NDEBUG - -# Avoid JSC C API functions being exported. -DEFINES += JS_NO_EXPORT - -!build_pass { - versionAtLeast(QT_VERSION, 6.1.0) { - qtPrepareLibExecTool(QMAKE_SYNCQT, syncqt, , system) - } else { - qtPrepareTool(QMAKE_SYNCQT, syncqt, , system) - } - QMAKE_SYNCQT += \ - -minimal -version $$[QT_VERSION] \ - -outdir $$system_quote($$system_path($$OUT_PWD)) \ - $$system_quote($$system_path($$clean_path($$PWD/../../shared/qtscript))) - !system($$QMAKE_SYNCQT): error("Failed to execute syncqt for the bundled QtScript module.") -} - -INCLUDEPATH += \ - $$PWD/include \ - $$OUT_PWD/include \ - $$OUT_PWD/include/QtScript/$$[QT_VERSION]/QtScript \ - $$PWD/../../shared/qtscript/src/script \ - $$PWD/../../shared/qtscript/src/script/api - -include(../../shared/qtscript/src/script/api/api.pri) -include(../../shared/qtscript/src/script/parser/parser.pri) - -BRIDGESRCDIR = ../../shared/qtscript/src/script/bridge -SOURCES += \ - $$BRIDGESRCDIR/qscriptactivationobject.cpp \ - $$BRIDGESRCDIR/qscriptclassobject.cpp \ - $$BRIDGESRCDIR/qscriptfunction.cpp \ - $$BRIDGESRCDIR/qscriptglobalobject.cpp \ - $$BRIDGESRCDIR/qscriptobject.cpp \ - $$BRIDGESRCDIR/qscriptqobject.cpp \ - $$BRIDGESRCDIR/qscriptstaticscopeobject.cpp \ - $$BRIDGESRCDIR/qscriptvariant.cpp - -HEADERS += \ - $$BRIDGESRCDIR/qscriptactivationobject_p.h \ - $$BRIDGESRCDIR/qscriptclassobject_p.h \ - $$BRIDGESRCDIR/qscriptfunction_p.h \ - $$BRIDGESRCDIR/qscriptglobalobject_p.h \ - $$BRIDGESRCDIR/qscriptobject_p.h \ - $$BRIDGESRCDIR/qscriptqobject_p.h \ - $$BRIDGESRCDIR/qscriptstaticscopeobject_p.h \ - $$BRIDGESRCDIR/qscriptvariant_p.h diff --git a/src/lib/scriptengine/use_scriptengine.pri b/src/lib/scriptengine/use_scriptengine.pri deleted file mode 100644 index 9981b442a..000000000 --- a/src/lib/scriptengine/use_scriptengine.pri +++ /dev/null @@ -1,30 +0,0 @@ -include(../bundledlibs.pri) - -qbs_use_bundled_qtscript:!qbs_do_not_link_bundled_qtscript { - include(../../library_dirname.pri) - isEmpty(QBSLIBDIR) { - QBSLIBDIR = $$shadowed($$PWD/../../../$${QBS_LIBRARY_DIRNAME}) - } - - versionAtLeast(QT_VERSION, 6.0.0) { - QT *= core5compat - } - - LIBS += -L$$QBSLIBDIR - macos { - LIBS += -lqbsscriptengine - } - else { - LIBS += -lqbsscriptengine$$qtPlatformTargetSuffix() - } - - isEmpty(QBS_RPATH): QBS_RPATH = ../$$QBS_LIBRARY_DIRNAME - !qbs_disable_rpath { - linux-*: QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,\$\$ORIGIN/$${QBS_RPATH}\' - macos: QMAKE_LFLAGS += -Wl,-rpath,@loader_path/$${QBS_RPATH} - } -} - -INCLUDEPATH += \ - $$PWD/include \ - $$shadowed($$PWD/include) diff --git a/src/lib/staticlibrary.pri b/src/lib/staticlibrary.pri deleted file mode 100644 index 57f780b78..000000000 --- a/src/lib/staticlibrary.pri +++ /dev/null @@ -1,4 +0,0 @@ -include(library_base.pri) - -CONFIG += staticlib -DEFINES += QBS_STATIC_LIB diff --git a/src/libexec/libexec.pri b/src/libexec/libexec.pri deleted file mode 100644 index a5cd2c599..000000000 --- a/src/libexec/libexec.pri +++ /dev/null @@ -1,11 +0,0 @@ -include(../install_prefix.pri) - -win32:LIBEXEC_BASE_DIR=bin -else:LIBEXEC_BASE_DIR=libexec/qbs - -!isEmpty(QBS_LIBEXEC_DESTDIR):DESTDIR=$${QBS_LIBEXEC_DESTDIR} -else:DESTDIR=../../../$$LIBEXEC_BASE_DIR - -!isEmpty(QBS_LIBEXEC_INSTALL_DIR):target.path = $${QBS_LIBEXEC_INSTALL_DIR} -else:target.path = $${QBS_INSTALL_PREFIX}/$$LIBEXEC_BASE_DIR -INSTALLS += target diff --git a/src/libexec/libexec.pro b/src/libexec/libexec.pro deleted file mode 100644 index 75b1d0844..000000000 --- a/src/libexec/libexec.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += qbs_processlauncher diff --git a/src/libexec/qbs_processlauncher/qbs_processlauncher.pro b/src/libexec/qbs_processlauncher/qbs_processlauncher.pro deleted file mode 100644 index c49e52e27..000000000 --- a/src/libexec/qbs_processlauncher/qbs_processlauncher.pro +++ /dev/null @@ -1,21 +0,0 @@ -include(../libexec.pri) - -TARGET = qbs_processlauncher -CONFIG += console c++17 -CONFIG -= app_bundle -QT = core network - -TOOLS_DIR = $$PWD/../../lib/corelib/tools - -INCLUDEPATH += $$TOOLS_DIR - -HEADERS += \ - launcherlogging.h \ - launchersockethandler.h \ - $$TOOLS_DIR/launcherpackets.h - -SOURCES += \ - launcherlogging.cpp \ - launchersockethandler.cpp \ - processlauncher-main.cpp \ - $$TOOLS_DIR/launcherpackets.cpp diff --git a/src/library_dirname.pri b/src/library_dirname.pri deleted file mode 100644 index 5d0712d79..000000000 --- a/src/library_dirname.pri +++ /dev/null @@ -1 +0,0 @@ -isEmpty(QBS_LIBRARY_DIRNAME):QBS_LIBRARY_DIRNAME = lib diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdb.pri b/src/plugins/generator/clangcompilationdb/clangcompilationdb.pri deleted file mode 100644 index 7c9a71129..000000000 --- a/src/plugins/generator/clangcompilationdb/clangcompilationdb.pri +++ /dev/null @@ -1 +0,0 @@ -qbsPluginTarget = clangcompilationdbgenerator diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdb.pro b/src/plugins/generator/clangcompilationdb/clangcompilationdb.pro deleted file mode 100644 index 1b5342598..000000000 --- a/src/plugins/generator/clangcompilationdb/clangcompilationdb.pro +++ /dev/null @@ -1,11 +0,0 @@ -include(clangcompilationdb.pri) -include(../../plugins.pri) - -QT = core - -HEADERS += \ - $$PWD/clangcompilationdbgenerator.h - -SOURCES += \ - $$PWD/clangcompilationdbgenerator.cpp \ - $$PWD/clangcompilationdbgeneratorplugin.cpp diff --git a/src/plugins/generator/generator.pro b/src/plugins/generator/generator.pro deleted file mode 100644 index 4a3861321..000000000 --- a/src/plugins/generator/generator.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += clangcompilationdb -SUBDIRS += makefilegenerator -SUBDIRS += visualstudio -SUBDIRS += iarew -SUBDIRS += keiluv diff --git a/src/plugins/generator/iarew/iarew.pri b/src/plugins/generator/iarew/iarew.pri deleted file mode 100644 index 68a3593fa..000000000 --- a/src/plugins/generator/iarew/iarew.pri +++ /dev/null @@ -1 +0,0 @@ -qbsPluginTarget = iarewgenerator diff --git a/src/plugins/generator/iarew/iarew.pro b/src/plugins/generator/iarew/iarew.pro deleted file mode 100644 index 542449510..000000000 --- a/src/plugins/generator/iarew/iarew.pro +++ /dev/null @@ -1,131 +0,0 @@ -include(iarew.pri) -include(../../plugins.pri) -include(../../../shared/json/json.pri) - -QT = core - -# Plugin file. - -SOURCES += \ - $$PWD/iarewgeneratorplugin.cpp \ - -# Common files. - -HEADERS += \ - $$PWD/iarewfileversionproperty.h \ - $$PWD/iarewgenerator.h \ - $$PWD/iarewoptionpropertygroup.h \ - $$PWD/iarewproject.h \ - $$PWD/iarewprojectwriter.h \ - $$PWD/iarewsettingspropertygroup.h \ - $$PWD/iarewsourcefilepropertygroup.h \ - $$PWD/iarewsourcefilespropertygroup.h \ - $$PWD/iarewtoolchainpropertygroup.h \ - $$PWD/iarewutils.h \ - $$PWD/iarewversioninfo.h \ - $$PWD/iarewworkspace.h \ - $$PWD/iarewworkspacewriter.h - -SOURCES += \ - $$PWD/iarewfileversionproperty.cpp \ - $$PWD/iarewgenerator.cpp \ - $$PWD/iarewoptionpropertygroup.cpp \ - $$PWD/iarewproject.cpp \ - $$PWD/iarewprojectwriter.cpp \ - $$PWD/iarewsettingspropertygroup.cpp \ - $$PWD/iarewsourcefilepropertygroup.cpp \ - $$PWD/iarewsourcefilespropertygroup.cpp \ - $$PWD/iarewtoolchainpropertygroup.cpp \ - $$PWD/iarewutils.cpp \ - $$PWD/iarewworkspace.cpp \ - $$PWD/iarewworkspacewriter.cpp - -# For ARM architecture. - -HEADERS += \ - $$PWD/archs/arm/armarchiversettingsgroup_v8.h \ - $$PWD/archs/arm/armassemblersettingsgroup_v8.h \ - $$PWD/archs/arm/armbuildconfigurationgroup_v8.h \ - $$PWD/archs/arm/armcompilersettingsgroup_v8.h \ - $$PWD/archs/arm/armgeneralsettingsgroup_v8.h \ - $$PWD/archs/arm/armlinkersettingsgroup_v8.h - -SOURCES += \ - $$PWD/archs/arm/armarchiversettingsgroup_v8.cpp \ - $$PWD/archs/arm/armassemblersettingsgroup_v8.cpp \ - $$PWD/archs/arm/armbuildconfigurationgroup_v8.cpp \ - $$PWD/archs/arm/armcompilersettingsgroup_v8.cpp \ - $$PWD/archs/arm/armgeneralsettingsgroup_v8.cpp \ - $$PWD/archs/arm/armlinkersettingsgroup_v8.cpp - -# For AVR architecture. - -HEADERS += \ - $$PWD/archs/avr/avrarchiversettingsgroup_v7.h \ - $$PWD/archs/avr/avrassemblersettingsgroup_v7.h \ - $$PWD/archs/avr/avrbuildconfigurationgroup_v7.h \ - $$PWD/archs/avr/avrcompilersettingsgroup_v7.h \ - $$PWD/archs/avr/avrgeneralsettingsgroup_v7.h \ - $$PWD/archs/avr/avrlinkersettingsgroup_v7.h - -SOURCES += \ - $$PWD/archs/avr/avrarchiversettingsgroup_v7.cpp \ - $$PWD/archs/avr/avrassemblersettingsgroup_v7.cpp \ - $$PWD/archs/avr/avrbuildconfigurationgroup_v7.cpp \ - $$PWD/archs/avr/avrcompilersettingsgroup_v7.cpp \ - $$PWD/archs/avr/avrgeneralsettingsgroup_v7.cpp \ - $$PWD/archs/avr/avrlinkersettingsgroup_v7.cpp - -# For MCS51 architecture. - -HEADERS += \ - $$PWD/archs/mcs51/mcs51archiversettingsgroup_v10.h \ - $$PWD/archs/mcs51/mcs51assemblersettingsgroup_v10.h \ - $$PWD/archs/mcs51/mcs51buildconfigurationgroup_v10.h \ - $$PWD/archs/mcs51/mcs51compilersettingsgroup_v10.h \ - $$PWD/archs/mcs51/mcs51generalsettingsgroup_v10.h \ - $$PWD/archs/mcs51/mcs51linkersettingsgroup_v10.h - -SOURCES += \ - $$PWD/archs/mcs51/mcs51archiversettingsgroup_v10.cpp \ - $$PWD/archs/mcs51/mcs51assemblersettingsgroup_v10.cpp \ - $$PWD/archs/mcs51/mcs51buildconfigurationgroup_v10.cpp \ - $$PWD/archs/mcs51/mcs51compilersettingsgroup_v10.cpp \ - $$PWD/archs/mcs51/mcs51generalsettingsgroup_v10.cpp \ - $$PWD/archs/mcs51/mcs51linkersettingsgroup_v10.cpp - -# For STM8 architecture. - -HEADERS += \ - $$PWD/archs/stm8/stm8archiversettingsgroup_v3.h \ - $$PWD/archs/stm8/stm8assemblersettingsgroup_v3.h \ - $$PWD/archs/stm8/stm8buildconfigurationgroup_v3.h \ - $$PWD/archs/stm8/stm8compilersettingsgroup_v3.h \ - $$PWD/archs/stm8/stm8generalsettingsgroup_v3.h \ - $$PWD/archs/stm8/stm8linkersettingsgroup_v3.h - -SOURCES += \ - $$PWD/archs/stm8/stm8archiversettingsgroup_v3.cpp \ - $$PWD/archs/stm8/stm8assemblersettingsgroup_v3.cpp \ - $$PWD/archs/stm8/stm8buildconfigurationgroup_v3.cpp \ - $$PWD/archs/stm8/stm8compilersettingsgroup_v3.cpp \ - $$PWD/archs/stm8/stm8generalsettingsgroup_v3.cpp \ - $$PWD/archs/stm8/stm8linkersettingsgroup_v3.cpp - -# For MSP430 architecture. - -HEADERS += \ - $$PWD/archs/msp430/msp430archiversettingsgroup_v7.h \ - $$PWD/archs/msp430/msp430assemblersettingsgroup_v7.h \ - $$PWD/archs/msp430/msp430buildconfigurationgroup_v7.h \ - $$PWD/archs/msp430/msp430compilersettingsgroup_v7.h \ - $$PWD/archs/msp430/msp430generalsettingsgroup_v7.h \ - $$PWD/archs/msp430/msp430linkersettingsgroup_v7.h - -SOURCES += \ - $$PWD/archs/msp430/msp430archiversettingsgroup_v7.cpp \ - $$PWD/archs/msp430/msp430assemblersettingsgroup_v7.cpp \ - $$PWD/archs/msp430/msp430buildconfigurationgroup_v7.cpp \ - $$PWD/archs/msp430/msp430compilersettingsgroup_v7.cpp \ - $$PWD/archs/msp430/msp430generalsettingsgroup_v7.cpp \ - $$PWD/archs/msp430/msp430linkersettingsgroup_v7.cpp diff --git a/src/plugins/generator/keiluv/keiluv.pri b/src/plugins/generator/keiluv/keiluv.pri deleted file mode 100644 index 6995fb059..000000000 --- a/src/plugins/generator/keiluv/keiluv.pri +++ /dev/null @@ -1 +0,0 @@ -qbsPluginTarget = keiluvgenerator diff --git a/src/plugins/generator/keiluv/keiluv.pro b/src/plugins/generator/keiluv/keiluv.pro deleted file mode 100644 index 052277ef8..000000000 --- a/src/plugins/generator/keiluv/keiluv.pro +++ /dev/null @@ -1,90 +0,0 @@ -include(keiluv.pri) -include(../../plugins.pri) -include(../../../shared/json/json.pri) - -QT = core - -# Plugin file. - -SOURCES += \ - $$PWD/keiluvgeneratorplugin.cpp \ - -# Common files. - -HEADERS += \ - $$PWD/keiluvconstants.h \ - $$PWD/keiluvfilesgroupspropertygroup.h \ - $$PWD/keiluvgenerator.h \ - $$PWD/keiluvproject.h \ - $$PWD/keiluvprojectwriter.h \ - $$PWD/keiluvutils.h \ - $$PWD/keiluvversioninfo.h \ - $$PWD/keiluvworkspace.h \ - $$PWD/keiluvworkspacewriter.h - -SOURCES += \ - $$PWD/keiluvfilesgroupspropertygroup.cpp \ - $$PWD/keiluvgenerator.cpp \ - $$PWD/keiluvproject.cpp \ - $$PWD/keiluvprojectwriter.cpp \ - $$PWD/keiluvutils.cpp \ - $$PWD/keiluvworkspace.cpp \ - $$PWD/keiluvworkspacewriter.cpp - -# For MCS51 architecture. - -HEADERS += \ - $$PWD/archs/mcs51/mcs51buildtargetgroup_v5.h \ - $$PWD/archs/mcs51/mcs51commonpropertygroup_v5.h \ - $$PWD/archs/mcs51/mcs51debugoptiongroup_v5.h \ - $$PWD/archs/mcs51/mcs51dlloptiongroup_v5.h \ - $$PWD/archs/mcs51/mcs51targetassemblergroup_v5.h \ - $$PWD/archs/mcs51/mcs51targetcommonoptionsgroup_v5.h \ - $$PWD/archs/mcs51/mcs51targetcompilergroup_v5.h \ - $$PWD/archs/mcs51/mcs51targetgroup_v5.h \ - $$PWD/archs/mcs51/mcs51targetlinkergroup_v5.h \ - $$PWD/archs/mcs51/mcs51targetmiscgroup_v5.h \ - $$PWD/archs/mcs51/mcs51utilitiesgroup_v5.h \ - $$PWD/archs/mcs51/mcs51utils.h - -SOURCES += \ - $$PWD/archs/mcs51/mcs51buildtargetgroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51commonpropertygroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51debugoptiongroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51dlloptiongroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51targetassemblergroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51targetcommonoptionsgroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51targetcompilergroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51targetgroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51targetlinkergroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51targetmiscgroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51utilitiesgroup_v5.cpp \ - $$PWD/archs/mcs51/mcs51utils.cpp - -# For ARM architecture. - -HEADERS += \ - $$PWD/archs/arm/armbuildtargetgroup_v5.h \ - $$PWD/archs/arm/armcommonpropertygroup_v5.h \ - $$PWD/archs/arm/armdebugoptiongroup_v5.h \ - $$PWD/archs/arm/armdlloptiongroup_v5.h \ - $$PWD/archs/arm/armtargetassemblergroup_v5.h \ - $$PWD/archs/arm/armtargetcommonoptionsgroup_v5.h \ - $$PWD/archs/arm/armtargetcompilergroup_v5.h \ - $$PWD/archs/arm/armtargetgroup_v5.h \ - $$PWD/archs/arm/armtargetlinkergroup_v5.h \ - $$PWD/archs/arm/armtargetmiscgroup_v5.h \ - $$PWD/archs/arm/armutilitiesgroup_v5.h - -SOURCES += \ - $$PWD/archs/arm/armbuildtargetgroup_v5.cpp \ - $$PWD/archs/arm/armcommonpropertygroup_v5.cpp \ - $$PWD/archs/arm/armdebugoptiongroup_v5.cpp \ - $$PWD/archs/arm/armdlloptiongroup_v5.cpp \ - $$PWD/archs/arm/armtargetassemblergroup_v5.cpp \ - $$PWD/archs/arm/armtargetcommonoptionsgroup_v5.cpp \ - $$PWD/archs/arm/armtargetcompilergroup_v5.cpp \ - $$PWD/archs/arm/armtargetgroup_v5.cpp \ - $$PWD/archs/arm/armtargetlinkergroup_v5.cpp \ - $$PWD/archs/arm/armtargetmiscgroup_v5.cpp \ - $$PWD/archs/arm/armutilitiesgroup_v5.cpp diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.pri b/src/plugins/generator/makefilegenerator/makefilegenerator.pri deleted file mode 100644 index 971e63d24..000000000 --- a/src/plugins/generator/makefilegenerator/makefilegenerator.pri +++ /dev/null @@ -1 +0,0 @@ -qbsPluginTarget = makefilegenerator diff --git a/src/plugins/generator/makefilegenerator/makefilegenerator.pro b/src/plugins/generator/makefilegenerator/makefilegenerator.pro deleted file mode 100644 index c03191c39..000000000 --- a/src/plugins/generator/makefilegenerator/makefilegenerator.pro +++ /dev/null @@ -1,11 +0,0 @@ -include(makefilegenerator.pri) -include(../../plugins.pri) - -QT = core - -HEADERS += \ - $$PWD/makefilegenerator.h - -SOURCES += \ - $$PWD/makefilegenerator.cpp \ - $$PWD/makefilegeneratorplugin.cpp diff --git a/src/plugins/generator/visualstudio/visualstudio.pri b/src/plugins/generator/visualstudio/visualstudio.pri deleted file mode 100644 index 13a48e85d..000000000 --- a/src/plugins/generator/visualstudio/visualstudio.pri +++ /dev/null @@ -1 +0,0 @@ -qbsPluginTarget = visualstudiogenerator diff --git a/src/plugins/generator/visualstudio/visualstudio.pro b/src/plugins/generator/visualstudio/visualstudio.pro deleted file mode 100644 index 49aee0eb4..000000000 --- a/src/plugins/generator/visualstudio/visualstudio.pro +++ /dev/null @@ -1,32 +0,0 @@ -include(visualstudio.pri) -include(../../plugins.pri) -include(../../../shared/json/json.pri) -include(../../../lib/msbuild/use_msbuild.pri) -# Using the indirect usage of corelib via plugins.pri breaks linking on mingw -include(../../../lib/corelib/use_corelib.pri) - -INCLUDEPATH += ../../../lib/msbuild - -QT = core - -HEADERS += \ - $$PWD/msbuildfiltersproject.h \ - $$PWD/msbuildqbsgenerateproject.h \ - $$PWD/msbuildqbsproductproject.h \ - $$PWD/msbuildsharedsolutionpropertiesproject.h \ - $$PWD/msbuildsolutionpropertiesproject.h \ - $$PWD/msbuildtargetproject.h \ - $$PWD/msbuildutils.h \ - $$PWD/visualstudiogenerator.h \ - $$PWD/visualstudioguidpool.h - -SOURCES += \ - $$PWD/msbuildfiltersproject.cpp \ - $$PWD/msbuildqbsgenerateproject.cpp \ - $$PWD/msbuildqbsproductproject.cpp \ - $$PWD/msbuildsharedsolutionpropertiesproject.cpp \ - $$PWD/msbuildsolutionpropertiesproject.cpp \ - $$PWD/msbuildtargetproject.cpp \ - $$PWD/visualstudiogenerator.cpp \ - $$PWD/visualstudiogeneratorplugin.cpp \ - $$PWD/visualstudioguidpool.cpp diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri deleted file mode 100644 index 65de9bc10..000000000 --- a/src/plugins/plugins.pri +++ /dev/null @@ -1,21 +0,0 @@ -include(qbs_plugin_common.pri) - -TARGET = $$qbsPluginTarget -DESTDIR = $$qbsPluginDestDir - -isEmpty(QBSLIBDIR): QBSLIBDIR = $$OUT_PWD/../../../../$${QBS_LIBRARY_DIRNAME} -isEmpty(QBS_RPATH): QBS_RPATH = ../.. -include($${PWD}/../lib/corelib/use_corelib.pri) - -TEMPLATE = lib - -CONFIG += c++17 -CONFIG(static, static|shared): CONFIG += create_prl -CONFIG += plugin - -!isEmpty(QBS_PLUGINS_INSTALL_DIR): \ - installPrefix = $${QBS_PLUGINS_INSTALL_DIR} -else: \ - installPrefix = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME} -target.path = $${installPrefix}/qbs/plugins -INSTALLS += target diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index 9fe2e6b5b..000000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = generator scanner diff --git a/src/plugins/qbs_plugin_common.pri b/src/plugins/qbs_plugin_common.pri deleted file mode 100644 index 45ade4989..000000000 --- a/src/plugins/qbs_plugin_common.pri +++ /dev/null @@ -1,9 +0,0 @@ -include(../library_dirname.pri) -include(../install_prefix.pri) - -!isEmpty(QBS_PLUGINS_BUILD_DIR) { - destdirPrefix = $${QBS_PLUGINS_BUILD_DIR} -} else { - destdirPrefix = $$shadowed($$PWD)/../../$${QBS_LIBRARY_DIRNAME} -} -qbsPluginDestDir = $${destdirPrefix}/qbs/plugins diff --git a/src/plugins/scanner/cpp/cpp.pri b/src/plugins/scanner/cpp/cpp.pri deleted file mode 100644 index 515e65635..000000000 --- a/src/plugins/scanner/cpp/cpp.pri +++ /dev/null @@ -1 +0,0 @@ -qbsPluginTarget = qbs_cpp_scanner diff --git a/src/plugins/scanner/cpp/cpp.pro b/src/plugins/scanner/cpp/cpp.pro deleted file mode 100644 index 12a6d7b6c..000000000 --- a/src/plugins/scanner/cpp/cpp.pro +++ /dev/null @@ -1,10 +0,0 @@ -include(cpp.pri) -include(../../plugins.pri) -DEFINES += CPLUSPLUS_NO_PARSER - -QT = core - -HEADERS += CPlusPlusForwardDeclarations.h Lexer.h Token.h ../scanner.h \ - cpp_global.h -SOURCES += Lexer.cpp Token.cpp \ - cppscanner.cpp diff --git a/src/plugins/scanner/qt/qt.pri b/src/plugins/scanner/qt/qt.pri deleted file mode 100644 index 71e3a8a45..000000000 --- a/src/plugins/scanner/qt/qt.pri +++ /dev/null @@ -1 +0,0 @@ -qbsPluginTarget = qbs_qt_scanner diff --git a/src/plugins/scanner/qt/qt.pro b/src/plugins/scanner/qt/qt.pro deleted file mode 100644 index f231ea9e2..000000000 --- a/src/plugins/scanner/qt/qt.pro +++ /dev/null @@ -1,8 +0,0 @@ -include(qt.pri) -include(../../plugins.pri) - -QT = core - -HEADERS += ../scanner.h -SOURCES += \ - qtscanner.cpp diff --git a/src/plugins/scanner/scanner.pro b/src/plugins/scanner/scanner.pro deleted file mode 100644 index 68acae7da..000000000 --- a/src/plugins/scanner/scanner.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = cpp qt - diff --git a/src/plugins/use_plugin.pri b/src/plugins/use_plugin.pri deleted file mode 100644 index 53be9f4db..000000000 --- a/src/plugins/use_plugin.pri +++ /dev/null @@ -1,10 +0,0 @@ -include(qbs_plugin_common.pri) - -qbsPluginLibName = $$qbsPluginTarget -win32:CONFIG(debug, debug|release):CONFIG(static, static|shared): \ - qbsPluginLibName = $${qbsPluginLibName}d -LIBS += -l$$qbsPluginLibName - -macos: QMAKE_LFLAGS += -Wl,-u,_qbs_static_plugin_register_$$qbsPluginTarget -!macos:gcc: QMAKE_LFLAGS += -Wl,--require-defined=qbs_static_plugin_register_$$qbsPluginTarget -msvc: QMAKE_LFLAGS += /INCLUDE:qbs_static_plugin_register_$$qbsPluginTarget diff --git a/src/shared/json/json.pri b/src/shared/json/json.pri deleted file mode 100644 index 1b44027c6..000000000 --- a/src/shared/json/json.pri +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDEPATH += $$PWD -HEADERS += $$PWD/json.h -SOURCES += $$PWD/json.cpp diff --git a/src/shared/variant/variant.pri b/src/shared/variant/variant.pri deleted file mode 100644 index aba082dde..000000000 --- a/src/shared/variant/variant.pri +++ /dev/null @@ -1 +0,0 @@ -INCLUDEPATH += $$PWD diff --git a/static-res.pro b/static-res.pro deleted file mode 100644 index cbf9aa9d2..000000000 --- a/static-res.pro +++ /dev/null @@ -1,74 +0,0 @@ -TEMPLATE = aux - -!isEmpty(QBS_APPS_DESTDIR): qbsbindir = $${QBS_APPS_DESTDIR} -else: qbsbindir = bin - -envSpec = -unix:qbs_disable_rpath { - include(src/library_dirname.pri) - !isEmpty(QBS_DESTDIR): qbslibdir = $$QBS_DESTDIR - else: qbslibdir = $$OUT_PWD/$$QBS_LIBRARY_DIRNAME - macos: envVar = DYLD_LIBRARY_PATH - else: envVar = LD_LIBRARY_PATH - oldVal = $$getenv($$envVar) - newVal = $$qbslibdir - !isEmpty(oldVal): newVal = $$newVal:$$oldVal - envSpec = $$envVar=$$newVal -} - -builddirname = qbsres -typedescdir = share/qbs/qml-type-descriptions -typedescdir_src = $$builddirname/default/install-root/$$typedescdir -!isEmpty(QBS_QML_TYPE_DESCRIPTIONS_BUILD_DIR): \ - typedescdir_dst = $$QBS_QML_TYPE_DESCRIPTIONS_BUILD_DIR -else:!isEmpty(QBS_RESOURCES_BUILD_DIR): \ - typedescdir_dst = $$QBS_RESOURCES_BUILD_DIR/$$typedescdir -else: \ - typedescdir_dst = $$typedescdir - -qbsres.target = $$builddirname/default/default.bg -qbsres.commands = \ - $$envSpec $$shell_quote($$shell_path($$qbsbindir/qbs)) \ - build \ - --settings-dir $$shell_quote($$builddirname/settings) \ - -f $$shell_quote($$PWD/qbs.qbs) \ - -d $$shell_quote($$builddirname) \ - -p $$shell_quote("qbs resources") \ - qbs.installPrefix:undefined \ - project.withCode:false \ - project.withDocumentation:false \ - profile:none - -qbsqmltypes.target = $$typedescdir_dst/qbs.qmltypes -qbsqmltypes.commands = \ - $$sprintf($$QMAKE_MKDIR_CMD, \ - $$shell_quote($$shell_path($$typedescdir_dst))) $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \ - $$shell_quote($$shell_path($$typedescdir_src/qbs.qmltypes)) \ - $$shell_quote($$shell_path($$typedescdir_dst/qbs.qmltypes)) -qbsqmltypes.depends += qbsres - -qbsbundle.target = $$typedescdir_dst/qbs-bundle.json -qbsbundle.commands = \ - $$sprintf($$QMAKE_MKDIR_CMD, \ - $$shell_quote($$shell_path($$typedescdir_dst))) $$escape_expand(\\n\\t) \ - $$QMAKE_COPY \ - $$shell_quote($$shell_path($$typedescdir_src/qbs-bundle.json)) \ - $$shell_quote($$shell_path($$typedescdir_dst/qbs-bundle.json)) -qbsbundle.depends += qbsres - -QMAKE_EXTRA_TARGETS += qbsres qbsqmltypes qbsbundle - -PRE_TARGETDEPS += $$qbsqmltypes.target $$qbsbundle.target - -include(src/install_prefix.pri) - -qbstypedescfiles.files = $$qbsqmltypes.target $$qbsbundle.target -!isEmpty(QBS_QML_TYPE_DESCRIPTIONS_INSTALL_DIR): \ - installPrefix = $${QBS_QML_TYPE_DESCRIPTIONS_INSTALL_DIR} -else:!isEmpty(QBS_RESOURCES_INSTALL_DIR): \ - installPrefix = $${QBS_RESOURCES_INSTALL_DIR}/$$typedescdir -else: \ - installPrefix = $${QBS_INSTALL_PREFIX}/$$typedescdir -qbstypedescfiles.path = $${installPrefix} -INSTALLS += qbstypedescfiles diff --git a/static.pro b/static.pro deleted file mode 100644 index 86a9db24f..000000000 --- a/static.pro +++ /dev/null @@ -1,83 +0,0 @@ -TEMPLATE = aux - -DATA_DIRS = share/qbs/imports share/qbs/modules share/qbs/module-providers -PYTHON_DATA_DIRS = src/3rdparty/python/lib -win32:DATA_FILES = $$PWD/bin/ibmsvc.xml $$PWD/bin/ibqbs.bat -LIBEXEC_FILES = $$PWD/src/3rdparty/python/bin/dmgbuild - -# For use in custom compilers which just copy files -defineReplace(stripSrcDir) { - return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_)) -} - -defineReplace(stripPythonSrcDir) { - return($$relative_path($$absolute_path($$1, $$OUT_PWD), \ - $$_PRO_FILE_PWD_/src/3rdparty/python/lib/python2.7/site-packages)) -} - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - for(file, files):!exists($$file/*):FILES += $$file -} -FILES += $$DATA_FILES - -for(data_dir, PYTHON_DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - for(file, files):!exists($$file/*):PYTHON_FILES += $$file -} -PYTHON_FILES += $$PYTHON_DATA_FILES - -OTHER_FILES += $$FILES $$LIBEXEC_FILES - -!isEqual(PWD, $$OUT_PWD)|!isEmpty(QBS_RESOURCES_BUILD_DIR) { - copy2build.input = FILES - !isEmpty(QBS_RESOURCES_BUILD_DIR): \ - copy2build.output = $${QBS_RESOURCES_BUILD_DIR}/${QMAKE_FUNC_FILE_IN_stripSrcDir} - else: \ - copy2build.output = ${QMAKE_FUNC_FILE_IN_stripSrcDir} - copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - copy2build.name = COPY ${QMAKE_FILE_IN} - copy2build.CONFIG += no_link target_predeps - QMAKE_EXTRA_COMPILERS += copy2build -} - -copy2build_python.input = PYTHON_FILES -!isEmpty(QBS_RESOURCES_BUILD_DIR): \ - copy2build_python.output = \ - $${QBS_RESOURCES_BUILD_DIR}/share/qbs/python/${QMAKE_FUNC_FILE_IN_stripPythonSrcDir} -else: \ - copy2build_python.output = share/qbs/python/${QMAKE_FUNC_FILE_IN_stripPythonSrcDir} -copy2build_python.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -copy2build_python.name = COPY ${QMAKE_FILE_IN} -copy2build_python.CONFIG += no_link target_predeps -QMAKE_EXTRA_COMPILERS += copy2build_python - -libexec_copy.input = LIBEXEC_FILES -!isEmpty(QBS_LIBEXEC_DESTDIR): \ - libexec_copy.output = $${QBS_LIBEXEC_DESTDIR}/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} -else: \ - libexec_copy.output = libexec/qbs/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} -libexec_copy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -libexec_copy.name = COPY ${QMAKE_FILE_IN} -libexec_copy.CONFIG += no_link target_predeps -QMAKE_EXTRA_COMPILERS += libexec_copy - -include(src/install_prefix.pri) - -share.files = share/qbs -!isEmpty(QBS_RESOURCES_INSTALL_DIR): \ - installPrefix = $${QBS_RESOURCES_INSTALL_DIR} -else: \ - installPrefix = $${QBS_INSTALL_PREFIX} -share.path = $${installPrefix}/share -examples.files = examples -examples.path = $${share.path}/qbs -python_bin.files = $$files(src/3rdparty/python/bin/*) -!isEmpty(QBS_LIBEXEC_INSTALL_DIR): \ - python_bin.path = $${QBS_LIBEXEC_INSTALL_DIR} -else: \ - python_bin.path = $${QBS_INSTALL_PREFIX}/libexec/qbs -python.files = $$files(src/3rdparty/python/lib/python2.7/site-packages/*.py, true) -python.base = $$PWD/src/3rdparty/python/lib/python2.7/site-packages -python.path = $${share.path}/qbs/python -INSTALLS += share examples python_bin python diff --git a/tests/auto/api/api.pro b/tests/auto/api/api.pro deleted file mode 100644 index 36dcec237..000000000 --- a/tests/auto/api/api.pro +++ /dev/null @@ -1,27 +0,0 @@ -TARGET = tst_api - -HEADERS = tst_api.h -SOURCES = tst_api.cpp - -include(../../../src/library_dirname.pri) -isEmpty(QBS_RELATIVE_LIBEXEC_PATH) { - win32:QBS_RELATIVE_LIBEXEC_PATH=. - else:QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs -} -isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME} -isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=.. -DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" -DEFINES += QBS_RELATIVE_PLUGINS_PATH=\\\"$${QBS_RELATIVE_PLUGINS_PATH}\\\" -DEFINES += QBS_RELATIVE_SEARCH_PATH=\\\"$${QBS_RELATIVE_SEARCH_PATH}\\\" - -include(../auto.pri) - -DATA_DIRS = testdata - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri deleted file mode 100644 index e46f7640a..000000000 --- a/tests/auto/auto.pri +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE = app -DESTDIR = ../../../bin -DEFINES += SRCDIR=\\\"$$_PRO_FILE_PWD_\\\" -qbs_test_suite_name = $$replace(_PRO_FILE_, ^.*/([^/.]+)\\.pro$, \\1) -qbs_test_suite_name = $$upper($$replace(qbs_test_suite_name, -, _)) -DEFINES += QBS_TEST_SUITE_NAME=\\\"$${qbs_test_suite_name}\\\" -INCLUDEPATH += $$PWD/../../src $$PWD/../../src/app/shared - -QT = core testlib -CONFIG += testcase console -CONFIG -= app_bundle -CONFIG += c++17 -target.CONFIG += no_default_install - -dev_lib_frameworks=$$QMAKE_XCODE_DEVELOPER_PATH/Library/Frameworks -exists($$dev_lib_frameworks): LIBS += -F$$dev_lib_frameworks - -include(../../src/lib/corelib/use_corelib.pri) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index af06ea131..000000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,21 +0,0 @@ -TEMPLATE=subdirs - -qbs_enable_unit_tests { - SUBDIRS += \ - buildgraph \ - language \ - tools \ -} - -SUBDIRS += \ - cmdlineparser \ - blackbox/blackbox.pro \ - blackbox/blackbox-android.pro \ - blackbox/blackbox-apple.pro \ - blackbox/blackbox-baremetal.pro \ - blackbox/blackbox-clangdb.pro \ - blackbox/blackbox-examples.pro \ - blackbox/blackbox-java.pro \ - blackbox/blackbox-joblimits.pro \ - blackbox/blackbox-qt.pro \ - api diff --git a/tests/auto/blackbox/blackbox-android.pro b/tests/auto/blackbox/blackbox-android.pro deleted file mode 100644 index 7aca99e8d..000000000 --- a/tests/auto/blackbox/blackbox-android.pro +++ /dev/null @@ -1,21 +0,0 @@ -TARGET = tst_blackbox-android - -HEADERS = tst_blackboxandroid.h tst_blackboxbase.h -SOURCES = tst_blackboxandroid.cpp tst_blackboxbase.cpp -OBJECTS_DIR = android -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -DATA_DIRS = testdata-android ../find - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES - -DISTFILES += \ - testdata/texttemplate/expected-output-one.txt diff --git a/tests/auto/blackbox/blackbox-apple.pro b/tests/auto/blackbox/blackbox-apple.pro deleted file mode 100644 index 1a009e222..000000000 --- a/tests/auto/blackbox/blackbox-apple.pro +++ /dev/null @@ -1,20 +0,0 @@ -TARGET = tst_blackbox-apple - -HEADERS = tst_blackboxapple.h tst_blackboxbase.h -SOURCES = tst_blackboxapple.cpp tst_blackboxbase.cpp -OBJECTS_DIR = apple -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -QT += xml - -DATA_DIRS = testdata-apple ../find - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/blackbox/blackbox-baremetal.pro b/tests/auto/blackbox/blackbox-baremetal.pro deleted file mode 100644 index 32789346c..000000000 --- a/tests/auto/blackbox/blackbox-baremetal.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = tst_blackbox-baremetal - -HEADERS = tst_blackboxbaremetal.h tst_blackboxbase.h -SOURCES = tst_blackboxbaremetal.cpp tst_blackboxbase.cpp -OBJECTS_DIR = baremetal -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -DATA_DIRS = testdata-baremetal ../find - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/blackbox/blackbox-clangdb.pro b/tests/auto/blackbox/blackbox-clangdb.pro deleted file mode 100644 index 6e4075175..000000000 --- a/tests/auto/blackbox/blackbox-clangdb.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = tst_blackbox-clangdb - -HEADERS = tst_blackboxbase.h tst_clangdb.h -SOURCES = tst_blackboxbase.cpp tst_clangdb.cpp -OBJECTS_DIR = clangdb -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -DATA_DIRS = testdata-clangdb - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/blackbox/blackbox-examples.pro b/tests/auto/blackbox/blackbox-examples.pro deleted file mode 100644 index 70d5b6419..000000000 --- a/tests/auto/blackbox/blackbox-examples.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = tst_blackbox-examples - -HEADERS = tst_blackboxexamples.h tst_blackboxbase.h -SOURCES = tst_blackboxexamples.cpp tst_blackboxbase.cpp -OBJECTS_DIR = examples -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -DATA_DIRS = ../../../examples - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/blackbox/blackbox-java.pro b/tests/auto/blackbox/blackbox-java.pro deleted file mode 100644 index d297d9e09..000000000 --- a/tests/auto/blackbox/blackbox-java.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = tst_blackbox-java - -HEADERS = tst_blackboxjava.h tst_blackboxbase.h -SOURCES = tst_blackboxjava.cpp tst_blackboxbase.cpp -OBJECTS_DIR = java -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -DATA_DIRS = testdata-java ../find - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/blackbox/blackbox-joblimits.pro b/tests/auto/blackbox/blackbox-joblimits.pro deleted file mode 100644 index 85413473e..000000000 --- a/tests/auto/blackbox/blackbox-joblimits.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = tst_blackbox-joblimits - -HEADERS = tst_blackboxbase.h -SOURCES = tst_blackboxjoblimits.cpp tst_blackboxbase.cpp -OBJECTS_DIR = joblimits -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -DATA_DIRS = testdata-joblimits ../find - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/blackbox/blackbox-qt.pro b/tests/auto/blackbox/blackbox-qt.pro deleted file mode 100644 index e17a04a7e..000000000 --- a/tests/auto/blackbox/blackbox-qt.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = tst_blackbox-qt - -HEADERS = tst_blackboxqt.h tst_blackboxbase.h -SOURCES = tst_blackboxqt.cpp tst_blackboxbase.cpp -OBJECTS_DIR = qt -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -DATA_DIRS = testdata-qt ../find - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/blackbox/blackbox-windows.pro b/tests/auto/blackbox/blackbox-windows.pro deleted file mode 100644 index a9e8fdbd2..000000000 --- a/tests/auto/blackbox/blackbox-windows.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = tst_blackbox-windows - -HEADERS = tst_blackboxwindows.h tst_blackboxbase.h -SOURCES = tst_blackboxwindows.cpp tst_blackboxbase.cpp -OBJECTS_DIR = windows -MOC_DIR = $${OBJECTS_DIR}-moc - -include(../auto.pri) - -DATA_DIRS = testdata-windows ../find - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/blackbox/blackbox.pro b/tests/auto/blackbox/blackbox.pro deleted file mode 100644 index 42848d077..000000000 --- a/tests/auto/blackbox/blackbox.pro +++ /dev/null @@ -1,21 +0,0 @@ -TARGET = tst_blackbox - -HEADERS = tst_blackbox.h tst_blackboxbase.h -SOURCES = tst_blackbox.cpp tst_blackboxbase.cpp -OBJECTS_DIR = generic -MOC_DIR = $${OBJECTS_DIR}-moc -qbs_enable_unit_tests:DEFINES += QBS_ENABLE_UNIT_TESTS - -include(../auto.pri) - -QT += xml - -DATA_DIRS = testdata ../find - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES diff --git a/tests/auto/buildgraph/buildgraph.pro b/tests/auto/buildgraph/buildgraph.pro deleted file mode 100644 index 9230bb748..000000000 --- a/tests/auto/buildgraph/buildgraph.pro +++ /dev/null @@ -1,13 +0,0 @@ -TARGET = tst_buildgraph - -SOURCES = tst_buildgraph.cpp -HEADERS = tst_buildgraph.h - -include(../auto.pri) -include(../../../src/app/shared/logging/logging.pri) -include(../../../src/lib/bundledlibs.pri) - -qbs_use_bundled_qtscript { - CONFIG += qbs_do_not_link_bundled_qtscript - include(../../../src/lib/scriptengine/use_scriptengine.pri) -} diff --git a/tests/auto/cmdlineparser/cmdlineparser.pro b/tests/auto/cmdlineparser/cmdlineparser.pro deleted file mode 100644 index a95676be5..000000000 --- a/tests/auto/cmdlineparser/cmdlineparser.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = tst_cmdlineparser - -SOURCES = tst_cmdlineparser.cpp ../../../src/app/qbs/qbstool.cpp - -include(../auto.pri) -include(../../../src/app/qbs/parser/parser.pri) -include(../../../src/app/shared/logging/logging.pri) diff --git a/tests/auto/language/language.pro b/tests/auto/language/language.pro deleted file mode 100644 index cdb067195..000000000 --- a/tests/auto/language/language.pro +++ /dev/null @@ -1,24 +0,0 @@ -TARGET = tst_language - -SOURCES = tst_language.cpp -HEADERS = tst_language.h - -include(../auto.pri) -include(../../../src/app/shared/logging/logging.pri) -include(../../../src/lib/bundledlibs.pri) - -!qbs_use_bundled_qtscript: QT += script - -DATA_DIRS = testdata - -for(data_dir, DATA_DIRS) { - files = $$files($$PWD/$$data_dir/*, true) - win32:files ~= s|\\\\|/|g - for(file, files):!exists($$file/*):FILES += $$file -} - -OTHER_FILES += $$FILES - -qbs_use_bundled_qtscript { - include(../../../src/lib/scriptengine/use_scriptengine.pri) -} diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro deleted file mode 100644 index ba293f417..000000000 --- a/tests/auto/tools/tools.pro +++ /dev/null @@ -1,6 +0,0 @@ -TARGET = tst_tools - -SOURCES = tst_tools.cpp ../../../src/app/qbs/qbstool.cpp -HEADERS = tst_tools.h - -include(../auto.pri) diff --git a/tests/benchmarker/benchmarker.pro b/tests/benchmarker/benchmarker.pro deleted file mode 100644 index 875cf1de0..000000000 --- a/tests/benchmarker/benchmarker.pro +++ /dev/null @@ -1,20 +0,0 @@ -TARGET = qbs_benchmarker -DESTDIR = ../../bin -CONFIG += console -CONFIG -= app_bundle -CONFIG += c++17 -QT += concurrent -SOURCES = \ - benchmarker-main.cpp \ - benchmarker.cpp \ - commandlineparser.cpp \ - runsupport.cpp \ - valgrindrunner.cpp - -HEADERS = \ - activities.h \ - benchmarker.h \ - commandlineparser.h \ - exception.h \ - runsupport.h \ - valgrindrunner.h diff --git a/tests/fuzzy-test/fuzzy-test.pro b/tests/fuzzy-test/fuzzy-test.pro deleted file mode 100644 index 97083ef7a..000000000 --- a/tests/fuzzy-test/fuzzy-test.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = qbs_fuzzy-test -DESTDIR = ../../bin -CONFIG += console -CONFIG -= app_bundle -SOURCES = main.cpp \ - commandlineparser.cpp \ - fuzzytester.cpp - -HEADERS += \ - commandlineparser.h \ - fuzzytester.h diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index e454771e4..000000000 --- a/tests/tests.pro +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = auto fuzzy-test - -qtHaveModule(concurrent): SUBDIRS += benchmarker |