diff options
author | kh1 <karsten.heimrich@digia.com> | 2013-03-25 12:29:27 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2013-03-25 22:00:36 +0100 |
commit | b8dc0c73135aaf355daf98fabfa18be0caae7140 (patch) | |
tree | a3ba233a3555956af3734999144cb69bf00a81fc | |
parent | 3224fa9834e48a4cf0f40455aa0f92c5a5b01955 (diff) |
Fully qualify function calls. Fix minor typos.
Change-Id: I36cc096f3195e69bf027aa629d31ffac1d519732
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r-- | tools/binarycreator/binarycreator.cpp | 12 | ||||
-rw-r--r-- | tools/repogen/repogen.cpp | 30 |
2 files changed, 23 insertions, 19 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 67ed1d5c5..80c083208 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -693,13 +693,14 @@ int main(int argc, char **argv) qDebug() << "Parsed arguments, ok."; int exitCode = EXIT_FAILURE; - const QString tmpMetaDir = createTemporaryDirectory(); + const QString tmpMetaDir = QInstaller::createTemporaryDirectory(); try { const Settings settings = Settings::fromFileAndPrefix(configFile, QFileInfo(configFile).absolutePath()); - QInstallerTools::PackageInfoVector packages = createListOfPackages(packagesDirectory, + QInstallerTools::PackageInfoVector packages = QInstallerTools::createListOfPackages(packagesDirectory, filteredPackages, ftype); - copyMetaData(tmpMetaDir, packagesDirectory, packages, settings.applicationName(), + QInstallerTools::copyMetaData(tmpMetaDir, packagesDirectory, packages, settings.applicationName(), settings.applicationVersion()); + copyConfigData(configFile, tmpMetaDir + QLatin1String("/installer-config")); { QSettings confInternal(tmpMetaDir + QLatin1String("/config/config-internal.ini") @@ -748,10 +749,11 @@ int main(int argc, char **argv) QFile::remove(resource); } } catch (const Error &e) { - std::cerr << "caught exception: " << e.message() << std::endl; + std::cerr << "Caught exception: " << e.message() << std::endl; } catch (...) { std::cerr << "Unknown exception caught" << std::endl; } - removeDirectory(tmpMetaDir, true); + + QInstaller::removeDirectory(tmpMetaDir, true); return exitCode; } diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp index 559b9911f..84a7d918e 100644 --- a/tools/repogen/repogen.cpp +++ b/tools/repogen/repogen.cpp @@ -92,6 +92,8 @@ static int printErrorAndUsageAndExit(const QString &err) int main(int argc, char** argv) { + QString tmpMetaDir; + int exitCode = EXIT_FAILURE; try { QCoreApplication app(argc, argv); @@ -191,7 +193,7 @@ int main(int argc, char** argv) QInstallerTools::PackageInfoVector packages = QInstallerTools::createListOfPackages(packagesDir, filteredPackages, filterType); - QHash<QString, QString> pathToVersionMapping = buildPathToVersionMapping(packages); + QHash<QString, QString> pathToVersionMapping = QInstallerTools::buildPathToVersionMapping(packages); foreach (const QInstallerTools::PackageInfo &package, packages) { const QFileInfo fi(repositoryDir, package.name); @@ -199,27 +201,27 @@ int main(int argc, char** argv) removeDirectory(fi.absoluteFilePath()); } - copyComponentData(packagesDir, repositoryDir, &packages); - - TempDirDeleter tmpDeleter; - const QString metaTmp = createTemporaryDirectory(); - tmpDeleter.add(metaTmp); - - copyMetaData(metaTmp, repositoryDir, packages, QLatin1String("{AnyApplication}"), + tmpMetaDir = QInstaller::createTemporaryDirectory(); + QInstallerTools::copyComponentData(packagesDir, repositoryDir, &packages); + QInstallerTools::copyMetaData(tmpMetaDir, repositoryDir, packages, QLatin1String("{AnyApplication}"), QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)), redirectUpdateUrl); - QInstallerTools::compressMetaDirectories(metaTmp, metaTmp, pathToVersionMapping); + QInstallerTools::compressMetaDirectories(tmpMetaDir, tmpMetaDir, pathToVersionMapping); QDirIterator it(repositoryDir, QStringList(QLatin1String("Updates*.xml")), QDir::Files | QDir::CaseSensitive); while (it.hasNext()) { it.next(); QFile::remove(it.fileInfo().absoluteFilePath()); } - moveDirectoryContents(metaTmp, repositoryDir); - return 0; + QInstaller::moveDirectoryContents(tmpMetaDir, repositoryDir); + exitCode = EXIT_SUCCESS; } catch (const Lib7z::SevenZipException &e) { - std::cerr << "caught 7zip exception: " << e.message() << std::endl; + std::cerr << "Caught 7zip exception: " << e.message() << std::endl; } catch (const QInstaller::Error &e) { - std::cerr << "caught exception: " << e.message() << std::endl; + std::cerr << "Caught exception: " << e.message() << std::endl; + } catch (...) { + std::cerr << "Unknown exception caught" << std::endl; } - return 1; + + QInstaller::removeDirectory(tmpMetaDir, true); + return exitCode; } |