From c0dde7f5172db0c5da5c6a1ebde07656f6780876 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 21 Mar 2013 20:45:55 +0100 Subject: remove the unneeded second Settings object Change-Id: I60bc1dc23b33f11ab43613f5d02071523ce42b46 Reviewed-by: Karsten Heimrich --- src/libs/installer/packagemanagercoredata.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index f01ea4475..660a72922 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -72,9 +72,8 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash &va #endif try { - m_settings = - Settings(Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), - QLatin1String(":/metadata/installer-config/"))); + m_settings = Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), + QLatin1String(":/metadata/installer-config/")); } catch (const Error &e) { // TODO: try better error handling qCritical("Could not parse Config: %s", qPrintable(e.message())); -- cgit v1.2.3 From 889930c9b5f36c11fff71b55b318bcb9db17e86e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 Mar 2013 11:45:15 +0100 Subject: Allow setting of target dir in installer script Simplifies uploading of results on build machine. Change-Id: Ifcfb9f11f0b98754cca0368490b2a0267110111b Reviewed-by: Tim Jenssen --- tools/build_installer.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3 From dd990b5251f284be051bd453de19baeef4dbaba6 Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Fri, 22 Mar 2013 11:59:52 +0100 Subject: Compile fix when building tools static Change-Id: Ie27962ae3fdf1b3ed06ba06ad81c1b169779ba65 Reviewed-by: Tim Jenssen --- tools/extractbinarydata/extractbinarydata.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3