Commit e3885f28 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

use IDE_APP_PATH more, introduce IDE_LIBEXEC_PATH

IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
parent 97ffee6b
...@@ -38,11 +38,13 @@ sub_dir = $$_PRO_FILE_PWD_ ...@@ -38,11 +38,13 @@ sub_dir = $$_PRO_FILE_PWD_
sub_dir ~= s,^$$re_escape($$PWD),, sub_dir ~= s,^$$re_escape($$PWD),,
IDE_BUILD_TREE = $$cleanPath($$OUT_PWD) IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,, IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
macx { macx {
IDE_APP_TARGET = QtCreator IDE_APP_TARGET = QtCreator
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/PlugIns IDE_LIBRARY_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/PlugIns
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH
IDE_DATA_PATH = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/Resources IDE_LIBEXEC_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
IDE_DATA_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/Resources
contains(QT_CONFIG, ppc):CONFIG += ppc x86 contains(QT_CONFIG, ppc):CONFIG += ppc x86
} else { } else {
win32 { win32 {
...@@ -53,9 +55,9 @@ macx { ...@@ -53,9 +55,9 @@ macx {
} }
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
} }
IDE_APP_PATH = $$IDE_BUILD_TREE/bin
INCLUDEPATH += \ INCLUDEPATH += \
$$IDE_SOURCE_TREE/src/libs \ $$IDE_SOURCE_TREE/src/libs \
......
...@@ -3,7 +3,7 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri) ...@@ -3,7 +3,7 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
TEMPLATE = app TEMPLATE = app
TARGET = $$IDE_APP_TARGET TARGET = $$IDE_APP_TARGET
DESTDIR = ../../bin DESTDIR = $$IDE_APP_PATH
SOURCES += main.cpp SOURCES += main.cpp
......
...@@ -2,11 +2,7 @@ include(../../../qtcreator.pri) ...@@ -2,11 +2,7 @@ include(../../../qtcreator.pri)
TEMPLATE = app TEMPLATE = app
TARGET = qtcreator_process_stub TARGET = qtcreator_process_stub
macx { DESTDIR = $$IDE_LIBEXEC_PATH
DESTDIR = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/Resources
} else {
DESTDIR = ../../../bin
}
CONFIG += warn_on console use_c_linker CONFIG += warn_on console use_c_linker
CONFIG -= qt app_bundle CONFIG -= qt app_bundle
...@@ -23,5 +19,5 @@ unix { ...@@ -23,5 +19,5 @@ unix {
LIBS += -lshell32 LIBS += -lshell32
} }
target.path = /bin target.path = /bin # FIXME: libexec, more or less
INSTALLS += target INSTALLS += target
# This is a compile check for the dumpers only. Don't install the library!
include(../../qworkbenchlibrary.pri) include(../../qworkbenchlibrary.pri)
TEMPLATE = lib TEMPLATE = lib
TARGET = DebuggingHelper TARGET = DebuggingHelper
CONFIG += shared CONFIG += shared
DESTDIR = ../../../bin DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
linux-* { linux-* {
CONFIG -= release CONFIG -= release
......
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