diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-09-03 18:24:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-25 10:14:51 +0200 |
| commit | 745cb4b7ecac7efaab2096de700664b67752ff63 (patch) | |
| tree | 2378134d18512375279c36e6b6af3e6be9beddf1 /qtcreator.pro | |
| parent | 4e4580d4c267dbb995ede106caa3347d556ad88c (diff) | |
| download | qt-creator-745cb4b7ecac7efaab2096de700664b67752ff63.tar.gz | |
Introduce $$QTC_PREFIX
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...
This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.
Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install
Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index c9b2be0268..e7363548ce 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -26,19 +26,23 @@ 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 = 7z a -mx9 qt-creator-$${PATTERN}.7z \"$(INSTALL_ROOT)$$QTC_PREFIX\" + win32 { + bindist.commands ~= s,/,\\\\,g + } + } -bindist.depends = deployqt QMAKE_EXTRA_TARGETS += deployqt bindist |