From e3885f280bc6b7d733cde47c490b275cac1ddcc4 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 6 May 2009 16:18:05 +0200
Subject: [PATCH] use IDE_APP_PATH more, introduce IDE_LIBEXEC_PATH
IDE_LIBEXEC_PATH is still the bindir, so it's kinda fake. oh, well.
---
qtcreator.pri | 8 +++++---
src/app/app.pro | 2 +-
src/libs/utils/process_stub.pro | 8 ++------
src/plugins/debugger/dumper.pro | 4 +++-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index abd82b2cb4e..5d4e4909710 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -38,11 +38,13 @@ sub_dir = $$_PRO_FILE_PWD_
sub_dir ~= s,^$$re_escape($$PWD),,
IDE_BUILD_TREE = $$cleanPath($$OUT_PWD)
IDE_BUILD_TREE ~= s,$$re_escape($$sub_dir)$,,
+IDE_APP_PATH = $$IDE_BUILD_TREE/bin
macx {
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_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
} else {
win32 {
@@ -53,9 +55,9 @@ macx {
}
IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins
+ IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME
IDE_DATA_PATH = $$IDE_BUILD_TREE/share/qtcreator
}
-IDE_APP_PATH = $$IDE_BUILD_TREE/bin
INCLUDEPATH += \
$$IDE_SOURCE_TREE/src/libs \
diff --git a/src/app/app.pro b/src/app/app.pro
index 9db8d5949de..3bb47607f0e 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -3,7 +3,7 @@ include(../shared/qtsingleapplication/qtsingleapplication.pri)
TEMPLATE = app
TARGET = $$IDE_APP_TARGET
-DESTDIR = ../../bin
+DESTDIR = $$IDE_APP_PATH
SOURCES += main.cpp
diff --git a/src/libs/utils/process_stub.pro b/src/libs/utils/process_stub.pro
index 33cb63aa162..f87c13631e8 100644
--- a/src/libs/utils/process_stub.pro
+++ b/src/libs/utils/process_stub.pro
@@ -2,11 +2,7 @@ include(../../../qtcreator.pri)
TEMPLATE = app
TARGET = qtcreator_process_stub
-macx {
- DESTDIR = $$IDE_BUILD_TREE/bin/$${IDE_APP_TARGET}.app/Contents/Resources
-} else {
- DESTDIR = ../../../bin
-}
+DESTDIR = $$IDE_LIBEXEC_PATH
CONFIG += warn_on console use_c_linker
CONFIG -= qt app_bundle
@@ -23,5 +19,5 @@ unix {
LIBS += -lshell32
}
-target.path = /bin
+target.path = /bin # FIXME: libexec, more or less
INSTALLS += target
diff --git a/src/plugins/debugger/dumper.pro b/src/plugins/debugger/dumper.pro
index 9c99034187d..896203a17c4 100644
--- a/src/plugins/debugger/dumper.pro
+++ b/src/plugins/debugger/dumper.pro
@@ -1,9 +1,11 @@
+# This is a compile check for the dumpers only. Don't install the library!
+
include(../../qworkbenchlibrary.pri)
TEMPLATE = lib
TARGET = DebuggingHelper
CONFIG += shared
-DESTDIR = ../../../bin
+DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
linux-* {
CONFIG -= release
--
GitLab