diff options
| -rw-r--r-- | src/sdk/installerbase.cpp | 8 | ||||
| -rw-r--r-- | tools/binarycreator/binarycreator.cpp | 17 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index d73040e77..8dabbe92a 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -247,8 +247,16 @@ int main(int argc, char *argv[]) // the uninstaller for the recorded list of during the installation performed operations QInstaller::init(); +#ifdef Q_OS_MAC + // load the external binary resource + QDir resourcePath(QFileInfo(QCoreApplication::applicationFilePath()).dir()); + resourcePath.cdUp(); + resourcePath.cd(QLatin1String("Resources")); + BinaryContent content = BinaryContent::readAndRegisterFromBinary(resourcePath.filePath(QLatin1String("installer.dat"))); +#else // load and map the embedded binary resource, registers operations BinaryContent content = BinaryContent::readAndRegisterFromApplicationFile(); +#endif // instantiate the installer we are actually going to use QInstaller::PackageManagerCore core(content.magicMarker(), content.performedOperations()); diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index ef3bd1fb0..0fa147c45 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -224,13 +224,30 @@ Q_UNUSED(settings) } #endif +#ifdef Q_OS_MAC + QDir resourcePath(QFileInfo(input.outputPath).dir()); + resourcePath.cdUp(); + resourcePath.cd(QLatin1String("Resources")); + KDSaveFile out(resourcePath.filePath(QLatin1String("installer.dat"))); +#else KDSaveFile out(input.outputPath); +#endif try { +#ifdef Q_OS_MAC + openForWrite(&out, out.fileName()); + + QFile exe(input.installerExePath); + if (!exe.copy(input.outputPath)) { + throw Error(QObject::tr("Could not copy %1 to %2: %3").arg(exe.fileName(), input.outputPath, + exe.errorString())); + } +#else openForWrite(&out, input.outputPath); QFile exe(input.installerExePath); openForRead(&exe, exe.fileName()); appendFileData(&out, &exe); +#endif const qint64 dataBlockStart = out.pos(); qDebug() << "Data block starts at" << dataBlockStart; |