summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-07-10 12:53:23 +0200
committerKarsten Heimrich <karsten.heimrich@digia.com>2014-07-10 14:40:53 +0200
commite0b87eb535841954ea5f06efeed5ffeb2f8c49d8 (patch)
tree9f2c9876335aa406389d918160696b1414a5f2f2 /tools
parentb859b06fe06cbe1ac9edaef0577d5aea3717483e (diff)
Remove now superfluous tool, replaced by devtool.
Change-Id: I987722065d65704e9df4864df3232911c9d9747a Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/extractbinarydata/extractbinarydata.pro15
-rw-r--r--tools/extractbinarydata/main.cpp200
-rw-r--r--tools/tools.pro1
3 files changed, 0 insertions, 216 deletions
diff --git a/tools/extractbinarydata/extractbinarydata.pro b/tools/extractbinarydata/extractbinarydata.pro
deleted file mode 100644
index 8df54e9d6..000000000
--- a/tools/extractbinarydata/extractbinarydata.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = app
-INCLUDEPATH += . ..
-TARGET = extractbinarydata
-
-include(../../installerfw.pri)
-
-QT -= gui
-LIBS += -linstaller -l7z
-
-CONFIG += console
-DESTDIR = $$IFW_APP_PATH
-
-SOURCES += main.cpp
-
-macx:include(../../no_app_bundle.pri)
diff --git a/tools/extractbinarydata/main.cpp b/tools/extractbinarydata/main.cpp
deleted file mode 100644
index de7acd9af..000000000
--- a/tools/extractbinarydata/main.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/**************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Installer Framework.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, 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, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-**************************************************************************/
-
-#include <binaryformat.h>
-#include <errors.h>
-#include <fileutils.h>
-#include <init.h>
-#include <utils.h>
-
-#include <kdsavefile.h>
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QStringList>
-
-#include <iostream>
-
-using namespace QInstaller;
-using namespace QInstallerCreator;
-
-void writeMaintenanceBinary(const QString &maintenanceTool, QFile *const input, qint64 size)
-{
- KDSaveFile out(maintenanceTool + QLatin1String(".new"));
- openForWrite(&out, out.fileName()); // throws an exception in case of error
-
- if (!input->seek(0)) {
- throw Error(QObject::tr("Failed to seek in file %1. Reason: %2.").arg(input->fileName(),
- input->errorString()));
- }
-
- appendData(&out, input, size);
- appendInt64(&out, 0); // resource count
- appendInt64(&out, 4 * sizeof(qint64)); // data block size
- appendInt64(&out, QInstaller::MagicUninstallerMarker);
- appendInt64(&out, QInstaller::MagicCookie);
-
- out.setPermissions(out.permissions() | QFile::WriteUser | QFile::ReadGroup | QFile::ReadOther
- | QFile::ExeOther | QFile::ExeGroup | QFile::ExeUser);
-
- if (!out.commit(KDSaveFile::OverwriteExistingFile)) {
- throw Error(QString::fromLatin1("Could not write new maintenance-tool to %1. Reason: %2.").arg(out
- .fileName(), out.errorString()));
- }
-}
-
-void writeBinaryDataFile(QIODevice *output, QFile *const input, const OperationList &performedOperations,
- const BinaryLayout &layout)
-{
- const qint64 dataBlockStart = output->pos();
-
- QVector<Range<qint64> >resourceSegments;
- foreach (const Range<qint64> &segment, layout.metadataResourceSegments) {
- input->seek(segment.start());
- resourceSegments.append(Range<qint64>::fromStartAndLength(output->pos(), segment.length()));
- appendData(output, input, segment.length());
- }
-
- const qint64 operationsStart = output->pos();
- appendInt64(output, performedOperations.count());
- foreach (Operation *operation, performedOperations) {
- // the installer can't be put into XML, remove it first
- operation->clearValue(QLatin1String("installer"));
-
- appendString(output, operation->name());
- appendString(output, operation->toXml().toString());
-
- // for the ui not to get blocked
- qApp->processEvents();
- }
- appendInt64(output, performedOperations.count());
- const qint64 operationsEnd = output->pos();
-
- // we don't save any component-indexes.
- const qint64 numComponents = 0;
- appendInt64(output, numComponents); // for the indexes
- // we don't save any components.
- const qint64 compIndexStart = output->pos();
- appendInt64(output, numComponents); // and 2 times number of components,
- appendInt64(output, numComponents); // one before and one after the components
- const qint64 compIndexEnd = output->pos();
-
- appendInt64Range(output, Range<qint64>::fromStartAndEnd(compIndexStart, compIndexEnd)
- .moved(-dataBlockStart));
- foreach (const Range<qint64> segment, resourceSegments)
- appendInt64Range(output, segment.moved(-dataBlockStart));
- appendInt64Range(output, Range<qint64>::fromStartAndEnd(operationsStart, operationsEnd)
- .moved(-dataBlockStart));
- appendInt64(output, layout.resourceCount);
- //data block size, from end of .exe to end of file
- appendInt64(output, output->pos() + 3 * sizeof(qint64) - dataBlockStart);
- appendInt64(output, MagicUninstallerMarker);
-}
-
-int main(int argc, char **argv)
-{
- QCoreApplication app(argc, argv);
-
- QStringList arguments = app.arguments();
- if (arguments.count() < 3) {
- std::cout << "Usage: extractbinarydata [--verbose --extract-binarydata] maintenance-tool "
- "installer-base" << std::endl;
- return EXIT_FAILURE;
- }
-
- {
- QInstaller::init();
- QInstaller::setVerbose(arguments.contains(QLatin1String("--verbose")));
- arguments.removeAll(QLatin1String("--verbose"));
-
- try {
- // write out the new maintenance tool
- QFile installerBase(arguments.at(2));
- openForRead(&installerBase, installerBase.fileName());
- writeMaintenanceBinary(arguments.at(1), &installerBase, installerBase.size());
- } catch (const Error &error) {
- qDebug() << error.message();
- return EXIT_FAILURE;
- }
-
- if (arguments.contains(QLatin1String("--extract-binarydata"))) {
- BinaryLayout layout;
- QFile input(arguments.at(1));
- try {
- openForRead(&input, input.fileName());
- layout = BinaryContent::readBinaryLayout(&input, findMagicCookie(&input, MagicCookie));
- } catch (const Error &error) {
- qDebug() << error.message();
- return EXIT_FAILURE;
- }
-
- if (layout.magicMarker != MagicUninstallerMarker) {
- std::cout << "Extracting binary data only supported for maintenance tools." << std::endl;
- return EXIT_FAILURE;
- }
-
- try {
- KDSaveFile file(QFileInfo(arguments.at(1)).absolutePath() + QDir::separator()
- + QFileInfo(arguments.at(1)).baseName() + QLatin1String(".dat"));
- openForWrite(&file, file.fileName());
- BinaryContent content = BinaryContent::readFromBinary(arguments.at(1));
- writeBinaryDataFile(&file, &input, content.performedOperations(), layout);
- appendInt64(&file, MagicCookieDat);
- file.setPermissions(file.permissions() | QFile::WriteUser | QFile::ReadGroup
- | QFile::ReadOther);
- if (!file.commit(KDSaveFile::OverwriteExistingFile)) {
- throw Error(QString::fromLatin1("Could not write binary data to %1. Reason: %2").arg(file
- .fileName(), file.errorString()));
- }
- file.close();
- input.close();
- } catch (const Error &error) {
- qDebug() << error.message();
- return EXIT_FAILURE;
- }
- }
- }
-
- QFile::rename(arguments.at(1), arguments.at(1) + QLatin1String(".org"));
- QFile::rename(arguments.at(1) + QLatin1String(".new"), arguments.at(1));
-
- return EXIT_SUCCESS;
-}
diff --git a/tools/tools.pro b/tools/tools.pro
index 34b980f92..551cb8ed6 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -7,7 +7,6 @@ SUBDIRS += \
repogen
EXTRASUBDIRS = \
- extractbinarydata \
repocompare \
getrepositorycontent