rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00
Code Issues Releases Activity

Branding

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@165 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
dankers 2010-02-03 23:26:47 +00:00 committed by dankers
parent eb87a2ba5a
commit fdc3fbd8dd
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ground/openpilotgcs.pri
View File

@ -34,25 +34,25 @@ isEmpty(TEST):CONFIG(debug, debug|release) {
} }
} }
isEmpty(IDE_LIBRARY_BASENAME) { isEmpty(GCS_LIBRARY_BASENAME) {
IDE_LIBRARY_BASENAME = lib GCS_LIBRARY_BASENAME = lib
} }
DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" DEFINES += GCS_LIBRARY_BASENAME=\\\"$$GCS_LIBRARY_BASENAME\\\"
equals(TEST, 1) { equals(TEST, 1) {
QT +=testlib QT +=testlib
DEFINES += WITH_TESTS DEFINES += WITH_TESTS
} }
IDE_SOURCE_TREE = $$PWD GCS_SOURCE_TREE = $$PWD
isEmpty(IDE_BUILD_TREE) { isEmpty(GCS_BUILD_TREE) {
sub_dir = $$_PRO_FILE_PWD_ sub_dir = $$_PRO_FILE_PWD_
sub_dir ~= s,^$$re_escape($$PWD),, sub_dir ~= s,^$$re_escape($$PWD),,
IDE_BUILD_TREE = $$cleanPath($$OUT_PWD) GCS_BUILD_TREE = $$cleanPath($$OUT_PWD)
IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,, GCS_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
} }
IDE_APP_PATH = $$IDE_BUILD_TREE/bin IDE_APP_PATH = $$GCS_BUILD_TREE/bin
macx { macx {
IDE_APP_TARGET = "OpenPilot GCS" IDE_APP_TARGET = "OpenPilot GCS"
IDE_LIBRARY_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/PlugIns IDE_LIBRARY_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/PlugIns
@ -70,19 +70,19 @@ macx {
IDE_APP_WRAPPER = openpilotgcs IDE_APP_WRAPPER = openpilotgcs
IDE_APP_TARGET = openpilotgcs.bin IDE_APP_TARGET = openpilotgcs.bin
} }
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/openpilotgcs IDE_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/openpilotgcs IDE_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs
IDE_DOC_PATH = $$IDE_BUILD_TREE/share/doc/openpilotgcs IDE_DOC_PATH = $$GCS_BUILD_TREE/share/doc/openpilotgcs
!isEqual(IDE_SOURCE_TREE, $$IDE_BUILD_TREE):copydata = 1 !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1
} }
INCLUDEPATH += \ INCLUDEPATH += \
$$IDE_SOURCE_TREE/src/libs $$GCS_SOURCE_TREE/src/libs
DEPENDPATH += \ DEPENDPATH += \
$$IDE_SOURCE_TREE/src/libs $$GCS_SOURCE_TREE/src/libs
LIBS += -L$$IDE_LIBRARY_PATH LIBS += -L$$IDE_LIBRARY_PATH

4
ground/share/openpilotgcs/translations/translations.pro
View File

@ -19,12 +19,12 @@ MIME_TR_H = $$IDE_DATA_PATH/translations/mime_tr.h
contains(QT_VERSION, ^4\.[0-5]\..*) { contains(QT_VERSION, ^4\.[0-5]\..*) {
ts.commands = @echo This Qt version is too old for the ts target. Need Qt 4.6+. ts.commands = @echo This Qt version is too old for the ts target. Need Qt 4.6+.
} else { } else {
for(dir, $$list($$files($$IDE_SOURCE_TREE/src/plugins/*))):MIMETYPES_FILES += $$files($$dir/*.mimetypes.xml) for(dir, $$list($$files($$GCS_SOURCE_TREE/src/plugins/*))):MIMETYPES_FILES += $$files($$dir/*.mimetypes.xml)
MIMETYPES_FILES = \"$$join(MIMETYPES_FILES, \", \")\" MIMETYPES_FILES = \"$$join(MIMETYPES_FILES, \", \")\"
QMAKE_SUBSTITUTES += extract-mimetypes.xq.in QMAKE_SUBSTITUTES += extract-mimetypes.xq.in
ts.commands += \ ts.commands += \
$$XMLPATTERNS -output $$MIME_TR_H $$PWD/extract-mimetypes.xq && \ $$XMLPATTERNS -output $$MIME_TR_H $$PWD/extract-mimetypes.xq && \
(cd $$IDE_SOURCE_TREE && $$LUPDATE src $$MIME_TR_H -ts $$TRANSLATIONS) && \ (cd $$GCS_SOURCE_TREE && $$LUPDATE src $$MIME_TR_H -ts $$TRANSLATIONS) && \
$$QMAKE_DEL_FILE $$MIME_TR_H $$QMAKE_DEL_FILE $$MIME_TR_H
} }
QMAKE_EXTRA_TARGETS += ts QMAKE_EXTRA_TARGETS += ts

2
ground/src/app/main.cpp
View File

@ -178,7 +178,7 @@ static inline QStringList getPluginPaths()
// 1) "plugins" (Win/Linux) // 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath; QString pluginPath = rootDirPath;
pluginPath += QLatin1Char('/'); pluginPath += QLatin1Char('/');
pluginPath += QLatin1String(IDE_LIBRARY_BASENAME); pluginPath += QLatin1String(GCS_LIBRARY_BASENAME);
pluginPath += QLatin1Char('/'); pluginPath += QLatin1Char('/');
pluginPath += QLatin1String("openpilotgcs"); pluginPath += QLatin1String("openpilotgcs");
pluginPath += QLatin1Char('/'); pluginPath += QLatin1Char('/');

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=\\\"$$IDE_SOURCE_TREE\\\" DEFINES += IDE_TEST_DIR=\\\"$$GCS_SOURCE_TREE\\\"
HEADERS += pluginerrorview.h \ HEADERS += pluginerrorview.h \
plugindetailsview.h \ plugindetailsview.h \

2
ground/src/openpilotgcslibrary.pri
View File

@ -17,7 +17,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
target.path = /bin target.path = /bin
target.files = $$DESTDIR/$${TARGET}.dll target.files = $$DESTDIR/$${TARGET}.dll
} else { } else {
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator target.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs
} }
INSTALLS += target INSTALLS += target
} }

8
ground/src/openpilotgcsplugin.pri
View File

@ -6,8 +6,8 @@ isEmpty(PROVIDER) {
DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER
LIBS += -L$$DESTDIR LIBS += -L$$DESTDIR
INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins INCLUDEPATH += $$GCS_SOURCE_TREE/src/plugins
DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins DEPENDPATH += $$GCS_SOURCE_TREE/src/plugins
# copy the plugin spec # copy the plugin spec
isEmpty(TARGET) { isEmpty(TARGET) {
@ -43,8 +43,8 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
CONFIG += plugin plugin_with_soname CONFIG += plugin plugin_with_soname
!macx { !macx {
target.path = /$$IDE_LIBRARY_BASENAME/opnepilotgcs/plugins/$$PROVIDER target.path = /$$GCS_LIBRARY_BASENAME/opnepilotgcs/plugins/$$PROVIDER
pluginspec.files += $${TARGET}.pluginspec pluginspec.files += $${TARGET}.pluginspec
pluginspec.path = /$$IDE_LIBRARY_BASENAME/openpilotgcs/plugins/$$PROVIDER pluginspec.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs/plugins/$$PROVIDER
INSTALLS += target pluginspec INSTALLS += target pluginspec
} }

2
ground/src/rpath.pri
View File

@ -3,7 +3,7 @@ macx {
} else:linux-* { } else:linux-* {
#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/../$$IDE_LIBRARY_BASENAME/openpilotgcs QMAKE_RPATHDIR += \$\$ORIGIN/../$$GCS_LIBRARY_BASENAME/openpilotgcs
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'