summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-09-21 12:20:41 +0200
committerTim Jenssen <tim.jenssen@nokia.com>2011-10-05 18:14:03 +0200
commit668b7093d7e392d94a479c4d0d96bca1d3845c37 (patch)
tree37a1fbed19354827df32d5bbc278600d8527e950 /installerbuilder
parent4ee37dc4dc5c25796a29dd1f5d70f479eb8b713f (diff)
added a more general operation to patch qt core
Change-Id: If3bbf6b4246d063fae182a978c208902c71a2eb4 Reviewed-on: http://codereview.qt-project.org/5307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/libinstaller/init.cpp2
-rw-r--r--installerbuilder/libinstaller/libinstaller.pro2
-rw-r--r--installerbuilder/libinstaller/setpathonqtcoreoperation.cpp181
-rw-r--r--installerbuilder/libinstaller/setpathonqtcoreoperation.h54
4 files changed, 239 insertions, 0 deletions
diff --git a/installerbuilder/libinstaller/init.cpp b/installerbuilder/libinstaller/init.cpp
index 0cad4c749..bce1fd2ac 100644
--- a/installerbuilder/libinstaller/init.cpp
+++ b/installerbuilder/libinstaller/init.cpp
@@ -50,6 +50,7 @@
#include "setexamplespathonqtoperation.h"
#include "setpluginpathonqtcoreoperation.h"
#include "setimportspathonqtcoreoperation.h"
+#include "setpathonqtcoreoperation.h"
#include "replaceoperation.h"
#include "licenseoperation.h"
#include "linereplaceoperation.h"
@@ -189,6 +190,7 @@ void QInstaller::init()
KDUpdater::UpdateOperationFactory::instance().registerUpdateOperation< QInstaller::SetExamplesPathOnQtOperation>( QLatin1String( "SetExamplesPathOnQt") );
KDUpdater::UpdateOperationFactory::instance().registerUpdateOperation< QInstaller::SetPluginPathOnQtCoreOperation>( QLatin1String( "SetPluginPathOnQtCore") );
KDUpdater::UpdateOperationFactory::instance().registerUpdateOperation< QInstaller::SetImportsPathOnQtCoreOperation>( QLatin1String( "SetImportsPathOnQtCore") );
+ KDUpdater::UpdateOperationFactory::instance().registerUpdateOperation< QInstaller::SetPathOnQtCoreOperation>( QLatin1String( "SetPathOnQtCore") );
KDUpdater::UpdateOperationFactory::instance().registerUpdateOperation< QInstaller::SetQtCreatorValueOperation>( QLatin1String( "SetQtCreatorValue") );
KDUpdater::UpdateOperationFactory::instance().registerUpdateOperation< QInstaller::AddQtCreatorArrayValueOperation>( QLatin1String( "AddQtCreatorArrayValue") );
KDUpdater::UpdateOperationFactory::instance().registerUpdateOperation< QInstaller::QtPatchOperation >( QLatin1String( "QtPatch" ) );
diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro
index 3094fb0b5..30c814258 100644
--- a/installerbuilder/libinstaller/libinstaller.pro
+++ b/installerbuilder/libinstaller/libinstaller.pro
@@ -50,6 +50,7 @@ HEADERS += $$PWD/packagemanagercore.h \
persistentsettings.h \
projectexplorer_export.h \
qtpatchoperation.h \
+ setpathonqtcoreoperation.h \
setdemospathonqtoperation.h \
setexamplespathonqtoperation.h \
setpluginpathonqtcoreoperation.h \
@@ -117,6 +118,7 @@ SOURCES += $$PWD/packagemanagercore.cpp \
qtpatch.cpp \
persistentsettings.cpp \
qtpatchoperation.cpp \
+ setpathonqtcoreoperation.cpp \
setdemospathonqtoperation.cpp \
setexamplespathonqtoperation.cpp \
setpluginpathonqtcoreoperation.cpp \
diff --git a/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp b/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp
new file mode 100644
index 000000000..a8ccb19b5
--- /dev/null
+++ b/installerbuilder/libinstaller/setpathonqtcoreoperation.cpp
@@ -0,0 +1,181 @@
+/**************************************************************************
+**
+** This file is part of Qt Installer Framework
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.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 info@qt.nokia.com.
+**
+**************************************************************************/
+#include "setpathonqtcoreoperation.h"
+
+#include "common/utils.h"
+#include "qtpatch.h"
+
+#include <QtCore/QByteArrayMatcher>
+#include <QtCore/QDir>
+
+using namespace QInstaller;
+
+namespace {
+ QByteArray getOldValue(const QString & binaryPath, const QByteArray &typeValue)
+ {
+ QFileInfo fileInfo(binaryPath);
+
+ if (!fileInfo.exists()) {
+ verbose() << "qpatch: warning: file '" << qPrintable(binaryPath) << "' not found" << std::endl;
+ return QByteArray();
+ }
+
+
+ QFile file(binaryPath);
+ int readOpenCount = 0;
+ while (!file.open(QFile::ReadOnly) && readOpenCount < 20000) {
+ ++readOpenCount;
+ qApp->processEvents();
+ }
+ Q_ASSERT(file.isOpen());
+ if (!file.isOpen()) {
+ verbose() << "qpatch: warning: file '" << qPrintable(binaryPath) << "' can not open as ReadOnly."
+ << std::endl;
+ verbose() << file.errorString() << std::endl;
+ return QByteArray();
+ }
+
+ const QByteArray source = file.readAll();
+ file.close();
+
+ int offset = 0;
+ QByteArray searchValue = typeValue;
+ searchValue.append("=");
+ QByteArrayMatcher byteArrayMatcher(searchValue);
+ offset = byteArrayMatcher.indexIn(source, offset);
+ Q_ASSERT(offset > 0);
+ if (offset == -1)
+ return QByteArray();
+
+ int stringEndPosition = offset;
+
+ //go to the position where other data starts
+ while (source.at(stringEndPosition++) != '\0') {}
+
+ //after search string till the first \0 it should be our looking for QByteArray
+ return source.mid(offset + searchValue.size(), stringEndPosition - offset);
+ }
+}
+
+SetPathOnQtCoreOperation::SetPathOnQtCoreOperation()
+{
+ setName(QLatin1String("SetPathOnQtCore"));
+}
+
+SetPathOnQtCoreOperation::~SetPathOnQtCoreOperation()
+{
+}
+
+void SetPathOnQtCoreOperation::backup()
+{
+}
+
+bool SetPathOnQtCoreOperation::performOperation()
+{
+ const QStringList args = arguments();
+
+ if (args.count() != 3) {
+ setError(InvalidArguments);
+ setErrorString(tr("Invalid arguments in %0: %1 arguments given, exact 3 expected.").arg(name())
+ .arg(arguments().count()));
+ return false;
+ }
+
+ const QString qtCoreLibraryDir = args.at(0);
+ const QByteArray typeValue(args.at(1).toUtf8());
+ const QByteArray newValue = QDir::toNativeSeparators(args.at(2)).toUtf8();
+
+ QStringList possibleTypes;
+ possibleTypes << QLatin1String("qt_prfxpath")
+ << QLatin1String("qt_docspath")
+ << QLatin1String("qt_hdrspath")
+ << QLatin1String("qt_libspath")
+ << QLatin1String("qt_binspath")
+ << QLatin1String("qt_plugpath")
+ << QLatin1String("qt_impspath")
+ << QLatin1String("qt_datapath")
+ << QLatin1String("qt_trnspath")
+ << QLatin1String("qt_xmplpath")
+ << QLatin1String("qt_demopath");
+
+ if (!possibleTypes.contains(QString::fromUtf8(typeValue))) {
+ setError(InvalidArguments);
+ setErrorString(tr("The second/type value needs to be one of: %1").arg(possibleTypes.join(
+ QLatin1String(", "))));
+ return false;
+ }
+
+ if (255 < newValue.size()) {
+ verbose() << "qpatch: error: newQtDir needs to be less than 255 characters." << std::endl;
+ return false;
+ }
+ QStringList libraryFiles;
+#ifdef Q_OS_WIN
+ libraryFiles << QString(QLatin1String("%1/QtCore4.dll")).arg(qtCoreLibraryDir);
+ libraryFiles << QString(QLatin1String("%1/QtCore4d.dll")).arg(qtCoreLibraryDir);
+#else
+ libraryFiles << qtCoreLibraryDir + QLatin1String("/libQtCore.so");
+#endif
+ foreach (const QString coreLibrary, libraryFiles) {
+ if (QFile::exists(coreLibrary)) {
+ QByteArray oldValue(getOldValue(coreLibrary, typeValue));
+ Q_ASSERT(!oldValue.isEmpty());
+ oldValue = QByteArray("%0=%1").replace("%0", typeValue).replace("%1", oldValue);
+ QByteArray adjutedNewValue =
+ QByteArray("%0=%1").replace("%0", typeValue).replace("%1", newValue);
+
+ bool isPatched = QtPatch::patchBinaryFile(coreLibrary, oldValue, adjutedNewValue);
+ if (!isPatched) {
+ QInstaller::verbose() << "qpatch: warning: could not patched the plugin path in "
+ << qPrintable(coreLibrary) << std::endl;
+ }
+ }
+ }
+
+ return true;
+}
+
+bool SetPathOnQtCoreOperation::undoOperation()
+{
+ return true;
+}
+
+bool SetPathOnQtCoreOperation::testOperation()
+{
+ return true;
+}
+
+Operation *SetPathOnQtCoreOperation::clone() const
+{
+ return new SetPathOnQtCoreOperation();
+}
+
diff --git a/installerbuilder/libinstaller/setpathonqtcoreoperation.h b/installerbuilder/libinstaller/setpathonqtcoreoperation.h
new file mode 100644
index 000000000..d9f0d7c37
--- /dev/null
+++ b/installerbuilder/libinstaller/setpathonqtcoreoperation.h
@@ -0,0 +1,54 @@
+/**************************************************************************
+**
+** This file is part of Qt Installer Framework
+**
+** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (info@qt.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 info@qt.nokia.com.
+**
+**************************************************************************/
+#ifndef SETPATHONQTCOREOPERATION_H
+#define SETPATHONQTCOREOPERATION_H
+
+#include "qinstallerglobal.h"
+
+namespace QInstaller {
+
+class SetPathOnQtCoreOperation : public Operation
+{
+public:
+ SetPathOnQtCoreOperation();
+ ~SetPathOnQtCoreOperation();
+
+ void backup();
+ bool performOperation();
+ bool undoOperation();
+ bool testOperation();
+ Operation *clone() const;
+};
+
+} // namespace
+
+#endif // SETPATHONQTCOREOPERATION_H