diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-09-03 18:24:02 +0200 |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-09-05 16:37:42 +0200 |
| commit | c29bf6f6525d435d69936576761b4a29102cd056 (patch) | |
| tree | 3458e1bb423c568fcbd7799dcac1876a89047470 /qtcreator.pro | |
| parent | d1b65bbf837cfd4f8b655f55633afdcfe1ebe1e8 (diff) | |
| download | qt-creator-c29bf6f6525d435d69936576761b4a29102cd056.tar.gz | |
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>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index c9b2be0268..c980185386 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 |