feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes for bindist target.

Browse Source 
Change-Id: Iab025ed796e807aab0315a583a04ed8865fc0d44
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
Daniel Molkentin
2012-01-30 14:12:07 +01:00
parent b7c322c84b
commit 3fe2113a2b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qtcreator.pro
View File

@@ -20,14 +20,13 @@ OTHER_FILES += dist/copyright_template.txt \
macx { macx {
APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app" APPBUNDLE = "$$OUT_PWD/bin/Qt Creator.app"
deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" 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.commands = $$PWD/scripts/makedmg.sh $$OUT_PWD/bin qt-creator-mac$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX).dmg
dmg.depends = deployqt dmg.depends = deployqt
QMAKE_EXTRA_TARGETS += dmg QMAKE_EXTRA_TARGETS += dmg
} else { } else {
deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT) deployqt.commands = $$PWD/scripts/deployqt.py -i $(INSTALL_ROOT)
deployqt.depends = install deployqt.depends = install
bindist.commands = $$PWD/scripts/bindist_helper.py $(INSTALL_ROOT) $${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)
win32 { win32 {
bindist.commands ~= s,/,\\\\,g bindist.commands ~= s,/,\\\\,g
deployqt.commands ~= s,/,\\\\,g deployqt.commands ~= s,/,\\\\,g
@@ -38,6 +37,7 @@ macx {
} }
else:linux-*:PLATFORM="linux-$${QT_ARCH}" else:linux-*:PLATFORM="linux-$${QT_ARCH}"
else:PLATFORM="unknown" else:PLATFORM="unknown"
bindist.commands = $$PWD/scripts/bindistHelper.py "$(INSTALL_ROOT)" "$${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX)"
} }
bindist.depends = deployqt bindist.depends = deployqt
QMAKE_EXTRA_TARGETS += deployqt bindist QMAKE_EXTRA_TARGETS += deployqt bindist

1
scripts/bindistHelper.py
View File

@@ -42,7 +42,6 @@ def main():
try: try:
opts, args = getopt.gnu_getopt(sys.argv[1:], 'h', ['help']) opts, args = getopt.gnu_getopt(sys.argv[1:], 'h', ['help'])
except: except:
print str(err)
usage() usage()
sys.exit(2) sys.exit(2)
for o, a in opts: for o, a in opts: