Rewrite binary layout read/ write implementation.

Move BinaryLayout into its own file. Calculate the segment
offsets in place instead of letting the caller do the work.
Adjust autotest to match the new behavior. Adjust uses to
the new behavior.

Change-Id: Iba7a4398bd097f1768c33f0c528efd12b7458541
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

1 files changed, 70 insertions, 0 deletions

diff --git a/src/libs/installer/binarylayout.h b/src/libs/installer/binarylayout.h
new file mode 100644
index 000000000..87c8e97dd
--- /dev/null
+++ b/src/libs/installer/binarylayout.h
@@ -0,0 +1,70 @@
+/**************************************************************************
+**
+** Copyright (C) 2014 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$
+**
+**************************************************************************/
+
+#ifndef BINARYLAYOUT_H
+#define BINARYLAYOUT_H
+
+#include "range.h"
+
+#include <QVector>
+
+namespace QInstaller {
+
+struct BinaryLayout
+{
+    qint64 endOfExectuable;
+
+    QVector<Range<qint64> > metaResourceSegments;
+
+    Range<qint64> metaResourcesSegment;
+    Range<qint64> operationsSegment;
+    Range<qint64> resourceCollectionsSegment;
+
+    qint64 binaryContentSize;
+    qint64 magicMarker;
+    quint64 magicCookie;
+
+    qint64 endOfBinaryContent;
+};
+
+} // namespace QInstaller
+
+#endif // BINARYLAYOUT