Commit 6aad96d8 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Nuke plugins PROVIDER settings

Place all plugins in lib/qtcreator/plugins

Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@digia.com>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
parent aa52cfa0
......@@ -16,7 +16,7 @@ CppApplication {
cpp.rpaths: [
buildDirectory + '/' + project.ide_library_path,
buildDirectory + '/' + project.ide_library_path + "/..", // OSX
buildDirectory + '/' + project.ide_plugin_path + "/QtProject"
buildDirectory + '/' + project.ide_plugin_path
]
// The following would be conceptually right, but does not work currently as some autotests
......@@ -25,7 +25,7 @@ CppApplication {
// cpp.rpaths: qbs.targetOS.contains("osx")
// ? ["@executable_path/.."]
// : ["$ORIGIN/../" + project.libDirName + "/qtcreator",
// "$ORIGIN/../" project.libDirName + "/qtcreator/plugins/QtProject"]
// "$ORIGIN/../" project.libDirName + "/qtcreator/plugins"]
// Group {
// fileTagsFilter: product.type
// qbs.install: true
......
......@@ -4,7 +4,6 @@ import QtcFunctions
Product {
type: ["dynamiclibrary", "pluginSpec"]
property string provider: 'QtProject'
property var pluginspecreplacements
property var pluginRecommends: []
......@@ -13,7 +12,7 @@ Product {
condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion)
targetName: QtcFunctions.qtLibraryName(qbs, name)
destinationDirectory: project.ide_plugin_path + '/' + provider
destinationDirectory: project.ide_plugin_path
Depends { name: "ExtensionSystem" }
Depends { name: "pluginspec" }
......@@ -24,9 +23,9 @@ Product {
}
cpp.defines: project.generalDefines.concat([name.toUpperCase() + "_LIBRARY"])
cpp.installNamePrefix: "@rpath/PlugIns/" + provider + "/"
cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../..", "@executable_path/.."]
: ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."]
cpp.installNamePrefix: "@rpath/PlugIns/"
cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/..", "@executable_path/.."]
: ["$ORIGIN", "$ORIGIN/.."]
cpp.cxxFlags: QtcFunctions.commonCxxFlags(qbs)
cpp.linkerFlags: {
var flags = QtcFunctions.commonLinkerFlags(qbs);
......@@ -56,7 +55,7 @@ Product {
Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: project.ide_plugin_path + "/" + provider
qbs.installDir: project.ide_plugin_path
}
Export {
......
......@@ -26,8 +26,6 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild%
## "~/Library/Application Support/QtProject/Qt Creator" on Mac
%DestDir%USE_USER_DESTDIR = yes
PROVIDER = %VendorName%
###### If the plugin can be depended upon by other plugins, this code needs to be outsourced to
###### <dirname>_dependencies.pri, where <dirname> is the name of the directory containing the
###### plugin's sources.
......
#PROVIDER = Openismus
include(../../qtcreatorplugin.pri)
HEADERS = autotoolsprojectplugin.h\
......
QT += network
PROVIDER = Sander
include(../../qtcreatorplugin.pri)
# BareMetal files
......
......@@ -4,7 +4,6 @@ import QtcPlugin
QtcPlugin {
name: "BareMetal"
provider: "Sander"
Depends { name: "Qt"; submodules: ["network", "widgets"]; }
Depends { name: "QtcSsh" }
......
# PROVIDER = AudioCodes
macx: CLEARCASE_DISABLED_STR = "true"
else: CLEARCASE_DISABLED_STR = "false"
......
......@@ -4,7 +4,6 @@ import QtcPlugin
QtcPlugin {
name: "ClearCase"
// provider: "AudioCodes"
pluginspecreplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")})
......
......@@ -12,8 +12,8 @@ CONFIG += console
CONFIG -= app_bundle
QT += network
LIBS *= -L$$IDE_PLUGIN_PATH/QtProject -l$$qtLibraryName(Core)
QMAKE_RPATHDIR *= $$IDE_PLUGIN_PATH/QtProject
LIBS *= -L$$IDE_PLUGIN_PATH -l$$qtLibraryName(Core)
QMAKE_RPATHDIR *= $$IDE_PLUGIN_PATH
DESTDIR=$$IDE_LIBEXEC_PATH
......
......@@ -14,7 +14,6 @@ QtcTool {
cpp.rpaths: [
"$ORIGIN/../" + project.libDirName + "/qtcreator",
"$ORIGIN/../" + project.libDirName + "/qtcreator/plugins",
"$ORIGIN/../" + project.libDirName + "/qtcreator/plugins/QtProject"
]
Group {
......
QT += network xml
PROVIDER = BlackBerry
include(../../qtcreatorplugin.pri)
......
......@@ -4,7 +4,6 @@ import QtcPlugin
QtcPlugin {
name: "Qnx"
provider: "BlackBerry"
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
Depends { name: "QtcSsh" }
......
......@@ -48,14 +48,8 @@ dependencyList = $$join(dependencyList, $$escape_expand(\\n))
# use gui precompiled header for plugins by default
isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h
isEmpty(PROVIDER) {
PROVIDER = QtProject
} else {
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
}
isEmpty(USE_USER_DESTDIR) {
DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER
DESTDIR = $$IDE_PLUGIN_PATH
} else {
win32 {
DESTDIRAPPNAME = "qtcreator"
......@@ -70,7 +64,7 @@ isEmpty(USE_USER_DESTDIR) {
isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share/data"
else:DESTDIRBASE = "$$DESTDIRBASE/data"
}
DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER"
DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION"
}
LIBS += -L$$DESTDIR
......@@ -130,13 +124,12 @@ greaterThan(QT_MAJOR_VERSION, 4) {
}
macx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/
QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/
QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
QMAKE_RPATHDIR += \$\$ORIGIN
QMAKE_RPATHDIR += \$\$ORIGIN/..
QMAKE_RPATHDIR += \$\$ORIGIN/../..
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
QMAKE_RPATHDIR =
......@@ -149,9 +142,9 @@ CONFIG += plugin plugin_with_soname
linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
!macx {
target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins
pluginspec.files += $${TARGET}.pluginspec
pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins
INSTALLS += target pluginspec
}
......
......@@ -10,7 +10,7 @@ CONFIG -= app_bundle
include(../../../qtcreator.pri)
include(../../rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
LIBS += -L$$IDE_PLUGIN_PATH
win32|equals(TEST, 1):DEFINES += HAS_MSVC_PARSER
DESTDIR = $$IDE_BIN_PATH
......
......@@ -14,7 +14,7 @@ QtcTool {
]
cpp.rpaths: base.concat(qbs.targetOS.contains("osx")
? ["@executable_path/../"]
: ["$ORIGIN/../" + project.ide_plugin_path + "/QtProject"])
: ["$ORIGIN/../" + project.ide_plugin_path])
cpp.defines: base.concat(qbs.targetOS.contains("windows") || project.testsEnabled
? ["HAS_MSVC_PARSER"] : [])
}
......@@ -2,5 +2,5 @@ QTC_PLUGIN_DEPENDS += cpptools
include(../../qttest.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"
LIBS *= -L$$IDE_PLUGIN_PATH
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
......@@ -7,8 +7,8 @@ win32-msvc* {
include(../qttest.pri)
win32-msvc* {
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"
LIBS *= -L$$IDE_PLUGIN_PATH
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
CDBEXT_PATH = $$IDE_BUILD_TREE\\$$IDE_LIBRARY_BASENAME
# replace '\' with '\\'
......
......@@ -2,6 +2,6 @@ QTC_PLUGIN_DEPENDS += diffeditor
include(../../qttest.pri)
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += tst_differ.cpp
......@@ -12,7 +12,7 @@ DynamicLibrary {
destinationDirectory: FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
cpp.rpaths: [
buildDirectory + "/" + project.libDirName + "/qtcreator",
buildDirectory + "/" + project.libDirName + "/qtcreator/plugins/QtProject"
buildDirectory + "/" + project.libDirName + "/qtcreator/plugins"
].concat(additionalRPaths)
property pathList filesToCopy
property pathList additionalRPaths: []
......
......@@ -3,7 +3,7 @@ include(../qttest.pri)
include($$IDE_SOURCE_TREE/src/plugins/coreplugin/coreplugin_dependencies.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils_dependencies.pri)
LIBS *= -L$$IDE_PLUGIN_PATH/QtProject
LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += tst_externaltooltest.cpp \
$$IDE_SOURCE_TREE/src/plugins/coreplugin/externaltool.cpp
......
......@@ -6,10 +6,10 @@ OUT_PWD=IDE_BUILD_TREE
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
include(../../../qttest.pri)
OUT_PWD=$$OUT_PWD_SAVE
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
LIBS += -L$$IDE_LIBRARY_PATH
LIBS *= -L$$IDE_PLUGIN_PATH
LIBS *= -L$$IDE_LIBRARY_PATH
unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/QtProject\'
unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}\'
QT += script \
network
......
@set path=%PATH%;%CD%\..\..\..\..\..\lib\qtcreator\plugins\QtProject\
@set path=%PATH%;%CD%\..\..\..\..\..\lib\qtcreator\plugins\
......@@ -4,7 +4,7 @@ include(../../../qttest.pri)
SRCDIR = $$IDE_SOURCE_TREE/src
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += \
tst_qmlcodeformatter.cpp
......@@ -4,8 +4,8 @@ include(../../qttest.pri)
#DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
#DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"
LIBS *= -L$$IDE_PLUGIN_PATH
#DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
DEFINES += TESTSRCDIR=\\\"$$PWD\\\"
SOURCES += $$PWD/tst_qrcparser.cpp
......@@ -11,7 +11,7 @@ DEFINES -= QT_NO_CAST_FROM_ASCII
!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
win32 {
lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/QtProject
lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH
lib ~= s,/,\\,g
# the below gets added to later by testcase.prf
check.commands = cd . & set PATH=$$lib;%PATH%& cmd /c
......
linux-* {
QMAKE_RPATHDIR += $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/QtProject
QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
......
QTC_PLUGIN_DEPENDS += coreplugin
include(../qttest.pri)
LIBS *= -L$$IDE_PLUGIN_PATH/QtProject
LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += \
tst_treeviewfind.cpp
......@@ -8,7 +8,7 @@ mkdir valgrind-test
cd valgrind-test
# make library paths known to ldconfig
export LD_LIBRARY_PATH=/path/to/qtc-build/lib/qtcreator:/path/to/qtc-build/lib/qtcreator/plugins/QtProject
export LD_LIBRARY_PATH=/path/to/qtc-build/lib/qtcreator:/path/to/qtc-build/lib/qtcreator/plugins
# run qmake, make
qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/auto/valgrind
......
......@@ -29,7 +29,7 @@ HEADERS += \
$$SRCDIR/plugins/valgrind/callgrindwidgethandler.h \
$$SRCDIR/plugins/valgrind/callgrindvisualisation.h \
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
LIBS *= -L$$IDE_PLUGIN_PATH
INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin # for ide_version.h
......
......@@ -5,7 +5,7 @@ CONFIG += shared
SOURCES += simple_test_plugin.cpp
macx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
QMAKE_RPATHDIR += \$\$ORIGIN/..
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment