diff options
| -rw-r--r-- | examples/testapp/mainwindow.h | 2 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/binarycreator.cpp | 9 | ||||
| -rw-r--r-- | installerbuilder/common/installersettings.cpp | 72 | ||||
| -rw-r--r-- | installerbuilder/common/installersettings.h | 20 | ||||
| -rw-r--r-- | installerbuilder/common/repositorygen.cpp | 9 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/packagemanagercore.cpp | 30 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/packagemanagercore.h | 8 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/packagemanagercore_p.cpp | 62 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/packagemanagercore_p.h | 2 | ||||
| -rw-r--r-- | installerbuilder/libinstaller/updatesettings.cpp | 2 | ||||
| -rw-r--r-- | installerbuilder/repogen/repogen.cpp | 8 |
11 files changed, 109 insertions, 115 deletions
diff --git a/examples/testapp/mainwindow.h b/examples/testapp/mainwindow.h index ae01486e1..e44fb32a1 100644 --- a/examples/testapp/mainwindow.h +++ b/examples/testapp/mainwindow.h @@ -49,7 +49,7 @@ private Q_SLOTS: private: UpdateSettingsDialog *m_dialog; + QInstaller::Settings m_settings; KDUpdater::Application updaterapp; QInstaller::PackageManagerCore m_core; - QInstaller::InstallerSettings m_settings; }; diff --git a/installerbuilder/binarycreator/binarycreator.cpp b/installerbuilder/binarycreator/binarycreator.cpp index 3f262bdfe..3fe56e01b 100644 --- a/installerbuilder/binarycreator/binarycreator.cpp +++ b/installerbuilder/binarycreator/binarycreator.cpp @@ -111,8 +111,7 @@ private: static int assemble(Input input, const QString &configdir) { const QString configfile = QFileInfo(configdir, QLatin1String("config.xml")).absoluteFilePath(); - const QInstaller::InstallerSettings settings = - QInstaller::InstallerSettings::fromFileAndPrefix(configfile, configdir); + const QInstaller::Settings &settings = QInstaller::Settings::fromFileAndPrefix(configfile, configdir); #ifdef Q_WS_MAC if (QFileInfo(input.installerExePath).isBundle()) { @@ -404,8 +403,7 @@ static QString createMetaDataDirectory(const PackageInfoVector &packages, const QString &packagesDir, const QString &configdir) { const QString configfile = QFileInfo(configdir, "config.xml").absoluteFilePath(); - const QInstaller::InstallerSettings settings = - QInstaller::InstallerSettings::fromFileAndPrefix(configfile, QString()); + const QInstaller::Settings &settings = QInstaller::Settings::fromFileAndPrefix(configfile, QString()); const QString metapath = createTemporaryDirectory(); generateMetaDataDirectory(metapath, packagesDir, packages, settings.applicationName(), @@ -624,8 +622,7 @@ int main(int argc, char **argv) const QString resourceFile = createBinaryResourceFile(metaDir); const QString configfile = QFileInfo(configDir, QLatin1String("config.xml")).absoluteFilePath(); - const QInstaller::InstallerSettings settings = - QInstaller::InstallerSettings::fromFileAndPrefix(configfile, configDir); + const QInstaller::Settings &settings = QInstaller::Settings::fromFileAndPrefix(configfile, configDir); const QByteArray privateKey = settings.privateKey(); Input input; diff --git a/installerbuilder/common/installersettings.cpp b/installerbuilder/common/installersettings.cpp index 53dab02ba..5205a6ab2 100644 --- a/installerbuilder/common/installersettings.cpp +++ b/installerbuilder/common/installersettings.cpp @@ -44,9 +44,9 @@ using namespace QInstaller; -// -- InstallerSettings::Private +// -- Settings::Private -class InstallerSettings::Private : public QSharedData +class Settings::Private : public QSharedData { public: QString prefix; @@ -122,23 +122,23 @@ static QString splitTrimmed(const QString &string) // -- InstallerSettings -InstallerSettings::InstallerSettings() +Settings::Settings() : d(new Private) { } -InstallerSettings::~InstallerSettings() +Settings::~Settings() { } -InstallerSettings::InstallerSettings(const InstallerSettings &other) +Settings::Settings(const Settings &other) : d(other.d) { } -InstallerSettings& InstallerSettings::operator=(const InstallerSettings &other) +Settings& Settings::operator=(const Settings &other) { - InstallerSettings copy(other); + Settings copy(other); std::swap(d, copy.d); return *this; } @@ -146,7 +146,7 @@ InstallerSettings& InstallerSettings::operator=(const InstallerSettings &other) /*! @throws QInstallerError */ -InstallerSettings InstallerSettings::fromFileAndPrefix(const QString &path, const QString &prefix) +Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix) { QDomDocument doc; QFile file(path); @@ -170,7 +170,7 @@ InstallerSettings InstallerSettings::fromFileAndPrefix(const QString &path, cons if (root.tagName() != QLatin1String("Installer")) throw Error(tr("%1 is not valid: Installer root node expected")); - InstallerSettings s; + Settings s; s.d->prefix = prefix; s.d->logo = readChild(root, QLatin1String("Logo")); s.d->logoSmall = readChild(root, QLatin1String("LogoSmall")); @@ -221,57 +221,57 @@ InstallerSettings InstallerSettings::fromFileAndPrefix(const QString &path, cons return s; } -QString InstallerSettings::maintenanceTitle() const +QString Settings::maintenanceTitle() const { return d->maintenanceTitle; } -QString InstallerSettings::logo() const +QString Settings::logo() const { return d->makeAbsolutePath(d->logo); } -QString InstallerSettings::logoSmall() const +QString Settings::logoSmall() const { return d->makeAbsolutePath(d->logoSmall); } -QString InstallerSettings::title() const +QString Settings::title() const { return d->title; } -QString InstallerSettings::applicationName() const +QString Settings::applicationName() const { return d->name; } -QString InstallerSettings::applicationVersion() const +QString Settings::applicationVersion() const { return d->version; } -QString InstallerSettings::publisher() const +QString Settings::publisher() const { return d->publisher; } -QString InstallerSettings::url() const +QString Settings::url() const { return d->url; } -QString InstallerSettings::watermark() const +QString Settings::watermark() const { return d->makeAbsolutePath(d->watermark); } -QString InstallerSettings::background() const +QString Settings::background() const { return d->makeAbsolutePath(d->background); } -QString InstallerSettings::icon() const +QString Settings::icon() const { #if defined(Q_WS_MAC) return d->makeAbsolutePath(d->icon) + QLatin1String(".icns"); @@ -281,74 +281,74 @@ QString InstallerSettings::icon() const return d->makeAbsolutePath(d->icon) + QLatin1String(".png"); } -QString InstallerSettings::removeTargetDir() const +QString Settings::removeTargetDir() const { return d->removeTargetDir; } -QString InstallerSettings::uninstallerName() const +QString Settings::uninstallerName() const { if (d->uninstallerName.isEmpty()) return QLatin1String("uninstall"); return d->uninstallerName; } -QString InstallerSettings::uninstallerIniFile() const +QString Settings::uninstallerIniFile() const { return d->uninstallerIniFile; } -QString InstallerSettings::runProgram() const +QString Settings::runProgram() const { return d->runProgram; } -QString InstallerSettings::runProgramDescription() const +QString Settings::runProgramDescription() const { return d->runProgramDescription; } -QString InstallerSettings::startMenuDir() const +QString Settings::startMenuDir() const { return d->startMenuDir; } -QString InstallerSettings::targetDir() const +QString Settings::targetDir() const { return d->targetDir; } -QString InstallerSettings::adminTargetDir() const +QString Settings::adminTargetDir() const { return d->adminTargetDir; } -QString InstallerSettings::configurationFileName() const +QString Settings::configurationFileName() const { return d->configurationFileName; } -QStringList InstallerSettings::certificateFiles() const +QStringList Settings::certificateFiles() const { return d->certificateFiles; } -QByteArray InstallerSettings::privateKey() const +QByteArray Settings::privateKey() const { return d->privateKey; } -QByteArray InstallerSettings::publicKey() const +QByteArray Settings::publicKey() const { return d->publicKey; } -QList<Repository> InstallerSettings::repositories() const +QList<Repository> Settings::repositories() const { return (d->m_repositories + d->m_userRepositories).toList(); } -void InstallerSettings::setTemporaryRepositories(const QList<Repository> &repos, bool replace) +void Settings::setTemporaryRepositories(const QList<Repository> &repos, bool replace) { if (replace) d->m_repositories = repos.toSet(); @@ -356,12 +356,12 @@ void InstallerSettings::setTemporaryRepositories(const QList<Repository> &repos, d->m_repositories.unite(repos.toSet()); } -QList<Repository> InstallerSettings::userRepositories() const +QList<Repository> Settings::userRepositories() const { return d->m_userRepositories.toList(); } -void InstallerSettings::addUserRepositories(const QList<Repository> &repositories) +void Settings::addUserRepositories(const QList<Repository> &repositories) { d->m_userRepositories.unite(repositories.toSet()); } diff --git a/installerbuilder/common/installersettings.h b/installerbuilder/common/installersettings.h index 7a1c72fdb..fb1b29971 100644 --- a/installerbuilder/common/installersettings.h +++ b/installerbuilder/common/installersettings.h @@ -23,8 +23,8 @@ ** (qt-info@nokia.com). ** **************************************************************************/ -#ifndef INSTALLERSETTINGS_H -#define INSTALLERSETTINGS_H +#ifndef SETTINGS_H +#define SETTINGS_H #include "installer_global.h" @@ -34,18 +34,18 @@ namespace QInstaller { class Repository; -class INSTALLER_EXPORT InstallerSettings +class INSTALLER_EXPORT Settings { - Q_DECLARE_TR_FUNCTIONS(InstallerSettings) + Q_DECLARE_TR_FUNCTIONS(Settings) public: - explicit InstallerSettings(); - ~InstallerSettings(); + explicit Settings(); + ~Settings(); - InstallerSettings(const InstallerSettings &other); - InstallerSettings &operator=(const InstallerSettings &other); + Settings(const Settings &other); + Settings &operator=(const Settings &other); - static InstallerSettings fromFileAndPrefix(const QString &path, const QString &prefix); + static Settings fromFileAndPrefix(const QString &path, const QString &prefix); bool isValid() const; @@ -92,4 +92,4 @@ private: } -#endif // INSTALLERSETTINGS_H +#endif // SETTINGS_H diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp index 15db90925..4dd0e15b6 100644 --- a/installerbuilder/common/repositorygen.cpp +++ b/installerbuilder/common/repositorygen.cpp @@ -284,8 +284,7 @@ void QInstaller::compressDirectory(const QString& path, const QString& archivePa void QInstaller::compressMetaDirectories(const QString& configDir, const QString& repoDir) { const QString configfile = QFileInfo(configDir, QLatin1String("config.xml")).absoluteFilePath(); - const QInstaller::InstallerSettings settings = - QInstaller::InstallerSettings::fromFileAndPrefix(configfile, configDir); + const QInstaller::Settings &settings = QInstaller::Settings::fromFileAndPrefix(configfile, configDir); KDUpdaterCrypto crypto; crypto.setPrivateKey(settings.privateKey()); @@ -649,8 +648,7 @@ void QInstaller::compressMetaDirectories(const QString& configDir, const QString const QString& baseDir, const QMap<QString, QString>& versionMapping) { const QString configfile = QFileInfo(configDir, QLatin1String("config.xml")).absoluteFilePath(); - const QInstaller::InstallerSettings settings = - QInstaller::InstallerSettings::fromFileAndPrefix(configfile, configDir); + const QInstaller::Settings &settings = QInstaller::Settings::fromFileAndPrefix(configfile, configDir); KDUpdaterCrypto crypto; crypto.setPrivateKey(settings.privateKey()); @@ -710,8 +708,7 @@ void QInstaller::copyComponentData(const QString& packageDir, const QString& con const QString& repoDir, const QVector<PackageInfo>& infos) { const QString configfile = QFileInfo(configDir, QLatin1String("config.xml")).absoluteFilePath(); - const QInstaller::InstallerSettings settings = - QInstaller::InstallerSettings::fromFileAndPrefix(configfile, configDir); + const QInstaller::Settings &settings = QInstaller::Settings::fromFileAndPrefix(configfile, configDir); KDUpdaterCrypto crypto; crypto.setPrivateKey(settings.privateKey()); diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp index a4008874b..ca5a37958 100644 --- a/installerbuilder/libinstaller/packagemanagercore.cpp +++ b/installerbuilder/libinstaller/packagemanagercore.cpp @@ -451,7 +451,7 @@ int PackageManagerCore::downloadNeededArchives(RunMode runMode, double partProgr // don't have it on the stack, since it keeps the temporary files DownloadArchivesJob* const archivesJob = - new DownloadArchivesJob(d->m_installerSettings.publicKey(), this); + new DownloadArchivesJob(d->m_Settings.publicKey(), this); archivesJob->setAutoDelete(false); archivesJob->setArchivesToDownload(archivesToDownload); connect(this, SIGNAL(installationInterrupted()), archivesJob, SLOT(cancel())); @@ -508,8 +508,8 @@ void PackageManagerCore::rollBackInstallation() KDUpdater::PackagesInfo *const packages = d->m_app->packagesInfo(); packages->setFileName(d->componentsXmlPath()); // forces a refresh of installed packages - packages->setApplicationName(d->m_installerSettings.applicationName()); - packages->setApplicationVersion(d->m_installerSettings.applicationVersion()); + packages->setApplicationName(d->m_Settings.applicationName()); + packages->setApplicationVersion(d->m_Settings.applicationVersion()); //this unregisters all operation progressChanged connects ProgressCoordninator::instance()->setUndoMode(); @@ -659,8 +659,8 @@ QHash<QString, KDUpdater::PackageInfo> PackageManagerCore::localInstalledPackage .arg(d->localComponentsXmlPath()); return installedPackages; } - packagesInfo.setApplicationName(d->m_installerSettings.applicationName()); - packagesInfo.setApplicationVersion(d->m_installerSettings.applicationVersion()); + packagesInfo.setApplicationName(d->m_Settings.applicationName()); + packagesInfo.setApplicationVersion(d->m_Settings.applicationVersion()); foreach (const KDUpdater::PackageInfo &info, packagesInfo.packageInfos()) installedPackages.insert(info.name, info); @@ -669,7 +669,7 @@ QHash<QString, KDUpdater::PackageInfo> PackageManagerCore::localInstalledPackage return installedPackages; } -GetRepositoriesMetaInfoJob* PackageManagerCore::fetchMetaInformation(const QInstaller::InstallerSettings &settings) +GetRepositoriesMetaInfoJob* PackageManagerCore::fetchMetaInformation(const QInstaller::Settings &settings) { GetRepositoriesMetaInfoJob *metaInfoJob = new GetRepositoriesMetaInfoJob(settings.publicKey()); if ((isInstaller() && !isOfflineOnly()) || (isUpdater() || isPackageManager())) @@ -690,7 +690,7 @@ GetRepositoriesMetaInfoJob* PackageManagerCore::fetchMetaInformation(const QInst return metaInfoJob; } -bool PackageManagerCore::addUpdateResourcesFrom(GetRepositoriesMetaInfoJob *metaInfoJob, const InstallerSettings &settings, +bool PackageManagerCore::addUpdateResourcesFrom(GetRepositoriesMetaInfoJob *metaInfoJob, const Settings &settings, bool parseChecksum) { const QString &appName = settings.applicationName(); @@ -737,7 +737,7 @@ bool PackageManagerCore::fetchAllPackages() QHash<QString, KDUpdater::PackageInfo> installedPackages = localInstalledPackages(); - QScopedPointer <GetRepositoriesMetaInfoJob> metaInfoJob(fetchMetaInformation(d->m_installerSettings)); + QScopedPointer <GetRepositoriesMetaInfoJob> metaInfoJob(fetchMetaInformation(d->m_Settings)); if (metaInfoJob->isCanceled() || metaInfoJob->error() != KDJob::NoError) { if (metaInfoJob->error() != QInstaller::UserIgnoreError) { verbose() << tr("Could not retrieve updates: %1").arg(metaInfoJob->errorString()) << std::endl; @@ -746,7 +746,7 @@ bool PackageManagerCore::fetchAllPackages() } if (!metaInfoJob->temporaryDirectories().isEmpty()) { - if (!addUpdateResourcesFrom(metaInfoJob.data(), d->m_installerSettings, true)) { + if (!addUpdateResourcesFrom(metaInfoJob.data(), d->m_Settings, true)) { verbose() << tr("Could not add temporary update source information.") << std::endl; return false; } @@ -837,7 +837,7 @@ bool PackageManagerCore::fetchUpdaterPackages() QHash<QString, KDUpdater::PackageInfo> installedPackages = localInstalledPackages(); - QScopedPointer <GetRepositoriesMetaInfoJob> metaInfoJob(fetchMetaInformation(d->m_installerSettings)); + QScopedPointer <GetRepositoriesMetaInfoJob> metaInfoJob(fetchMetaInformation(d->m_Settings)); if (metaInfoJob->isCanceled() || metaInfoJob->error() != KDJob::NoError) { if (metaInfoJob->error() != QInstaller::UserIgnoreError) { verbose() << tr("Could not retrieve updates: %1").arg(metaInfoJob->errorString()) << std::endl; @@ -846,7 +846,7 @@ bool PackageManagerCore::fetchUpdaterPackages() } if (!metaInfoJob->temporaryDirectories().isEmpty()) { - if (!addUpdateResourcesFrom(metaInfoJob.data(), d->m_installerSettings, true)) { + if (!addUpdateResourcesFrom(metaInfoJob.data(), d->m_Settings, true)) { verbose() << tr("Could not add temporary update source information.") << std::endl; return false; } @@ -1028,7 +1028,7 @@ bool PackageManagerCore::removeWizardPageItem(Component *component, const QStrin void PackageManagerCore::addRepositories(const QList<Repository> &repositories) { - d->m_installerSettings.addUserRepositories(repositories); + d->m_Settings.addUserRepositories(repositories); } /*! @@ -1037,7 +1037,7 @@ void PackageManagerCore::addRepositories(const QList<Repository> &repositories) */ void PackageManagerCore::setTemporaryRepositories(const QList<Repository> &repositories, bool replace) { - d->m_installerSettings.setTemporaryRepositories(repositories, replace); + d->m_Settings.setTemporaryRepositories(repositories, replace); } /*! @@ -1229,9 +1229,9 @@ QList<Component*> PackageManagerCore::dependencies(const Component *component, Q return result; } -const InstallerSettings &PackageManagerCore::settings() const +const Settings &PackageManagerCore::settings() const { - return d->m_installerSettings; + return d->m_Settings; } /*! diff --git a/installerbuilder/libinstaller/packagemanagercore.h b/installerbuilder/libinstaller/packagemanagercore.h index 6401add9b..9af83486a 100644 --- a/installerbuilder/libinstaller/packagemanagercore.h +++ b/installerbuilder/libinstaller/packagemanagercore.h @@ -66,9 +66,9 @@ namespace QInstaller { class Component; class GetRepositoriesMetaInfoJob; -class InstallerSettings; class MessageBoxHandler; class PackageManagerCorePrivate; +class Settings; class INSTALLER_EXPORT PackageManagerCore : public QObject { @@ -115,8 +115,8 @@ public: static void setNoForceInstallation(bool value); QHash<QString, KDUpdater::PackageInfo> localInstalledPackages(); - GetRepositoriesMetaInfoJob* fetchMetaInformation(const InstallerSettings &settings); - bool addUpdateResourcesFrom(GetRepositoriesMetaInfoJob *metaInfoJob, const InstallerSettings &settings, + GetRepositoriesMetaInfoJob* fetchMetaInformation(const Settings &settings); + bool addUpdateResourcesFrom(GetRepositoriesMetaInfoJob *metaInfoJob, const Settings &settings, bool parseChecksum); bool fetchAllPackages(); @@ -209,7 +209,7 @@ public: Q_INVOKABLE bool isProcessRunning(const QString &name) const; - const InstallerSettings &settings() const; + const Settings &settings() const; Q_INVOKABLE bool addWizardPage(QInstaller::Component *component, const QString &name, int page); Q_INVOKABLE bool removeWizardPage(QInstaller::Component *component, const QString &name); diff --git a/installerbuilder/libinstaller/packagemanagercore_p.cpp b/installerbuilder/libinstaller/packagemanagercore_p.cpp index 0897770e1..55057db08 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.cpp +++ b/installerbuilder/libinstaller/packagemanagercore_p.cpp @@ -301,8 +301,8 @@ QHash<QString, QPair<Component*, Component*> > &PackageManagerCorePrivate::compo void PackageManagerCorePrivate::initialize() { try { - m_installerSettings = InstallerSettings(InstallerSettings::fromFileAndPrefix(QLatin1String - (":/metadata/installer-config/config.xml"), QLatin1String(":/metadata/installer-config/"))); + m_Settings = Settings(Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), + QLatin1String(":/metadata/installer-config/"))); } catch (const Error &e) { qCritical("Could not parse Config: %s", qPrintable(e.message())); // TODO: try better error handling @@ -327,21 +327,21 @@ void PackageManagerCorePrivate::initialize() #endif // fill the variables defined in the settings - m_vars.insert(QLatin1String("ProductName"), m_installerSettings.applicationName()); - m_vars.insert(QLatin1String("ProductVersion"), m_installerSettings.applicationVersion()); - m_vars.insert(QLatin1String("Title"), m_installerSettings.title()); - m_vars.insert(QLatin1String("MaintenanceTitle"), m_installerSettings.maintenanceTitle()); - m_vars.insert(QLatin1String("Publisher"), m_installerSettings.publisher()); - m_vars.insert(QLatin1String("Url"), m_installerSettings.url()); - m_vars.insert(QLatin1String("StartMenuDir"), m_installerSettings.startMenuDir()); - - m_vars.insert(QLatin1String("TargetConfigurationFile"), m_installerSettings.configurationFileName()); - m_vars.insert(QLatin1String("LogoPixmap"), m_installerSettings.logo()); - m_vars.insert(QLatin1String("LogoSmallPixmap"), m_installerSettings.logoSmall()); - m_vars.insert(QLatin1String("WatermarkPixmap"), m_installerSettings.watermark()); - - m_vars.insert(QLatin1String("RunProgram"), replaceVariables(m_installerSettings.runProgram())); - const QString desc = m_installerSettings.runProgramDescription(); + m_vars.insert(QLatin1String("ProductName"), m_Settings.applicationName()); + m_vars.insert(QLatin1String("ProductVersion"), m_Settings.applicationVersion()); + m_vars.insert(QLatin1String("Title"), m_Settings.title()); + m_vars.insert(QLatin1String("MaintenanceTitle"), m_Settings.maintenanceTitle()); + m_vars.insert(QLatin1String("Publisher"), m_Settings.publisher()); + m_vars.insert(QLatin1String("Url"), m_Settings.url()); + m_vars.insert(QLatin1String("StartMenuDir"), m_Settings.startMenuDir()); + + m_vars.insert(QLatin1String("TargetConfigurationFile"), m_Settings.configurationFileName()); + m_vars.insert(QLatin1String("LogoPixmap"), m_Settings.logo()); + m_vars.insert(QLatin1String("LogoSmallPixmap"), m_Settings.logoSmall()); + m_vars.insert(QLatin1String("WatermarkPixmap"), m_Settings.watermark()); + + m_vars.insert(QLatin1String("RunProgram"), replaceVariables(m_Settings.runProgram())); + const QString desc = m_Settings.runProgramDescription(); if (!desc.isEmpty()) m_vars.insert(QLatin1String("RunProgramDescription"), desc); #ifdef Q_WS_X11 @@ -349,8 +349,8 @@ void PackageManagerCorePrivate::initialize() m_vars.insert(scTargetDir, replaceVariables(m_installerSettings.adminTargetDir())); else #endif - m_vars.insert(scTargetDir, replaceVariables(m_installerSettings.targetDir())); - m_vars.insert(QLatin1String("RemoveTargetDir"), replaceVariables(m_installerSettings.removeTargetDir())); + m_vars.insert(scTargetDir, replaceVariables(m_Settings.targetDir())); + m_vars.insert(QLatin1String("RemoveTargetDir"), replaceVariables(m_Settings.removeTargetDir())); QSettingsWrapper creatorSettings(QSettingsWrapper::IniFormat, QSettingsWrapper::UserScope, QLatin1String("Nokia"), QLatin1String("QtCreator")); @@ -481,7 +481,7 @@ KDUpdater::UpdateOperation* PackageManagerCorePrivate::takeOwnedOperation(KDUpda QString PackageManagerCorePrivate::uninstallerName() const { - QString filename = m_installerSettings.uninstallerName(); + QString filename = m_Settings.uninstallerName(); #if defined(Q_WS_MAC) if (QFileInfo(QCoreApplication::applicationDirPath() + QLatin1String("/../..")).isBundle()) filename += QLatin1String(".app/Contents/MacOS/") + filename; @@ -493,7 +493,7 @@ QString PackageManagerCorePrivate::uninstallerName() const void PackageManagerCorePrivate::readUninstallerIniFile(const QString &targetDir) { - const QString iniPath = targetDir + QLatin1Char('/') + m_installerSettings.uninstallerIniFile(); + const QString iniPath = targetDir + QLatin1Char('/') + m_Settings.uninstallerIniFile(); QSettingsWrapper cfg(iniPath, QSettingsWrapper::IniFormat); const QVariantHash vars = cfg.value(QLatin1String("Variables")).toHash(); QHash<QString, QVariant>::ConstIterator it = vars.constBegin(); @@ -506,7 +506,7 @@ void PackageManagerCorePrivate::readUninstallerIniFile(const QString &targetDir) const QStringList list = cfg.value(QLatin1String("Repositories")).toStringList(); foreach (const QString &url, list) repositories.append(Repository(url)); - m_installerSettings.addUserRepositories(repositories); + m_Settings.addUserRepositories(repositories); } void PackageManagerCorePrivate::stopProcessesForUpdates(const QList<Component*> &components) @@ -741,7 +741,7 @@ void PackageManagerCorePrivate::writeUninstaller(QList<KDUpdater::UpdateOperatio { // write current state (variables) to the uninstaller ini file - const QString iniPath = targetDir() + QLatin1Char('/') + m_installerSettings.uninstallerIniFile(); + const QString iniPath = targetDir() + QLatin1Char('/') + m_Settings.uninstallerIniFile(); QSettingsWrapper cfg(iniPath, QSettingsWrapper::IniFormat); QVariantHash vars; QHash<QString, QString>::ConstIterator it = m_vars.constBegin(); @@ -754,7 +754,7 @@ void PackageManagerCorePrivate::writeUninstaller(QList<KDUpdater::UpdateOperatio cfg.setValue(QLatin1String("Variables"), vars); QStringList list; - foreach (const Repository &repository, m_installerSettings.userRepositories()) + foreach (const Repository &repository, m_Settings.userRepositories()) list.append(repository.url().toString()); cfg.setValue(QLatin1String("Repositories"), list); @@ -893,7 +893,7 @@ void PackageManagerCorePrivate::writeUninstaller(QList<KDUpdater::UpdateOperatio QFile input; BinaryLayout layout; bool forceUncompressedResourcesOnError = false; - const QString dataFile = targetDir() + QLatin1Char('/') + m_installerSettings.uninstallerName() + const QString dataFile = targetDir() + QLatin1Char('/') + m_Settings.uninstallerName() + QLatin1String(".dat"); try { if (isInstaller()) { @@ -1052,8 +1052,8 @@ void PackageManagerCorePrivate::runInstaller() packages->setFileName(componentsXmlPath()); // forces a refresh of installed packages // Clear these packages as we might install into an already existing installation folder. packages->clearPackageInfoList(); - packages->setApplicationName(m_installerSettings.applicationName()); - packages->setApplicationVersion(m_installerSettings.applicationVersion()); + packages->setApplicationName(m_Settings.applicationName()); + packages->setApplicationVersion(m_Settings.applicationVersion()); stopProcessesForUpdates(componentsToInstall); @@ -1203,8 +1203,8 @@ void PackageManagerCorePrivate::runPackageUpdater() KDUpdater::PackagesInfo *packages = m_app->packagesInfo(); packages->setFileName(packagesXml); - packages->setApplicationName(m_installerSettings.applicationName()); - packages->setApplicationVersion(m_installerSettings.applicationVersion()); + packages->setApplicationName(m_Settings.applicationName()); + packages->setApplicationVersion(m_Settings.applicationVersion()); foreach (Component *component, componentsToInstall) installComponent(component, progressOperationSize, adminRightsGained); @@ -1520,8 +1520,8 @@ void PackageManagerCorePrivate::runUndoOperations(const QList<KDUpdater::UpdateO { KDUpdater::PackagesInfo *const packages = m_app->packagesInfo(); packages->setFileName(componentsXmlPath()); - packages->setApplicationName(m_installerSettings.applicationName()); - packages->setApplicationVersion(m_installerSettings.applicationVersion()); + packages->setApplicationName(m_Settings.applicationName()); + packages->setApplicationVersion(m_Settings.applicationVersion()); try { foreach (KDUpdater::UpdateOperation *undoOperation, undoOperations) { diff --git a/installerbuilder/libinstaller/packagemanagercore_p.h b/installerbuilder/libinstaller/packagemanagercore_p.h index 18ddc692b..f28dd24bf 100644 --- a/installerbuilder/libinstaller/packagemanagercore_p.h +++ b/installerbuilder/libinstaller/packagemanagercore_p.h @@ -154,6 +154,7 @@ public: FSEngineClientHandler *m_FSEngineClientHandler; int m_status; + Settings m_Settings; bool m_forceRestart; int m_silentRetries; bool m_testChecksum; @@ -162,7 +163,6 @@ public: bool m_needToWriteUninstaller; QHash<QString, QString> m_vars; QHash<QString, bool> m_sharedFlags; - InstallerSettings m_installerSettings; QString m_installerBaseBinaryUnreplaced; qint64 m_globalDictOffset; diff --git a/installerbuilder/libinstaller/updatesettings.cpp b/installerbuilder/libinstaller/updatesettings.cpp index 8cceb0ccc..b6a2221a9 100644 --- a/installerbuilder/libinstaller/updatesettings.cpp +++ b/installerbuilder/libinstaller/updatesettings.cpp @@ -146,7 +146,7 @@ QList<Repository> UpdateSettings::repositories() const try { if(result.isEmpty()) { - result = InstallerSettings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), + result = Settings::fromFileAndPrefix(QLatin1String(":/metadata/installer-config/config.xml"), QLatin1String(":/metadata/installer-config/")).repositories(); } } catch (const Error &e) { diff --git a/installerbuilder/repogen/repogen.cpp b/installerbuilder/repogen/repogen.cpp index 4a87ec555..77eafe462 100644 --- a/installerbuilder/repogen/repogen.cpp +++ b/installerbuilder/repogen/repogen.cpp @@ -183,9 +183,6 @@ int main( int argc, char** argv ) { const QString repositoryDir = makeAbsolute( args[argsPosition++] ); const QStringList components = args.mid( argsPosition ); - const InstallerSettings installerSettings = InstallerSettings::fromFileAndPrefix( configDir + QLatin1String("/config.xml"), configDir ); - const QString appName = installerSettings.applicationName(); - const QString appVersion = installerSettings.applicationVersion(); if (!replaceSingleComponent && QFile::exists(repositoryDir)) throw QInstaller::Error(QObject::tr("Repository target folder %1 already exists!").arg(repositoryDir)); @@ -205,8 +202,11 @@ int main( int argc, char** argv ) { const TempDirDeleter tmpDeleter( metaTmp ); Q_UNUSED(tmpDeleter); generateMetaDataDirectory(metaTmp, repositoryDir, packages, appName, appVersion); + const Settings &settings = Settings::fromFileAndPrefix(configDir + QLatin1String("/config.xml"), configDir); + generateMetaDataDirectory(metaTmp, repositoryDir, packages, settings.applicationName(), + settings.applicationVersion()); compressMetaDirectories(configDir, metaTmp, metaTmp, pathToVersionMapping); - + QFile::remove(QFileInfo(repositoryDir, QLatin1String("Updates.xml")).absoluteFilePath()); moveDirectoryContents(metaTmp,repositoryDir); return 0; |