diff options
author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-22 12:35:53 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-22 12:36:27 +0100 |
commit | 537ed91a806895eb6f38bc67d81e7bcd9335d7eb (patch) | |
tree | 980229ee173a9210ea64da7fc680ff38ce43d883 /tools | |
parent | 478243c584c520d603af70eb797080cea1cf6afe (diff) | |
parent | dd990b5251f284be051bd453de19baeef4dbaba6 (diff) |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I89a0518b54836afd97016061bcf000ccf7cdf62f
Diffstat (limited to 'tools')
-rw-r--r-- | tools/build_installer.py | 8 | ||||
-rw-r--r-- | tools/extractbinarydata/extractbinarydata.pro | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/build_installer.py b/tools/build_installer.py index 1152d92e4..44fa0c106 100644 --- a/tools/build_installer.py +++ b/tools/build_installer.py @@ -23,6 +23,7 @@ def parse_arguments(): parser.add_argument('--static-qmake', dest='qmake', required=True, help='path to qmake that will be used to build the tools') parser.add_argument('--doc-qmake', dest='doc_qmake', required=True, help='path to qmake that will be used to generate the documentation') parser.add_argument('--make', dest='make', required=True, help='make command') + parser.add_argument('--targetdir', dest='target_dir', required=True, help='directory the generated installer will be placed in') args = parser.parse_args() @@ -41,7 +42,7 @@ def init(): basename = os.path.basename(src_dir) build_dir = os.path.join(root_dir, basename + '_build') package_dir = os.path.join(root_dir, basename + '_pkg') - target_path = os.path.join(root_dir, 'ifw') + target_path = os.path.join(args.target_dir, 'ifw') print 'source dir: ' + src_dir print 'build dir: ' + build_dir @@ -54,6 +55,11 @@ def init(): if not os.path.exists(build_dir): os.makedirs(build_dir) + if os.path.exists(args.target_dir): + print 'delete existing target dir ...' + shutil.rmtree(args.target_dir) + os.makedirs(args.target_dir) + if os.path.exists(package_dir): print 'delete existing package dir ...' shutil.rmtree(package_dir) diff --git a/tools/extractbinarydata/extractbinarydata.pro b/tools/extractbinarydata/extractbinarydata.pro index 712d27477..c22ff41c4 100644 --- a/tools/extractbinarydata/extractbinarydata.pro +++ b/tools/extractbinarydata/extractbinarydata.pro @@ -5,7 +5,7 @@ TARGET = extractbinarydata include(../../installerfw.pri) QT -= gui -LIBS += -linstaller +LIBS += -linstaller -l7z CONFIG += console CONFIG -= app_bundle |