From c29bf6f6525d435d69936576761b4a29102cd056 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Mon, 3 Sep 2012 18:24:02 +0200
Subject: [PATCH] Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.
QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.
Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
bin/bin.pro | 2 +-
doc/doc.pri | 4 ++--
lib/qtcreator/qtcomponents/qtcomponents.pro | 2 +-
qtcreator.pri | 5 ++++
qtcreator.pro | 23 ++++++++++++++-----
.../qml/qmlpuppet/qml2puppet/qml2puppet.pro | 2 +-
.../qml/qmlpuppet/qmlpuppet/qmlpuppet.pri | 2 +-
share/qtcreator/static.pro | 4 ++--
share/qtcreator/translations/translations.pro | 2 +-
src/app/app.pro | 4 ++--
src/libs/qtcomponents/styleitem/styleitem.pro | 2 +-
src/libs/qtcreatorcdbext/qtcreatorcdbext.pro | 2 +-
src/libs/utils/process_ctrlc_stub.pro | 2 +-
src/libs/utils/process_stub.pro | 2 +-
src/plugins/coreplugin/coreplugin.pro | 2 +-
src/plugins/qmldesigner/plugindestdir.pri | 2 +-
src/qtcreatorlibrary.pri | 4 ++--
src/qtcreatorplugin.pri | 4 ++--
src/tools/qtcdebugger/qtcdebugger.pro | 2 +-
src/tools/qtpromaker/qtpromaker.pro | 2 +-
src/tools/win64interrupt/win64interrupt.pro | 2 +-
21 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/bin/bin.pro b/bin/bin.pro
index 523cc50bd17..d546b053cb7 100644
--- a/bin/bin.pro
+++ b/bin/bin.pro
@@ -9,7 +9,7 @@ QMAKE_STRIP =
QMAKE_CLEAN = qtcreator.sh
-target.path = /bin
+target.path = $$QTC_PREFIX/bin
INSTALLS += target
OTHER_FILES = $$PWD/qtcreator.sh
diff --git a/doc/doc.pri b/doc/doc.pri
index 285951f22c9..c163bce40c8 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -78,12 +78,12 @@ dev_qch_docs.depends += dev_html_docs
!macx {
inst_qch_docs.files = $$QCH_FILE
- inst_qch_docs.path = /share/doc/qtcreator
+ inst_qch_docs.path = $$QTC_PREFIX/share/doc/qtcreator
inst_qch_docs.CONFIG += no_check_exist no_default_install
INSTALLS += inst_qch_docs
inst_dev_qch_docs.files = $$DEV_QCH_FILE
- inst_dev_qch_docs.path = /share/doc/qtcreator
+ inst_dev_qch_docs.path = $$QTC_PREFIX/share/doc/qtcreator
inst_dev_qch_docs.CONFIG += no_check_exist no_default_install
INSTALLS += inst_dev_qch_docs
diff --git a/lib/qtcreator/qtcomponents/qtcomponents.pro b/lib/qtcreator/qtcomponents/qtcomponents.pro
index 5cf2d9adb9c..33268cf3cbd 100644
--- a/lib/qtcreator/qtcomponents/qtcomponents.pro
+++ b/lib/qtcreator/qtcomponents/qtcomponents.pro
@@ -52,6 +52,6 @@ DATA_FILE_PATTERNS = \
!macx {
qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom
- qmlfiles.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents
+ qmlfiles.path = $$QTC_PREFIX/$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents
INSTALLS += qmlfiles
}
diff --git a/qtcreator.pri b/qtcreator.pri
index 9c8dbd59214..1fdd9e4e164 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -3,6 +3,11 @@ QTCREATOR_PRI_INCLUDED = 1
QTCREATOR_VERSION = 2.5.81
+isEmpty(QTC_PREFIX) {
+ unix: QTC_PREFIX = /usr/local
+ else: QTC_PREFIX = QtCreator
+}
+
defineReplace(cleanPath) {
win32:1 ~= s|\\\\|/|g
contains(1, ^/.*):pfx = /
diff --git a/qtcreator.pro b/qtcreator.pro
index c9b2be0268c..c9801853864 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -26,19 +26,30 @@ macx {
dmg.depends = deployqt
QMAKE_EXTRA_TARGETS += codesign dmg
} else {
- deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT)
+ deployqt.commands = $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\"
deployqt.depends = install
win32 {
bindist.commands ~= s,/,\\\\,g
deployqt.commands ~= s,/,\\\\,g
deployartifacts.depends = install
PLATFORM="windows"
- deployartifacts.commands = git clone "git://gitorious.org/qt-creator/binary-artifacts.git"&& xcopy /s /q /y /i "binary-artifacts\\win32" $(INSTALL_ROOT)&& rmdir /s /q binary-artifacts
+ deployartifacts.commands = git clone "git://gitorious.org/qt-creator/binary-artifacts.git"&& xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\"&& rmdir /s /q binary-artifacts
QMAKE_EXTRA_TARGETS += deployartifacts
}
- else:linux-*:PLATFORM="linux-$${QT_ARCH}"
- else:PLATFORM="unknown"
- bindist.commands = $$PWD/scripts/bindistHelper.py "$(INSTALL_ROOT)" "$${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)"
+ else:linux-*:PLATFORM = "linux-$${QT_ARCH}"
+ else:PLATFORM = "unknown"
+ PATTERN = $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
+ bindist.commands = $$PWD/scripts/bindistHelper.py -i -p $${PATTERN} \"$(INSTALL_ROOT)$$QTC_PREFIX\"
+ bindist_inst.commands = $$PWD/scripts/bindistHelper.py -p $${PATTERN} \"$(INSTALL_ROOT)$$QTC_PREFIX\"
+ win32 {
+ bindist.commands ~= s,/,\\\\,g
+ bindist_inst.commands ~= s,/,\\\\,g
+ }
+
}
bindist.depends = deployqt
-QMAKE_EXTRA_TARGETS += deployqt bindist
+bindist_inst.depends = deployqt
+installer.depends = bindist_inst
+installer.commands = $$PWD/scripts/packageIfw.py --ifw $(IFW_DIR) -s $${QTCREATOR_VERSION} "qt-creator-$${PATTERN}-installer"
+win32:installer.commands ~= s,/,\\\\,g
+QMAKE_EXTRA_TARGETS += deployqt bindist bindist_inst installer
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
index 77351d8a9e6..6b2b7097ae8 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
@@ -36,6 +36,6 @@ macx {
info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
QMAKE_SUBSTITUTES += info
} else {
- target.path = /bin
+ target.path = $$QTC_PREFIX/bin
INSTALLS += target
}
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
index 66aa92e47be..e2d6645077a 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/qmlpuppet.pri
@@ -21,6 +21,6 @@ macx {
info.output = $$DESTDIR/$${TARGET}.app/Contents/Info.plist
QMAKE_SUBSTITUTES += info
} else {
- target.path = /bin
+ target.path = $$QTC_PREFIX/bin
INSTALLS += target
}
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index 7d8363dd5c9..b707606bb12 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -63,7 +63,7 @@ OTHER_FILES += $$FILES
!macx {
for(data_dir, DATA_DIRS) {
eval($${data_dir}.files = $$quote($$PWD/$$data_dir))
- eval($${data_dir}.path = /share/qtcreator)
+ eval($${data_dir}.path = $$QTC_PREFIX/share/qtcreator)
INSTALLS += $$data_dir
}
} else {
@@ -116,7 +116,7 @@ QMAKE_EXTRA_COMPILERS += unconditionalCopy2build
!macx {
for(data_dir, DATA_DIRS) {
eval($${data_dir}.files = $$IDE_DATA_PATH/$$data_dir)
- eval($${data_dir}.path = /share/qtcreator)
+ eval($${data_dir}.path = $$QTC_PREFIX/share/qtcreator)
eval($${data_dir}.CONFIG += no_check_exist)
INSTALLS += $$data_dir
}
diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro
index c791dadb9d1..dfaf7c471bc 100644
--- a/share/qtcreator/translations/translations.pro
+++ b/share/qtcreator/translations/translations.pro
@@ -120,6 +120,6 @@ isEmpty(vcproj) {
}
qmfiles.files = $$prependAll(LANGUAGES, $$OUT_PWD/qtcreator_,.qm)
-qmfiles.path = /share/qtcreator/translations
+qmfiles.path = $$QTC_PREFIX/share/qtcreator/translations
qmfiles.CONFIG += no_check_exist
INSTALLS += qmfiles
diff --git a/src/app/app.pro b/src/app/app.pro
index 896b2cc884e..a2a666dd1d5 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -17,7 +17,7 @@ QT_BREAKPAD_ROOT_PATH = $$(QT_BREAKPAD_ROOT_PATH)
}
win32 {
RC_FILE = qtcreator.rc
- target.path = /bin
+ target.path = $$QTC_PREFIX/bin
INSTALLS += target
} else:macx {
LIBS += -framework CoreFoundation
@@ -29,7 +29,7 @@ win32 {
info.output = $$IDE_BIN_PATH/../Info.plist
QMAKE_SUBSTITUTES = info
} else {
- target.path = /bin
+ target.path = $$QTC_PREFIX/bin
INSTALLS += target
}
diff --git a/src/libs/qtcomponents/styleitem/styleitem.pro b/src/libs/qtcomponents/styleitem/styleitem.pro
index 59f892d6490..d94e7dfa456 100644
--- a/src/libs/qtcomponents/styleitem/styleitem.pro
+++ b/src/libs/qtcomponents/styleitem/styleitem.pro
@@ -33,6 +33,6 @@ SOURCES += qtmenu.cpp \
qwheelarea.cpp
!macx {
- target.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents/plugin
+ target.path = $$QTC_PREFIX/$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents/plugin
INSTALLS += target
}
diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro b/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro
index fa02ca40954..20bdfb23fc2 100644
--- a/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro
+++ b/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro
@@ -82,6 +82,6 @@ HEADERS += extensioncontext.h \
knowntype.h \
symbolgroupnode.h
-target.path = /lib/$${DIRNAME}
+target.path = $$QTC_PREFIX/lib/$${DIRNAME}
INSTALLS += target
diff --git a/src/libs/utils/process_ctrlc_stub.pro b/src/libs/utils/process_ctrlc_stub.pro
index 4b99fe33ed1..4fef59a4018 100644
--- a/src/libs/utils/process_ctrlc_stub.pro
+++ b/src/libs/utils/process_ctrlc_stub.pro
@@ -17,5 +17,5 @@ build_all:!build_pass {
CONFIG += release
}
-target.path = /bin # FIXME: libexec, more or less
+target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target
diff --git a/src/libs/utils/process_stub.pro b/src/libs/utils/process_stub.pro
index 7e498a77818..a3eea0f1318 100644
--- a/src/libs/utils/process_stub.pro
+++ b/src/libs/utils/process_stub.pro
@@ -20,5 +20,5 @@ unix {
LIBS += -lshell32
}
-target.path = /bin # FIXME: libexec, more or less
+target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 14a7450b3c9..1d4dfe998ce 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -237,7 +237,7 @@ else:unix {
for(imagesize, IMAGE_SIZE_LIST) {
eval(image$${imagesize}.files = images/logo/$${imagesize}/qtcreator.png)
- eval(image$${imagesize}.path = /share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
+ eval(image$${imagesize}.path = $$QTC_PREFIX/share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
INSTALLS += image$${imagesize}
}
}
diff --git a/src/plugins/qmldesigner/plugindestdir.pri b/src/plugins/qmldesigner/plugindestdir.pri
index d4987e24093..2de740f852f 100644
--- a/src/plugins/qmldesigner/plugindestdir.pri
+++ b/src/plugins/qmldesigner/plugindestdir.pri
@@ -2,6 +2,6 @@ macx {
DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner
} else {
DESTDIR = $$IDE_LIBRARY_PATH/qmldesigner
- target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/qmldesigner
+ target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/qmldesigner
INSTALLS += target
}
diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri
index e46e3a2d28d..0dc1a179b23 100644
--- a/src/qtcreatorlibrary.pri
+++ b/src/qtcreatorlibrary.pri
@@ -19,9 +19,9 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
!macx {
win32 {
- target.path = /bin
+ target.path = $$QTC_PREFIX/bin
} else {
- target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
+ target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
}
INSTALLS += target
}
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index ea0360753be..292b10ad743 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -99,9 +99,9 @@ CONFIG += plugin plugin_with_soname
linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
!macx {
- target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
+ target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
pluginspec.files += $${TARGET}.pluginspec
- pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
+ pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
INSTALLS += target pluginspec
}
diff --git a/src/tools/qtcdebugger/qtcdebugger.pro b/src/tools/qtcdebugger/qtcdebugger.pro
index ece3eb772ff..9c3220aba0b 100644
--- a/src/tools/qtcdebugger/qtcdebugger.pro
+++ b/src/tools/qtcdebugger/qtcdebugger.pro
@@ -6,7 +6,7 @@ SOURCES += main.cpp
DESTDIR=../../../bin
-target.path=/bin
+target.path=$$QTC_PREFIX/bin
INSTALLS+=target
include(../../../qtcreator.pri)
diff --git a/src/tools/qtpromaker/qtpromaker.pro b/src/tools/qtpromaker/qtpromaker.pro
index 8dacfd5eede..b61d1cee33b 100644
--- a/src/tools/qtpromaker/qtpromaker.pro
+++ b/src/tools/qtpromaker/qtpromaker.pro
@@ -11,5 +11,5 @@ CONFIG -= app_bundle
SOURCES += main.cpp
-target.path = /bin # FIXME: libexec, more or less
+target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target
diff --git a/src/tools/win64interrupt/win64interrupt.pro b/src/tools/win64interrupt/win64interrupt.pro
index b8b26bcfd4f..282514c54cd 100644
--- a/src/tools/win64interrupt/win64interrupt.pro
+++ b/src/tools/win64interrupt/win64interrupt.pro
@@ -26,5 +26,5 @@ build_all:!build_pass {
CONFIG += release
}
-target.path = /bin # FIXME: libexec, more or less
+target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less
INSTALLS += target
--
GitLab