From 3fe2113a2bdef34ab5fbfac1ee0d4772ab634555 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 30 Jan 2012 14:12:07 +0100 Subject: Fixes for bindist target. Change-Id: Iab025ed796e807aab0315a583a04ed8865fc0d44 Reviewed-by: Daniel Molkentin --- qtcreator.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qtcreator.pro') diff --git a/qtcreator.pro b/qtcreator.pro index f79577eb60..84e287a27d 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -20,14 +20,13 @@ OTHER_FILES += dist/copyright_template.txt \ macx { APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app" deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" - bindist.commands = 7z a -mx9 $$OUT_PWD/qtcreator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).7z \"$$OUT_PWD/bin/Qt Creator.app/\" + bindist.commands = 7z a -mx9 $$OUT_PWD/qt-creator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).7z \"$$OUT_PWD/bin/Qt Creator.app/\" dmg.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).dmg dmg.depends = deployqt QMAKE_EXTRA_TARGETS += dmg } else { deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT) deployqt.depends = install - 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 @@ -38,6 +37,7 @@ macx { } 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 QMAKE_EXTRA_TARGETS += deployqt bindist -- cgit v1.2.1