summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-03-22 12:35:53 +0100
committerTim Jenssen <tim.jenssen@digia.com>2013-03-22 12:36:27 +0100
commit537ed91a806895eb6f38bc67d81e7bcd9335d7eb (patch)
tree980229ee173a9210ea64da7fc680ff38ce43d883
parent478243c584c520d603af70eb797080cea1cf6afe (diff)
parentdd990b5251f284be051bd453de19baeef4dbaba6 (diff)
Merge remote-tracking branch 'origin/1.3'
-rw-r--r--src/libs/installer/packagemanagercoredata.cpp5
-rw-r--r--tools/build_installer.py8
-rw-r--r--tools/extractbinarydata/extractbinarydata.pro2
3 files changed, 10 insertions, 5 deletions
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp
index 97b748970..501a458d9 100644
--- a/src/libs/installer/packagemanagercoredata.cpp
+++ b/src/libs/installer/packagemanagercoredata.cpp
@@ -72,9 +72,8 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash<QString, QString> &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()));
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