Commit c29bf6f6 authored by Daniel Molkentin's avatar Daniel Molkentin

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: default avatarOswald Buddenhagen <oswald.buddenhagen@nokia.com>
parent d1b65bbf
......@@ -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
......@@ -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
......
......@@ -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
}
......@@ -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 = /
......
......@@ -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
......@@ -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
}
......@@ -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
}
......@@ -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
}
......
......@@ -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
......@@ -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
}
......
......@@ -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
}
......@@ -82,6 +82,6 @@ HEADERS += extensioncontext.h \
knowntype.h \
symbolgroupnode.h
target.path = /lib/$${DIRNAME}
target.path = $$QTC_PREFIX/lib/$${DIRNAME}
INSTALLS += target
......@@ -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
......@@ -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
......@@ -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}
}
}
......
......@@ -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
}
......@@ -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
}
......@@ -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
}
......
......@@ -6,7 +6,7 @@ SOURCES += main.cpp
DESTDIR=../../../bin
target.path=/bin
target.path=$$QTC_PREFIX/bin
INSTALLS+=target
include(../../../qtcreator.pri)
......
......@@ -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
......@@ -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
Markdown is supported
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