From c03b9b0c86cfac94a0ac6d4289092f1a2a100b0b Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Tue, 17 Jan 2012 19:35:41 +0100
Subject: [PATCH] Add deployartifacts command
Deploys prebuilt artifacts from remote repository.
Currently only used on Windows, includes
the 64 bit debugging helper and a stable version
of jom, taken from an external repository.
Change-Id: I9f034f184f94bf4e0b088338cde6d8e0d6c7d419
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
---
qtcreator.pro | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/qtcreator.pro b/qtcreator.pro
index eaba81fb621..f79577eb605 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -26,13 +26,18 @@ macx {
QMAKE_EXTRA_TARGETS += dmg
} else {
deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT)
- win32:deployqt.commands ~= s,/,\\\\,g
deployqt.depends = install
- bindist.commands = $$PWD/scripts/bindistHelper.py $(INSTALL_ROOT) $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
- win32:PLATFORM="windows"
+ bindist.commands = $$PWD/scripts/bindist_helper.py $(INSTALL_ROOT) $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
+ 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 binary-artifacts
+ QMAKE_EXTRA_TARGETS += deployartifacts
+ }
else:linux-*:PLATFORM="linux-$${QT_ARCH}"
else:PLATFORM="unknown"
- win32:bindist.commands ~= s,/,\\\\,g
}
bindist.depends = deployqt
QMAKE_EXTRA_TARGETS += deployqt bindist
--
GitLab