Commit fd07e113 authored by Daniel Molkentin's avatar Daniel Molkentin Committed by Eike Ziller
Browse files

Do not include certain plugins when compiling



Certain plugins (example, updateinfo) should not be included
in a binary release, but we want to provide & build them by
default to ensure they still compile.

Defining the qmake variable IDE_PACKAGE_MODE will skip
them in the build process.

To still enable the UpdateInfo plugin, also define UPDATEINFO_ENABLE.

Change-Id: I256467edfd1e6ec272562e68e9ef19599e864185
Reviewed-by: default avatarNiels Weber <niels.2.weber@nokia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent 26b7b877
...@@ -23,7 +23,6 @@ SUBDIRS = plugin_coreplugin \ ...@@ -23,7 +23,6 @@ SUBDIRS = plugin_coreplugin \
plugin_locator \ plugin_locator \
plugin_debugger \ plugin_debugger \
# plugin_qtestlib \ # this seems to be dead # plugin_qtestlib \ # this seems to be dead
plugin_helloworld \ # sample plugin
plugin_help \ plugin_help \
# plugin_regexp \ # don't know what to do with this # plugin_regexp \ # don't know what to do with this
plugin_cpaster \ plugin_cpaster \
...@@ -45,8 +44,15 @@ SUBDIRS = plugin_coreplugin \ ...@@ -45,8 +44,15 @@ SUBDIRS = plugin_coreplugin \
plugin_qmlprofiler \ plugin_qmlprofiler \
plugin_remotelinux \ plugin_remotelinux \
plugin_madde \ plugin_madde \
plugin_valgrind \ plugin_valgrind
plugin_updateinfo
isEmpty(IDE_PACKAGE_MODE) {
SUBDIRS += plugin_helloworld \
plugin_updateinfo
} else:!isEmpty(UPDATEINFO_ENABLE) {
SUBDIRS += plugin_updateinfo
}
linux-* { linux-* {
SUBDIRS += debugger/ptracepreload.pro SUBDIRS += debugger/ptracepreload.pro
......
<plugin name=\"UpdateInfo\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"$$UPDATEINFO_DISABLE\"> <plugin name=\"UpdateInfo\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"$$UPDATEINFO_EXPERIMENTAL_STR\">
<vendor>Nokia Corporation</vendor> <vendor>Nokia Corporation</vendor>
<copyright>(C) 2011 Nokia Corporation</copyright> <copyright>(C) 2011 Nokia Corporation</copyright>
<license> <license>
......
...@@ -6,15 +6,10 @@ HEADERS += updateinfoplugin.h \ ...@@ -6,15 +6,10 @@ HEADERS += updateinfoplugin.h \
updateinfobutton.h updateinfobutton.h
SOURCES += updateinfoplugin.cpp \ SOURCES += updateinfoplugin.cpp \
updateinfobutton.cpp updateinfobutton.cpp
FORMS +=
RESOURCES += updateinfo.qrc RESOURCES += updateinfo.qrc
PROVIDER = Nokia isEmpty(UPDATEINFO_ENABLE):UPDATEINFO_EXPERIMENTAL_STR="true"
else:UPDATEINFO_EXPERIMENTAL_STR="false"
isEmpty(UPDATEINFO_DISABLE):UPDATEINFO_DISABLE=$$(UPDATEINFO_DISABLE)
isEmpty(UPDATEINFO_DISABLE):UPDATEINFO_DISABLE = "true"
else:UPDATEINFO_DISABLE = "false"
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
include(updateinfo_dependencies.pri) include(updateinfo_dependencies.pri)
Supports Markdown
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