From f691fd7ae2b1c9494174128289f1ade9e5ebdb03 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Wed, 25 Apr 2012 10:21:09 +0200 Subject: Insert RegisterQtInCreatorQNXOperation This allows to add a Qt for QNX in the QtCreator. Change-Id: Icd8a75cdbc50df333fe9f6a93399392ee4a7109d Reviewed-by: Tim Jenssen --- src/libs/installer/init.cpp | 2 + src/libs/installer/installer.pro | 2 + src/libs/installer/registerqtvqnxoperation.cpp | 233 +++++++++++++++++++++++++ src/libs/installer/registerqtvqnxoperation.h | 54 ++++++ 4 files changed, 291 insertions(+) create mode 100644 src/libs/installer/registerqtvqnxoperation.cpp create mode 100644 src/libs/installer/registerqtvqnxoperation.h (limited to 'src') diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index 38e361437..35aa15151 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -58,6 +58,7 @@ #include "registerqtoperation.h" #include "registerqtv2operation.h" #include "registerqtv23operation.h" +#include "registerqtvqnxoperation.h" #include "setqtcreatorvalueoperation.h" #include "addqtcreatorarrayvalueoperation.h" #include "simplemovefileoperation.h" @@ -213,6 +214,7 @@ void QInstaller::init() factory.registerUpdateOperation(QLatin1String("RegisterQtInCreator")); factory.registerUpdateOperation(QLatin1String("RegisterQtInCreatorV2")); factory.registerUpdateOperation(QLatin1String("RegisterQtInCreatorV23")); + factory.registerUpdateOperation(QLatin1String("RegisterQtInCreatorQNX")); factory.registerUpdateOperation(QLatin1String("RegisterToolChain") ); factory.registerUpdateOperation(QLatin1String( "RegisterDefaultDebugger")); factory.registerUpdateOperation(QLatin1String("SetDemosPathOnQt")); diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 5ec75d589..0f71cfdc2 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -45,6 +45,7 @@ HEADERS += packagemanagercore.h \ registertoolchainoperation.h \ registerqtv2operation.h \ registerqtv23operation.h \ + registerqtvqnxoperation.h \ setqtcreatorvalueoperation.h \ addqtcreatorarrayvalueoperation.h \ copydirectoryoperation.h \ @@ -116,6 +117,7 @@ SOURCES += packagemanagercore.cpp \ registertoolchainoperation.cpp \ registerqtv2operation.cpp \ registerqtv23operation.cpp \ + registerqtvqnxoperation.h \ setqtcreatorvalueoperation.cpp \ addqtcreatorarrayvalueoperation.cpp \ copydirectoryoperation.cpp \ diff --git a/src/libs/installer/registerqtvqnxoperation.cpp b/src/libs/installer/registerqtvqnxoperation.cpp new file mode 100644 index 000000000..c7cdb8c4f --- /dev/null +++ b/src/libs/installer/registerqtvqnxoperation.cpp @@ -0,0 +1,233 @@ +/************************************************************************** +** +** This file is part of Installer Framework +** +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** +** GNU Lesser General Public License Usage +** +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage +** +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#include "registerqtvqnxoperation.h" + +#include "constants.h" +#include "packagemanagercore.h" +#include "qtcreator_constants.h" +#include "persistentsettings.h" + +#include +#include +#include +#include +#include + + +using namespace QInstaller; + +// TODO: move this to a general location it is used on some classes +static QString fromNativeSeparatorsAllOS(const QString &pathName) +{ + QString n = pathName; + for (int i = 0; i < n.size(); ++i) { + if (n.at(i) == QLatin1Char('\\')) + n[i] = QLatin1Char('/'); + } + return n; +} + +static QString absoluteQmakePath(const QString &path) +{ + QString versionQmakePath = QDir(path).absolutePath(); + if (!versionQmakePath.endsWith(QLatin1String("qmake")) + && !versionQmakePath.endsWith(QLatin1String("qmake.exe"))) { +#if defined (Q_OS_WIN) + versionQmakePath.append(QLatin1String("/bin/qmake.exe")); +#elif defined(Q_OS_UNIX) + versionQmakePath.append(QLatin1String("/bin/qmake")); +#endif + } + return fromNativeSeparatorsAllOS(versionQmakePath); +} + +RegisterQtInCreatorQNXOperation::RegisterQtInCreatorQNXOperation() +{ + setName(QLatin1String("RegisterQtInCreatorQNX")); +} + +void RegisterQtInCreatorQNXOperation::backup() +{ +} + +// Parameter List: +// Name - String displayed as name in Qt Creator +// qmake path - location of the qmake binary +// Type identifier - Desktop, Simulator, Symbian, ... +// SDK identifier - unique string to identify Qt version inside of the SDK (eg. desk473, simu11, ...) +// System Root Path +// sbs path +bool RegisterQtInCreatorQNXOperation::performOperation() +{ + const QStringList args = arguments(); + + if (args.count() < 4) { + setError(InvalidArguments); + setErrorString(tr("Invalid arguments in %0: %1 arguments given, minimum 4 expected.") + .arg(name()).arg(args.count())); + return false; + } + + PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + if (!core) { + setError(UserDefinedError); + setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); + return false; + } + const QString &rootInstallPath = core->value(scTargetDir); + if (rootInstallPath.isEmpty() || !QDir(rootInstallPath).exists()) { + setError(UserDefinedError); + setErrorString(tr("The given TargetDir %1 is not a valid/existing dir.").arg(rootInstallPath)); + return false; + } + + const QString qtVersionsFileName = rootInstallPath + + QLatin1String(QtVersionSettingsSuffixPath); + int argCounter = 0; + const QString &versionName = args.at(argCounter++); + const QString &path = QDir::toNativeSeparators(args.value(argCounter++)); + const QString versionQmakePath = absoluteQmakePath(path); + + const QString &ndkPath = args.at(argCounter++); + const QString &versionSDKIdentifier = args.at(argCounter++); + const QString &versionSystemRoot = fromNativeSeparatorsAllOS(args.value(argCounter++)); + const QString &versionSbsPath = fromNativeSeparatorsAllOS(args.value(argCounter++)); + + ProjectExplorer::PersistentSettingsReader reader; + int qtVersionCount = 0; + QVariantMap map; + if (reader.load(qtVersionsFileName)) { + map = reader.restoreValues(); + qtVersionCount = map.value(QLatin1String("QtVersion.Count")).toInt(); + map.remove(QLatin1String("QtVersion.Count")); + map.remove(QLatin1String("Version")); + } + + ProjectExplorer::PersistentSettingsWriter writer; + // Store old qt versions + if (!map.isEmpty()) { + for (int i = 0; i < qtVersionCount; ++i) { + writer.saveValue(QString::fromLatin1("QtVersion.%1").arg(i) + , map[QLatin1String("QtVersion.") + QString::number(i)].toMap()); + } + map.clear(); + } + // Enter new version + map.insert(QLatin1String("Id"), -1); + map.insert(QLatin1String("Arch"), 1); + map.insert(QLatin1String("Name"), versionName); + map.insert(QLatin1String("QMakePath"), versionQmakePath); + map.insert(QLatin1String("NDKPath"), ndkPath); + map.insert(QLatin1String("QtVersion.Type"), + QLatin1String("Qt4ProjectManager.QtVersion.QNX")); + map.insert(QLatin1String("isAutodetected"), true); + map.insert(QLatin1String("autodetectionSource"), + QLatin1String("SDK.") + versionSDKIdentifier); + if (!versionSystemRoot.isEmpty()) + map.insert(QLatin1String("SystemRoot"), versionSystemRoot); + if (!versionSbsPath.isEmpty()) + map.insert(QLatin1String("SBSv2Directory"), versionSbsPath); + + writer.saveValue(QLatin1String("QtVersion.") + QString::number(qtVersionCount), map); + + writer.saveValue(QLatin1String("Version"), 1); + writer.saveValue(QLatin1String("QtVersion.Count"), qtVersionCount + 1); + QDir().mkpath(QFileInfo(qtVersionsFileName).absolutePath()); + writer.save(qtVersionsFileName, QLatin1String("QtCreatorQtVersions")); + + return true; +} + +bool RegisterQtInCreatorQNXOperation::undoOperation() +{ + const QStringList args = arguments(); + + if (args.count() < 4) { + setError(InvalidArguments); + setErrorString(tr("Invalid arguments in %0: %1 arguments given, minimum 4 expected.") + .arg(name()).arg(args.count())); + return false; + } + + PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + if (!core) { + setError(UserDefinedError); + setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); + return false; + } + const QString &rootInstallPath = core->value(scTargetDir); + + const QString qtVersionsFileName = rootInstallPath + + QLatin1String(QtVersionSettingsSuffixPath); + + ProjectExplorer::PersistentSettingsReader reader; + // If no file, then it has been removed already + if (!reader.load(qtVersionsFileName)) + return true; + + const QVariantMap map = reader.restoreValues(); + + ProjectExplorer::PersistentSettingsWriter writer; + const int qtVersionCount = map.value(QLatin1String("QtVersion.Count")).toInt(); + + int currentVersionIndex = 0; + for (int i = 0; i < qtVersionCount; ++i) { + QVariantMap versionMap = map[QLatin1String("QtVersion.") + QString::number(i)].toMap(); + + const QString path = QDir::toNativeSeparators(args.value(1)); + const QString versionQmakePath = absoluteQmakePath(path); + + //use absoluteQmakePath function to normalize the path string, for example // + const QString existingQtQMakePath = absoluteQmakePath( + versionMap[QLatin1String("QMakePath")].toString()); + if (existingQtQMakePath == versionQmakePath) + continue; + writer.saveValue(QString::fromLatin1("QtVersion.%1").arg(currentVersionIndex++), versionMap); + } + + writer.saveValue(QLatin1String("QtVersion.Count"), currentVersionIndex); + writer.saveValue(QLatin1String("Version"), map[QLatin1String("Version")].toInt()); + + writer.save(qtVersionsFileName, QLatin1String("QtCreatorQtVersions")); + return true; +} + +bool RegisterQtInCreatorQNXOperation::testOperation() +{ + return true; +} + +Operation *RegisterQtInCreatorQNXOperation::clone() const +{ + return new RegisterQtInCreatorQNXOperation(); +} diff --git a/src/libs/installer/registerqtvqnxoperation.h b/src/libs/installer/registerqtvqnxoperation.h new file mode 100644 index 000000000..aa8460870 --- /dev/null +++ b/src/libs/installer/registerqtvqnxoperation.h @@ -0,0 +1,54 @@ +/************************************************************************** +** +** This file is part of Installer Framework +** +** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** +** GNU Lesser General Public License Usage +** +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage +** +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#ifndef REGISTERQTINCREATORVQNXOPERATION_H +#define REGISTERQTINCREATORVQNXOPERATION_H + +#include "qinstallerglobal.h" + +namespace QInstaller { + +class RegisterQtInCreatorQNXOperation : public Operation +{ +public: + RegisterQtInCreatorQNXOperation(); + + void backup(); + bool performOperation(); + bool undoOperation(); + bool testOperation(); + Operation *clone() const; +}; + +} // namespace QInstaller + +#endif // REGISTERQTINCREATORVQNXOPERATION_H -- cgit v1.2.3