diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-09-07 09:50:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-09-07 10:02:40 +0200 |
| commit | b56b1c7d5917a5b4f72b2e0da01b2c2c71002616 (patch) | |
| tree | 9bca21c8afa302b7fd436ffc718f67c8bc31ea2f /qtcreator.pro | |
| parent | 7337152c1e0e626d8ea55beb1b17f1502a4c5683 (diff) | |
| download | qt-creator-b56b1c7d5917a5b4f72b2e0da01b2c2c71002616.tar.gz | |
Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.
This reverts commit c29bf6f6525d435d69936576761b4a29102cd056.
Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'qtcreator.pro')
| -rw-r--r-- | qtcreator.pro | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index c980185386..c9b2be0268 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -26,30 +26,19 @@ macx { dmg.depends = deployqt QMAKE_EXTRA_TARGETS += codesign dmg } else { - deployqt.commands = $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX\" + deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT) 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)$$QTC_PREFIX\"&& 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)&& rmdir /s /q binary-artifacts QMAKE_EXTRA_TARGETS += deployartifacts } - 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 - } - + else:linux-*:PLATFORM="linux-$${QT_ARCH}" + else:PLATFORM="unknown" + bindist.commands = $$PWD/scripts/bindistHelper.py "$(INSTALL_ROOT)" "$${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)" } bindist.depends = deployqt -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 +QMAKE_EXTRA_TARGETS += deployqt bindist |