rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

Build system branding

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@167 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
dankers 2010-02-03 23:52:51 +00:00 committed by dankers
parent f45670c82e
commit 0703a7df2e
15 changed files with 4246 additions and 4246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/bin/bin.pro
View File

@ -1,14 +1,14 @@
include(../openpilotgcs.pri) include(../openpilotgcs.pri)
TEMPLATE = app TEMPLATE = app
TARGET = $$IDE_APP_WRAPPER TARGET = $$GCS_APP_WRAPPER
OBJECTS_DIR = OBJECTS_DIR =
PRE_TARGETDEPS = $$PWD/openpilotgcs PRE_TARGETDEPS = $$PWD/openpilotgcs
QMAKE_LINK = cp $$PWD/openpilotgcs $@ && : IGNORE REST QMAKE_LINK = cp $$PWD/openpilotgcs $@ && : IGNORE REST
QMAKE_CLEAN = $$IDE_APP_WRAPPER QMAKE_CLEAN = $$GCS_APP_WRAPPER
target.path = /bin target.path = /bin
INSTALLS += target INSTALLS += target

6
ground/openpilotgcs.pri
View File

@ -59,7 +59,7 @@ macx {
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH
GCS_LIBEXEC_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Resources GCS_LIBEXEC_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Resources
GCS_DATA_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Resources GCS_DATA_PATH = $$GCS_APP_PATH/$${GCS_APP_TARGET}.app/Contents/Resources
IDE_DOC_PATH = $$GCS_DATA_PATH/doc GCS_DOC_PATH = $$GCS_DATA_PATH/doc
contains(QT_CONFIG, ppc):CONFIG += ppc x86 contains(QT_CONFIG, ppc):CONFIG += ppc x86
copydata = 1 copydata = 1
} else { } else {
@ -67,14 +67,14 @@ macx {
contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1 contains(TEMPLATE, vc.*)|contains(TEMPLATE_PREFIX, vc):vcproj = 1
GCS_APP_TARGET = openpilotgcs GCS_APP_TARGET = openpilotgcs
} else { } else {
IDE_APP_WRAPPER = openpilotgcs GCS_APP_WRAPPER = openpilotgcs
GCS_APP_TARGET = openpilotgcs.bin GCS_APP_TARGET = openpilotgcs.bin
} }
GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins
GCS_LIBEXEC_PATH = $$GCS_APP_PATH # FIXME GCS_LIBEXEC_PATH = $$GCS_APP_PATH # FIXME
GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs
IDE_DOC_PATH = $$GCS_BUILD_TREE/share/doc/openpilotgcs GCS_DOC_PATH = $$GCS_BUILD_TREE/share/doc/openpilotgcs
!isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1 !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
} }

2
ground/src/libs/extensionsystem/extensionsystem.pro
View File

@ -6,7 +6,7 @@ include(extensionsystem_dependencies.pri)
unix:!macx:!freebsd*:LIBS += -ldl unix:!macx:!freebsd*:LIBS += -ldl
DEFINES += IDE_TEST_DIR=\\\"$$GCS_SOURCE_TREE\\\" DEFINES += GCS_TEST_DIR=\\\"$$GCS_SOURCE_TREE\\\"
HEADERS += pluginerrorview.h \ HEADERS += pluginerrorview.h \
plugindetailsview.h \ plugindetailsview.h \

2
ground/src/libs/extensionsystem/pluginmanager.cpp
View File

@ -457,7 +457,7 @@ QString PluginManager::testDataDirectory() const
QByteArray ba = qgetenv("QTCREATOR_TEST_DIR"); QByteArray ba = qgetenv("QTCREATOR_TEST_DIR");
QString s = QString::fromLocal8Bit(ba.constData(), ba.size()); QString s = QString::fromLocal8Bit(ba.constData(), ba.size());
if (s.isEmpty()) { if (s.isEmpty()) {
s = IDE_TEST_DIR; s = GCS_TEST_DIR;
s.append("/tests"); s.append("/tests");
} }
s = QDir::cleanPath(s); s = QDir::cleanPath(s);

2
ground/src/openpilotgcslibrary.pri
View File

@ -10,7 +10,7 @@ include(rpath.pri)
TARGET = $$qtLibraryTarget($$TARGET) TARGET = $$qtLibraryTarget($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols
!macx { !macx {
win32 { win32 {

6
ground/src/openpilotgcsplugin.pri
View File

@ -32,13 +32,13 @@ macx {
QMAKE_RPATHDIR += \$\$ORIGIN QMAKE_RPATHDIR += \$\$ORIGIN
QMAKE_RPATHDIR += \$\$ORIGIN/.. QMAKE_RPATHDIR += \$\$ORIGIN/..
QMAKE_RPATHDIR += \$\$ORIGIN/../.. QMAKE_RPATHDIR += \$\$ORIGIN/../..
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") GCS_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${GCS_PLUGIN_RPATH}\'
QMAKE_RPATHDIR = QMAKE_RPATHDIR =
} }
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols
CONFIG += plugin plugin_with_soname CONFIG += plugin plugin_with_soname

2
ground/src/plugins/coreplugin/Core.pluginspec
View File

@ -1,4 +1,4 @@
<plugin name="Core" version="1.1" compatVersion="1.1"> <plugin name="Core" version="1.3.1" compatVersion="1.3.1">
<vendor>The OpenPilot Project</vendor> <vendor>The OpenPilot Project</vendor>
<copyright>(C) 2010 OpenPilot Project</copyright> <copyright>(C) 2010 OpenPilot Project</copyright>
<license> <license>

28
ground/src/plugins/coreplugin/coreconstants.h
View File

@ -33,28 +33,28 @@
namespace Core { namespace Core {
namespace Constants { namespace Constants {
#define IDE_VERSION_MAJOR 1 #define GCS_VERSION_MAJOR 1
#define IDE_VERSION_MINOR 3 #define GCS_VERSION_MINOR 3
#define IDE_VERSION_RELEASE 1 #define GCS_VERSION_RELEASE 1
#define STRINGIFY_INTERNAL(x) #x #define STRINGIFY_INTERNAL(x) #x
#define STRINGIFY(x) STRINGIFY_INTERNAL(x) #define STRINGIFY(x) STRINGIFY_INTERNAL(x)
#define IDE_VERSION STRINGIFY(IDE_VERSION_MAJOR) \ #define GCS_VERSION STRINGIFY(GCS_VERSION_MAJOR) \
"." STRINGIFY(IDE_VERSION_MINOR) \ "." STRINGIFY(GCS_VERSION_MINOR) \
"." STRINGIFY(IDE_VERSION_RELEASE) "." STRINGIFY(GCS_VERSION_RELEASE)
const char * const IDE_VERSION_LONG = IDE_VERSION; const char * const GCS_VERSION_LONG = GCS_VERSION;
const char * const IDE_AUTHOR = "Nokia Corporation"; const char * const GCS_AUTHOR = "Nokia Corporation";
const char * const IDE_YEAR = "2009"; const char * const GCS_YEAR = "2009";
#ifdef IDE_REVISION #ifdef GCS_REVISION
const char * const IDE_REVISION_STR = STRINGIFY(IDE_REVISION); const char * const GCS_REVISION_STR = STRINGIFY(GCS_REVISION);
#else #else
const char * const IDE_REVISION_STR = ""; const char * const GCS_REVISION_STR = "";
#endif #endif
#undef IDE_VERSION #undef GCS_VERSION
#undef STRINGIFY #undef STRINGIFY
#undef STRINGIFY_INTERNAL #undef STRINGIFY_INTERNAL
@ -122,7 +122,7 @@ const char * const MINIMIZE_WINDOW = "QtCreator.MinimizeWindow";
const char * const ZOOM_WINDOW = "QtCreator.ZoomWindow"; const char * const ZOOM_WINDOW = "QtCreator.ZoomWindow";
const char * const SPLIT = "QtCreator.Split"; const char * const SPLIT = "QtCreator.Split";
const char * const SPLIT_SIDE_BY_SIDE = "QtCreator.SplitSideBySide"; const char * const SPLIT_SGCS_BY_SIDE = "QtCreator.SplitSideBySide";
const char * const REMOVE_CURRENT_SPLIT = "QtCreator.RemoveCurrentSplit"; const char * const REMOVE_CURRENT_SPLIT = "QtCreator.RemoveCurrentSplit";
const char * const REMOVE_ALL_SPLITS = "QtCreator.RemoveAllSplits"; const char * const REMOVE_ALL_SPLITS = "QtCreator.RemoveAllSplits";
const char * const GOTO_OTHER_SPLIT = "QtCreator.GotoOtherSplit"; const char * const GOTO_OTHER_SPLIT = "QtCreator.GotoOtherSplit";

2
ground/src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@ -338,7 +338,7 @@ EditorManager::EditorManager(ICore *core, QWidget *parent) :
connect(m_d->m_splitAction, SIGNAL(triggered()), this, SLOT(split())); connect(m_d->m_splitAction, SIGNAL(triggered()), this, SLOT(split()));
m_d->m_splitSideBySideAction = new QAction(tr("Split Side by Side"), this); m_d->m_splitSideBySideAction = new QAction(tr("Split Side by Side"), this);
cmd = am->registerAction(m_d->m_splitSideBySideAction, Constants::SPLIT_SIDE_BY_SIDE, editManagerContext); cmd = am->registerAction(m_d->m_splitSideBySideAction, Constants::SPLIT_SGCS_BY_SIDE, editManagerContext);
cmd->setDefaultKeySequence(QKeySequence(tr("%1,3").arg(prefix))); cmd->setDefaultKeySequence(QKeySequence(tr("%1,3").arg(prefix)));
mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT); mwindow->addAction(cmd, Constants::G_WINDOW_SPLIT);
connect(m_d->m_splitSideBySideAction, SIGNAL(triggered()), this, SLOT(splitSideBySide())); connect(m_d->m_splitSideBySideAction, SIGNAL(triggered()), this, SLOT(splitSideBySide()));

2
ground/src/plugins/coreplugin/editormanager/editorview.cpp
View File

@ -679,7 +679,7 @@ void SplitterOrView::paintEvent(QPaintEvent *)
if (hasFocus()) { if (hasFocus()) {
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
// With QMacStyle, we have to draw our own focus rect, since I didn't find // With QMacStyle, we have to draw our own focus rect, since I didn't find
// a way to draw the nice mac focus rect _inside_ this widget // a way to draw the nice mac focus rect _insGCS_ this widget
if (qobject_cast<QMacStyle *>(style())) { if (qobject_cast<QMacStyle *>(style())) {
painter.setPen(Qt::DotLine); painter.setPen(Qt::DotLine);
painter.setBrush(Qt::NoBrush); painter.setBrush(Qt::NoBrush);

2
ground/src/plugins/coreplugin/mainwindow.cpp
View File

@ -159,7 +159,7 @@ MainWindow::MainWindow() :
qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png")); qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
#endif #endif
QCoreApplication::setApplicationName(QLatin1String("OpenPilotGCS")); QCoreApplication::setApplicationName(QLatin1String("OpenPilotGCS"));
QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG)); QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::GCS_VERSION_LONG));
QCoreApplication::setOrganizationName(QLatin1String("OpenPilot")); QCoreApplication::setOrganizationName(QLatin1String("OpenPilot"));
QSettings::setDefaultFormat(QSettings::IniFormat); QSettings::setDefaultFormat(QSettings::IniFormat);
QString baseName = qApp->style()->objectName(); QString baseName = qApp->style()->objectName();

10
ground/src/plugins/coreplugin/versiondialog.cpp
View File

@ -60,13 +60,13 @@ VersionDialog::VersionDialog(QWidget *parent)
QGridLayout *layout = new QGridLayout(this); QGridLayout *layout = new QGridLayout(this);
layout->setSizeConstraint(QLayout::SetFixedSize); layout->setSizeConstraint(QLayout::SetFixedSize);
QString version = QLatin1String(IDE_VERSION_LONG); QString version = QLatin1String(GCS_VERSION_LONG);
version += QDate(2007, 25, 10).toString(Qt::SystemLocaleDate); version += QDate(2007, 25, 10).toString(Qt::SystemLocaleDate);
QString ideRev; QString ideRev;
#ifdef IDE_REVISION #ifdef GCS_REVISION
//: This gets conditionally inserted as argument %8 into the description string. //: This gets conditionally inserted as argument %8 into the description string.
ideRev = tr("From revision %1<br/>").arg(QString::fromLatin1(IDE_REVISION_STR).left(10)); ideRev = tr("From revision %1<br/>").arg(QString::fromLatin1(GCS_REVISION_STR).left(10));
#endif #endif
const QString description = tr( const QString description = tr(
@ -83,8 +83,8 @@ VersionDialog::VersionDialog(QWidget *parent)
"INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A " "INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A "
"PARTICULAR PURPOSE.<br/>") "PARTICULAR PURPOSE.<br/>")
.arg(version, QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize), .arg(version, QLatin1String(QT_VERSION_STR), QString::number(QSysInfo::WordSize),
QLatin1String(__DATE__), QLatin1String(__TIME__), QLatin1String(IDE_YEAR), QLatin1String(__DATE__), QLatin1String(__TIME__), QLatin1String(GCS_YEAR),
(QLatin1String(IDE_AUTHOR)), ideRev); (QLatin1String(GCS_AUTHOR)), ideRev);
QLabel *copyRightLabel = new QLabel(description); QLabel *copyRightLabel = new QLabel(description);
copyRightLabel->setWordWrap(true); copyRightLabel->setWordWrap(true);

4
ground/src/plugins/welcome/Welcome.pluginspec
View File

@ -1,4 +1,4 @@
<plugin name="Welcome" version="1.1" compatVersion="1.1"> <plugin name="Welcome" version="1.3.1" compatVersion="1.3.1">
<vendor>The OpenPilot Project</vendor> <vendor>The OpenPilot Project</vendor>
<copyright>(C) 2010 OpenPilot Project</copyright> <copyright>(C) 2010 OpenPilot Project</copyright>
<license> <license>
@ -12,6 +12,6 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
<description>Default Welcome Screen Plugin</description> <description>Default Welcome Screen Plugin</description>
<url>http://www.openpilot.org</url> <url>http://www.openpilot.org</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="1.1"/> <dependency name="Core" version="1.3.1"/>
</dependencyList> </dependencyList>
</plugin> </plugin>

2
ground/src/plugins/welcome/rssfetcher.cpp
View File

@ -125,7 +125,7 @@ void RSSFetcher::fetch(const QUrl &url)
m_http.setProxy(proxies.first()); m_http.setProxy(proxies.first());
m_http.setHost(url.host()); m_http.setHost(url.host());
QString agentStr = QString("Qt-Creator/%1 (QHttp %2; %3; %4; %5 bit)") QString agentStr = QString("Qt-Creator/%1 (QHttp %2; %3; %4; %5 bit)")
.arg(Core::Constants::IDE_VERSION_LONG).arg(qVersion()) .arg(Core::Constants::GCS_VERSION_LONG).arg(qVersion())
.arg(getOsString()).arg(QLocale::system().name()) .arg(getOsString()).arg(QLocale::system().name())
.arg(QSysInfo::WordSize); .arg(QSysInfo::WordSize);
QHttpRequestHeader header("GET", url.path()); QHttpRequestHeader header("GET", url.path());

4
ground/src/rpath.pri
View File

@ -4,8 +4,8 @@ macx {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
QMAKE_RPATHDIR += \$\$ORIGIN/../$$GCS_LIBRARY_BASENAME/openpilotgcs QMAKE_RPATHDIR += \$\$ORIGIN/../$$GCS_LIBRARY_BASENAME/openpilotgcs
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") GCS_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${GCS_PLUGIN_RPATH}\'
QMAKE_RPATHDIR = QMAKE_RPATHDIR =
} }