diff options
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 |