diff options
Diffstat (limited to 'installerbuilder/binarycreator')
| -rw-r--r-- | installerbuilder/binarycreator/binarycreator.cpp | 698 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/binarycreator.pro | 25 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/binarycreator.qrc | 8 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/rcc/qcorecmdlineargs_p.h | 72 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/rcc/rcc.cpp | 967 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/rcc/rcc.h | 153 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/rcc/rccmain.cpp | 264 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/resources/copylibsintobundle.sh | 161 | ||||
| -rw-r--r-- | installerbuilder/binarycreator/resources/default_icon_mac.icns | bin | 0 -> 118992 bytes | |||
| -rw-r--r-- | installerbuilder/binarycreator/resources/mkdmg.sh | 37 |
10 files changed, 2385 insertions, 0 deletions
diff --git a/installerbuilder/binarycreator/binarycreator.cpp b/installerbuilder/binarycreator/binarycreator.cpp new file mode 100644 index 000000000..de80a8715 --- /dev/null +++ b/installerbuilder/binarycreator/binarycreator.cpp @@ -0,0 +1,698 @@ +/************************************************************************** +** +** This file is part of Qt SDK** +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).* +** +** Contact: Nokia Corporation qt-info@nokia.com** +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** 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. +** +** If you are unsure which license is appropriate for your use, please contact +** (qt-info@nokia.com). +** +**************************************************************************/ +#include <common/repositorygen.h> +#include <common/errors.h> +#include <common/binaryformat.h> +#include <common/installersettings.h> +#include <common/fileutils.h> +#include <common/utils.h> +#include <common/consolepasswordprovider.h> + +#include <KDToolsCore/KDSaveFile> +#include <KDUpdater/KDUpdater> + +#include <QCoreApplication> +#include <QDebug> +#include <QDir> +#include <QDirIterator> +#include <QDomAttr> +#include <QDomDocument> +#include <QFile> +#include <QFileInfo> +#include <QSettings> +#include <QTemporaryFile> +#include <QVector> + +#include <fstream> +#include <iostream> + +#ifndef Q_WS_WIN +#include <sys/types.h> +#include <sys/stat.h> +#endif + +#include "init.h" + +using namespace QInstaller; +using namespace QInstallerCreator; + +typedef QVector<PackageInfo> PackageInfoVector; + +struct Input { + QString installerExePath; + QString outputPath; + QString binaryResourcePath; + ComponentIndex components; + Range<qint64> componentIndexSegment; + Range<qint64> resourcePos; + Range<qint64> operationsPos; +}; + +class BundleBackup +{ +public: + explicit BundleBackup(const QString &bundle = QString()) + : bundle(bundle) + { + if (!bundle.isEmpty() && QFileInfo(bundle).exists()) { + backup = generateTemporaryFileName(bundle); + QFile::rename(bundle, backup); + } + } + ~BundleBackup() + { + if (!backup.isEmpty()) { + removeDirectory(bundle); + QFile::rename(backup, bundle); + } + } + + void release() const { + if (!backup.isEmpty()) + removeDirectory(backup); + backup.clear(); + } + +private: + const QString bundle; + mutable QString backup; +}; + +static int assemble(Input input, const QString &configdir) +{ + const QString configfile = QFileInfo(configdir, QLatin1String("config.xml")).absoluteFilePath(); + const QInstaller::InstallerSettings settings = + QInstaller::InstallerSettings::fromFileAndPrefix(configfile, configdir); + +#ifdef Q_WS_MAC + if (QFileInfo(input.installerExePath).isBundle()) { + const QString bundle = input.installerExePath; + // if the input file was a bundle + const QSettings s(QString::fromLatin1("%1/Contents/Info.plist").arg(input.installerExePath), + QSettings::NativeFormat); + input.installerExePath = QString::fromLatin1("%1/Contents/MacOS/%2").arg(bundle) + .arg(s.value(QLatin1String("CFBundleExecutable"), + QFileInfo(input.installerExePath).baseName()).toString()); + } + + const bool createDMG = input.outputPath.endsWith(QLatin1String(".dmg")); + if (createDMG) + input.outputPath.replace(input.outputPath.length() - 4, 4, QLatin1String(".app")); + + const bool isBundle = input.outputPath.endsWith(QLatin1String(".app")); + const QString bundle = isBundle ? input.outputPath : QString(); + const BundleBackup bundleBackup(bundle); + + if (isBundle) { + // output should be a bundle + const QFileInfo fi(input.outputPath); + QInstaller::mkpath(fi.filePath() + QLatin1String("/Contents/MacOS")); + QInstaller::mkpath(fi.filePath() + QLatin1String("/Contents/Resources")); + + QFile pkgInfo(fi.filePath() + QLatin1String("/Contents/PkgInfo")); + pkgInfo.open(QIODevice::WriteOnly); + QTextStream pkgInfoStream(&pkgInfo); + pkgInfoStream << QLatin1String("APPL????") << endl; + + const QString iconFile = QFile::exists(settings.icon()) ? settings.icon() + : QString::fromLatin1(":/resources/default_icon_mac.icns"); + const QString iconTargetFile = fi.baseName() + QLatin1String(".icns"); + QFile::copy(iconFile, fi.filePath() + QLatin1String("/Contents/Resources/") + iconTargetFile); + + QFile infoPList(fi.filePath() + QLatin1String("/Contents/Info.plist")); + infoPList.open(QIODevice::WriteOnly); + QTextStream plistStream(&infoPList); + plistStream << QLatin1String("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") << endl; + plistStream << QLatin1String("<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs" + "/PropertyList.dtd\">") << endl; + plistStream << QLatin1String("<plist version=\"0.9\">") << endl; + plistStream << QLatin1String("<dict>") << endl; + plistStream << QLatin1String(" <key>CFBundleIconFile</key>") << endl; + plistStream << QLatin1String(" <string>") << iconTargetFile << QLatin1String("</string>") + << endl; + plistStream << QLatin1String(" <key>CFBundlePackageType</key>") << endl; + plistStream << QLatin1String(" <string>APPL</string>") << endl; + plistStream << QLatin1String(" <key>CFBundleGetInfoString</key>") << endl; + plistStream << QLatin1String(" <string>Created by Qt/QMake</string>") << endl; + plistStream << QLatin1String(" <key>CFBundleSignature</key>") << endl; + plistStream << QLatin1String(" <string> ???? </string>") << endl; + plistStream << QLatin1String(" <key>CFBundleExecutable</key>") << endl; + plistStream << QLatin1String(" <string>") << fi.baseName() << QLatin1String("</string>") + << endl; + plistStream << QLatin1String(" <key>CFBundleIdentifier</key>") << endl; + plistStream << QLatin1String(" <string>com.yourcompany.installerbase</string>") << endl; + plistStream << QLatin1String(" <key>NOTE</key>") << endl; + plistStream << QLatin1String(" <string>This file was generated by Qt/QMake.</string>") + << endl; + plistStream << QLatin1String("</dict>") << endl; + plistStream << QLatin1String("</plist>") << endl; + + input.outputPath = QString::fromLatin1("%1/Contents/MacOS/%2").arg(input.outputPath) + .arg(fi.baseName()); + } +#endif + + QTemporaryFile file(input.outputPath); + if (!file.open()) { + throw Error(QObject::tr("Could not copy %1 to %2: %3").arg(input.installerExePath, + input.outputPath, file.errorString())); + } + + const QString tempFile = file.fileName(); + file.close(); + file.remove(); + + QFile instExe(input.installerExePath); + if (!instExe.copy(tempFile)) { + throw Error(QObject::tr("Could not copy %1 to %2: %3").arg(instExe.fileName(), tempFile, + instExe.errorString())); + } + input.installerExePath = tempFile; + +#if defined(Q_OS_WIN) + // setting the windows icon must happen before we append our binary data - otherwise they get lost :-/ + if (QFile::exists(settings.icon())) { + // no error handling as this is not fatal + setApplicationIcon(tempFile, settings.icon()); + } +#elif defined(Q_WS_MAC) + if (isBundle) { + // no error handling as this is not fatal + const QString copyscript = QDir::temp().absoluteFilePath(QLatin1String("copylibsintobundle.sh")); + QFile::copy(QLatin1String(":/resources/copylibsintobundle.sh"), copyscript); + QFile::rename(tempFile, input.outputPath); + ::chmod(qPrintable(copyscript), 0755); + QProcess p; + p.start(copyscript, QStringList() << bundle); + p.waitForFinished(); + QFile::rename(input.outputPath, tempFile); + QFile::remove(copyscript); + } +#endif + + KDSaveFile out(input.outputPath); + try { + openForWrite(&out, input.outputPath); + + QFile exe(input.installerExePath); + openForRead(&exe, exe.fileName()); + appendFileData(&out, &exe); + + const qint64 dataBlockStart = out.pos(); + verbose() << "Data block starts at " << dataBlockStart << std::endl; + QFile res(input.binaryResourcePath); + openForRead(&res, res.fileName()); + appendFileData(&out, &res); + input.resourcePos = Range<qint64>::fromStartAndEnd(out.pos() - res.size(), out.pos()) + .moved(-dataBlockStart); + + // zero operations cause we are not the uninstaller + const qint64 operationsStart = out.pos(); + appendInt64(&out, 0); + appendInt64(&out, 0); + input.operationsPos = Range<qint64>::fromStartAndEnd(operationsStart, out.pos()) + .moved(-dataBlockStart); + + // component index: + input.components.writeComponentData(&out, -dataBlockStart); + const qint64 compIndexStart = out.pos() - dataBlockStart; + input.components.writeIndex(&out, -dataBlockStart); + input.componentIndexSegment = Range<qint64>::fromStartAndEnd(compIndexStart, out.pos() + - dataBlockStart); + + verbose() << "Component index: [" << input.componentIndexSegment.start() << ":" + << input.componentIndexSegment.end() << "]" << std::endl; + appendInt64Range(&out, input.componentIndexSegment); + appendInt64Range(&out, input.resourcePos); + appendInt64Range(&out, input.operationsPos); + appendInt64(&out, 1); // we have just 1 resource atm + + //data block size, from end of .exe to end of file + appendInt64(&out, out.pos() + 3 * sizeof(qint64) - dataBlockStart); + appendInt64(&out, QInstaller::MagicInstallerMarker); + appendInt64(&out, QInstaller::MagicCookie); + + } catch (const Error &e) { + qCritical("Error occurred while assembling the installer: %s", qPrintable(e.message())); + QFile::remove(tempFile); + return 1; + } + + if (!out.commit(KDSaveFile::OverwriteExistingFile)) { + qCritical("Could not write installer to %s: %s", qPrintable(out.fileName()), + qPrintable(out.errorString())); + QFile::remove(tempFile); + return 1; + } +#ifndef Q_OS_WIN + ::chmod(qPrintable(out.fileName()), 0755); +#endif + QFile::remove(tempFile); + +#ifdef Q_WS_MAC + bundleBackup.release(); + + if (createDMG) { + verbose() << "creating a DMG disk image..."; + // no error handling as this is not fatal + const QString mkdmgscript = QDir::temp().absoluteFilePath(QLatin1String("mkdmg.sh")); + QFile::copy(QLatin1String(":/resources/mkdmg.sh"), mkdmgscript); + ::chmod(qPrintable(mkdmgscript), 0755); + QProcess p; + p.start(mkdmgscript, QStringList() << QFileInfo(out.fileName()).baseName() << bundle); + p.waitForFinished(); + QFile::remove(mkdmgscript); + verbose() << "done." << mkdmgscript << std::endl; + } +#endif + + return 0; +} + +QT_BEGIN_NAMESPACE +int runRcc(int argc, char *argv[]); +QT_END_NAMESPACE + +static int runRcc(const QStringList &args) +{ + const int argc = args.count(); + QVector<char*> argv(argc, 0); + for (int i = 0; i < argc; ++i) + argv[i] = qstrdup(qPrintable(args[i])); + + const int result = runRcc(argc, argv.data()); + + for (int i = 0; i < argc; ++i) + delete [] argv[i]; + + return result; +} + +class WorkingDirectoryChange +{ +public: + explicit WorkingDirectoryChange(const QString& path) + : oldPath(QDir::currentPath()) + { + QDir::setCurrent(path); + } + + virtual ~WorkingDirectoryChange() + { + QDir::setCurrent(oldPath); + } + +private: + const QString oldPath; +}; + +static QString createBinaryResourceFile(const QString &directory) +{ + QTemporaryFile projectFile(directory + QString::fromLatin1("/rccprojectXXXXXX.qrc")); + if (!projectFile.open()) + throw Error(QObject::tr("Could not create temporary file for generated rcc project file")); + const QString projectFileName = QFileInfo(projectFile.fileName()).absoluteFilePath(); + projectFile.close(); + + const QString binaryName = generateTemporaryFileName(); + + const WorkingDirectoryChange wd(directory); + + // 1. create the .qrc file + runRcc(QStringList() << QString::fromLatin1("rcc") << QString::fromLatin1("-project") + << QString::fromLatin1("-o") << projectFileName); + + // 2. create the binary resource file from the .qrc file + runRcc(QStringList() << QString::fromLatin1("rcc") << QString::fromLatin1("-binary") + << QString::fromLatin1("-o") << binaryName << projectFileName); + + return binaryName; +} + +static void printUsage() +{ + const QString appName = QFileInfo(QCoreApplication::applicationFilePath()).fileName(); + std::cout << "Usage: " << appName << " [options] target package1 [package2 ...]" << std::endl; + std::cout << std::endl; + std::cout << "Options:" << std::endl; + std::cout << " -t|--template file Use file as installer template binary" << std::endl; + std::cout << " If this parameter is not given, the template used" + << std::endl; + std::cout << " defaults to installerbase" << std::endl; + std::cout << " -p|--packages dir The directory containing the available packages." + << std::endl; + std::cout << " Defaults to the current working directory." << std::endl; + std::cout << " -c|--config dir The directory containing the installer configuration " + "files to use." << std::endl; + std::cout << " Mandatory." << std::endl; + std::cout << " -n|--nodeps Don't add dependencies of package1...n into the " + "installer (for online installers)" << std::endl; + std::cout << " -e|--exclude p1,...,pn exclude the given packages and their dependencies from " + "the binary (for online installers)" << std::endl; + std::cout << " --offline-only Forces the installer to act as an offline installer, " + "i.e. never access online repositories" << std::endl; + std::cout << " -v|--verbose Verbose output" << std::endl; + std::cout << std::endl; + std::cout << "Packages are to be found in the current working directory and get listed as " + "their names" << std::endl << std::endl; + std::cout << "Example (offline installer):" << std::endl; + std::cout << " " << appName << " -c installer-config -t installerbase SDKInstaller.exe " + "com.nokia.sdk" << std::endl; + std::cout << "Creates an offline installer for the SDK, containing all dependencies." << std::endl; + std::cout << std::endl; + std::cout << "Example (online installer):" << std::endl; + std::cout << " " << appName << " -c installer-config -t installerbase -e com.nokia.sdk.qt," + "com.nokia.qtcreator SDKInstaller.exe com.nokia.sdk" << std::endl; + std::cout << std::endl; + std::cout << "Creates an installer for the SDK without qt and qt creator." << std::endl; + std::cout << std::endl; +} + +static QString createMetaDataDirectory(const PackageInfoVector &packages, + const QString &packagesDir, const QString &configdir) +{ + const QString configfile = QFileInfo(configdir, "config.xml").absoluteFilePath(); + const QInstaller::InstallerSettings settings = + QInstaller::InstallerSettings::fromFileAndPrefix(configfile, QString()); + + const QString metapath = createTemporaryDirectory(); + generateMetaDataDirectory(metapath, packagesDir, packages, settings.applicationName(), + settings.applicationVersion()); + + const QString configCopy = metapath + QLatin1String("/installer-config"); + QInstaller::mkdir(configCopy); + QString absoluteConfigPath = QFileInfo(configdir).absoluteFilePath(); + + QDirIterator it(absoluteConfigPath, QDir::Files | QDir::NoDotAndDotDot, + QDirIterator::Subdirectories); + while (it.hasNext()) { + const QString next = it.next(); + if (next.contains("/.")) // skip files that are in directories starting with a point + continue; + + verbose() << " Found configuration file: " << next << std::endl; + const QFileInfo sourceFileInfo(next); + const QString source = sourceFileInfo.absoluteFilePath(); + const QFileInfo targetFileInfo(configCopy, QFileInfo(next).fileName()); + const QDir targetDir = targetFileInfo.dir(); + if (!targetDir.exists()) + QInstaller::mkpath(targetFileInfo.absolutePath()); + const QString target = targetFileInfo.absoluteFilePath(); + + if (!QFile::copy(source, target)) + throw Error(QObject::tr("Could not copy %1.").arg(source)); + + if (sourceFileInfo.fileName().toLower() == QLatin1String("config.xml")) { + // if we just copied the config.xml, make sure to remove the RSA private key from it :-o + QFile configXml(targetDir.filePath(QLatin1String("config.xml"))); + configXml.open(QIODevice::ReadOnly); + QDomDocument dom; + dom.setContent(&configXml); + configXml.close(); + QDomElement doc = dom.documentElement(); + QDomElement privateKey = doc.elementsByTagName(QLatin1String("PrivateKey")).item(0).toElement(); + if (!privateKey.isNull()) { + verbose() << " It contains the RSA private key, removing it..."; + if (doc.removeChild(privateKey).isNull()) + throw Error(QObject::tr("Could not remove the private key from config.xml")); + } + + // afterward, iterater over all child elements, searching for relative file names + const QDomNodeList children = doc.childNodes(); + for (int i = 0; i < children.count(); ++i) { + QDomElement el = children.at(i).toElement(); + if (el.isNull()) + continue; + + QFileInfo fi(absoluteConfigPath, el.text()); +#if defined(Q_WS_MAC) + const QFileInfo fiIcon(absoluteConfigPath, el.text() + QLatin1String(".icns")); +#elif defined(Q_WS_WIN) + const QFileInfo fiIcon(absoluteConfigPath, el.text() + QLatin1String(".ico")); +#else + const QFileInfo fiIcon(absoluteConfigPath, el.text() + QLatin1String(".png")); +#endif + if (!fi.exists() && fiIcon.exists()) + fi = fiIcon; + + if (!fi.exists() || fi.absolutePath() == QFileInfo(configdir).dir().absolutePath()) + continue; + + if (fi.isDir()) + continue; + + const QString newName = el.text().replace(QRegExp(QLatin1String("\\\\|/|\\.")), + QLatin1String("_")); + + if (!QFile::exists(targetDir.absoluteFilePath(newName))) { + if (!QFile::copy(fi.absoluteFilePath(), targetDir.absoluteFilePath(newName))) + throw Error(QObject::tr("Could not copy %1.").arg(el.text())); + } + el.removeChild(el.firstChild()); + el.appendChild(dom.createTextNode(newName)); + } + + openForWrite(&configXml, configXml.fileName()); + QTextStream stream(&configXml); + dom.save(stream, 4); + verbose() << " done." << std::endl; + } + } + return metapath; +} + +static int printErrorAndUsageAndExit(const QString &err) +{ + std::cerr << qPrintable(err) << std::endl << std::endl; + printUsage(); + return 1; +} + +static PackageInfoVector filterBlacklisted(PackageInfoVector packages, const QStringList &blacklist) +{ + for (int i = packages.size() - 1; i >= 0; --i) + if (blacklist.contains(packages[i].name)) + packages.remove(i); + return packages; +} + +/** + * Usage: + * binarycreator: [--help|-h] [-p|--packages packages directory] [-t|--template binary] + * -c|--config confdir target component ... + * + * template defaults to installerbase[.exe] in the same directory + */ +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + + init(); + + const QStringList args = app.arguments().mid(1); + QStringList components; +#ifdef Q_WS_WIN + QString templateBinary = QString::fromLatin1("installerbase.exe"); +#else + QString templateBinary = QString::fromLatin1("installerbase"); +#endif + QString target; + QString confdir; + QString packagesDirectory = QDir::currentPath(); + QStringList excludedPackages; + bool nodeps = false; + bool offlineOnly = false; + + for (QStringList::const_iterator it = args.begin(); it != args.end(); ++it) { + if (*it == QString::fromLatin1("-h") || *it == QString::fromLatin1("--help")) { + printUsage(); + return 0; + } else if (*it == QString::fromLatin1("-p") || *it == QString::fromLatin1("--packages")) { + ++it; + if (it == args.end()) { + return printErrorAndUsageAndExit(QObject::tr("Error: Packages parameter missing " + "argument")); + } + if (!QFileInfo(*it).exists()) { + return printErrorAndUsageAndExit(QObject::tr("Error: Package directory not found " + "at the specified location")); + } + packagesDirectory = *it; + } else if (*it == QLatin1String("-e") || *it == QLatin1String("--exclude")) { + ++it; + if (it == args.end() || it->startsWith(QLatin1String("-"))) + return printErrorAndUsageAndExit(QObject::tr("Error: Package to exclude missing")); + excludedPackages = it->split(QLatin1Char(',')); + } else if (*it == QString::fromLatin1("-v") || *it == QString::fromLatin1("--verbose")) { + setVerbose(true); + } else if (*it == QString::fromLatin1("-n") || *it == QString::fromLatin1("--nodeps")) { + nodeps = true; + } else if (*it == QString::fromLatin1("--offline-only")) { + offlineOnly = true; + } else if (*it == QString::fromLatin1("-t") || *it == QString::fromLatin1("--template")) { + ++it; + if (it == args.end()) { + return printErrorAndUsageAndExit(QObject::tr("Error: Template parameter missing " + "argument")); + } + if (!QFileInfo(*it).exists()) { + return printErrorAndUsageAndExit(QObject::tr("Error: Template not found at the " + "specified location")); + } + templateBinary = *it; + } else if (*it == QLatin1String("-c") || *it == QLatin1String("--config")) { + ++it; + if (it == args.end()) + return printErrorAndUsageAndExit(QObject::tr("Error: Config parameter missing argument")); + const QFileInfo fi(*it); + if (!fi.exists()) { + return printErrorAndUsageAndExit(QObject::tr("Error: Config directory %1 not found " + "at the specified location").arg(*it)); + } + if (!fi.isDir()) { + return printErrorAndUsageAndExit(QObject::tr("Error: Configuration %1 is not a " + "directory").arg(*it)); + } + if (!fi.isReadable()) { + return printErrorAndUsageAndExit(QObject::tr("Error: Config directory %1 is not " + "readable").arg(*it)); + } + confdir = *it; + } else { + if (target.isEmpty()) + target = *it; + else + components.push_back(*it); + } + } + + if (target.isEmpty()) + return printErrorAndUsageAndExit(QObject::tr("Error: Target parameter missing")); + + if (components.isEmpty()) + return printErrorAndUsageAndExit(QObject::tr("Error: No components selected")); + + if (confdir.isEmpty()) + return printErrorAndUsageAndExit(QObject::tr("Error: No configuration directory selected")); + + verbose() << "Parsed arguments, ok." << std::endl; + + try { + const PackageInfoVector packageList = createListOfPackages(components, packagesDirectory, + !nodeps); + const PackageInfoVector packages = filterBlacklisted(packageList, excludedPackages); + const QString metaDir = createMetaDataDirectory(packages, packagesDirectory, confdir); + { + QSettings confInternal(metaDir + "/config/config-internal.ini", QSettings::IniFormat); + confInternal.setValue(QLatin1String("offlineOnly"), offlineOnly); + } + const QString resourceFile = createBinaryResourceFile(metaDir); + + const QString configfile = QFileInfo(confdir, QLatin1String("config.xml")).absoluteFilePath(); + const QInstaller::InstallerSettings settings = + QInstaller::InstallerSettings::fromFileAndPrefix(configfile, confdir); + const QByteArray privateKey = settings.privateKey(); + + Input input; + input.installerExePath = templateBinary; + input.binaryResourcePath = resourceFile; + input.outputPath = target; +#if defined(Q_WS_MAC) + // on mac, we enforce building a bundle + if (!input.outputPath.endsWith(QLatin1String(".app")) + && !input.outputPath.endsWith(QLatin1String(".dmg"))) { + input.outputPath += QLatin1String(".app"); + } +#elif defined(Q_WS_WIN) + // on windows, we add .exe + if (!input.outputPath.endsWith(QLatin1String(".exe"))) + input.outputPath += QLatin1String(".exe"); +#endif + + KDUpdaterCrypto crypto; + crypto.setPrivateKey(privateKey); + ConsolePasswordProvider passwordProvider; + crypto.setPrivatePasswordProvider(&passwordProvider); + crypto.setPublicKey(settings.publicKey()); + + // now put the packages into the components section of the binary: + for (PackageInfoVector::const_iterator it = packages.begin(); it != packages.end(); ++it) { + verbose() << "Creating component info for " << it->name << std::endl; + + Component comp; + comp.setName(it->name.toUtf8()); + // append everything within the data directory + const QFileInfoList archives = QDir(QString::fromLatin1("%1/data").arg(it->directory)) + .entryInfoList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files); + Q_FOREACH(const QFileInfo &archive, archives) { + const QSharedPointer<Archive> arch(new Archive(archive.absoluteFilePath())); + verbose() << " Appending " << archive.filePath() << " (" << arch->size() << " bytes)" + << std::endl; + comp.appendArchive(arch); + if (!privateKey.isEmpty()) { + verbose() << " Appending a RSA signature..." << std::endl; + const QByteArray signature = crypto.sign(arch.data()); + if (signature.isEmpty()) + throw Error(QObject::tr("Could not create a RSA signature")); + + if (!crypto.verify(arch.data(), signature)) { + throw Error(QObject::tr("Created RSA signature could not be verified. Is " + "the given public key wrong?")); + } + verbose() << " Appending " << archive.fileName() << ".sig (" + << signature.size() << " bytes)" << std::endl; + const QSharedPointer< Archive > sigArch(new Archive(arch->name() + ".sig", + signature)); + comp.appendArchive(sigArch); + } + } + input.components.insertComponent(comp); + } + + verbose() << "Creating the binary" << std::endl; + const int result = assemble(input, confdir); + + // cleanup + verbose() << "Cleaning up..." << std::endl; + QFile::remove(resourceFile); + removeDirectory(metaDir); + + return result; + } catch(const Error &e) { + std::cerr << e.message() << std::endl; + return 1; + } catch(...) { + std::cerr << "Unknown exception caught" << std::endl; + return 1; + } +} diff --git a/installerbuilder/binarycreator/binarycreator.pro b/installerbuilder/binarycreator/binarycreator.pro new file mode 100644 index 000000000..237ce9952 --- /dev/null +++ b/installerbuilder/binarycreator/binarycreator.pro @@ -0,0 +1,25 @@ +TEMPLATE = app +TARGET = binarycreator + +DEPENDPATH += . .. +INCLUDEPATH += . .. rcc + +DESTDIR = ../bin + +CONFIG += console +CONFIG -= app_bundle + +include(../libinstaller/libinstaller.pri) + +RESOURCES += binarycreator.qrc + +# Input +SOURCES = binarycreator.cpp \ + rcc/rcc.cpp \ + rcc/rccmain.cpp \ + ../common/repositorygen.cpp + +HEADERS = rcc/rcc.h + +win32:OBJECTS_DIR = .obj +win32:LIBS += Shell32.lib diff --git a/installerbuilder/binarycreator/binarycreator.qrc b/installerbuilder/binarycreator/binarycreator.qrc new file mode 100644 index 000000000..b73ae19bc --- /dev/null +++ b/installerbuilder/binarycreator/binarycreator.qrc @@ -0,0 +1,8 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>resources/default_icon_mac.icns</file> + <file>resources/copylibsintobundle.sh</file> + <file>resources/mkdmg.sh</file> + <file alias="resources/installerbase.ico">../installerbase/installerbase.ico</file> +</qresource> +</RCC> diff --git a/installerbuilder/binarycreator/rcc/qcorecmdlineargs_p.h b/installerbuilder/binarycreator/rcc/qcorecmdlineargs_p.h new file mode 100644 index 000000000..0f6c48dbb --- /dev/null +++ b/installerbuilder/binarycreator/rcc/qcorecmdlineargs_p.h @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCORECMDLINEARGS_P_H +#define QCORECMDLINEARGS_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "QtCore/qstring.h" +#include "QtCore/qstringlist.h" + +QT_BEGIN_NAMESPACE + +static inline QStringList qCmdLineArgs(int argc, char *argv[]) +{ + QStringList args; + for (int i = 0; i != argc; ++i) + args += QString::fromLocal8Bit(argv[i]); + return args; +} + + +QT_END_NAMESPACE + +#endif // QCORECMDLINEARGS_WIN_P_H diff --git a/installerbuilder/binarycreator/rcc/rcc.cpp b/installerbuilder/binarycreator/rcc/rcc.cpp new file mode 100644 index 000000000..4cd155dd3 --- /dev/null +++ b/installerbuilder/binarycreator/rcc/rcc.cpp @@ -0,0 +1,967 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "rcc.h" + +#include <QtCore/QByteArray> +#include <QtCore/QDateTime> +#include <QtCore/QDebug> +#include <QtCore/QDir> +#include <QtCore/QDirIterator> +#include <QtCore/QFile> +#include <QtCore/QIODevice> +#include <QtCore/QLocale> +#include <QtCore/QStack> + +#include <QtXml/QDomDocument> + +QT_BEGIN_NAMESPACE + +enum { + CONSTANT_USENAMESPACE = 1, + CONSTANT_COMPRESSLEVEL_DEFAULT = -1, + CONSTANT_COMPRESSTHRESHOLD_DEFAULT = 70 +}; + + +#define writeString(s) write(s, sizeof(s)) + +void RCCResourceLibrary::write(const char *str, int len) +{ + --len; // trailing \0 on string literals... + int n = m_out.size(); + m_out.resize(n + len); + memcpy(m_out.data() + n, str, len); +} + +void RCCResourceLibrary::writeByteArray(const QByteArray &other) +{ + m_out.append(other); +} + +static inline QString msgOpenReadFailed(const QString &fname, const QString &why) +{ + return QString::fromUtf8("Unable to open %1 for reading: %2\n").arg(fname).arg(why); +} + + +/////////////////////////////////////////////////////////// +// +// RCCFileInfo +// +/////////////////////////////////////////////////////////// + +class RCCFileInfo +{ +public: + enum Flags + { + NoFlags = 0x00, + Compressed = 0x01, + Directory = 0x02 + }; + + RCCFileInfo(const QString &name = QString(), const QFileInfo &fileInfo = QFileInfo(), + QLocale::Language language = QLocale::C, + QLocale::Country country = QLocale::AnyCountry, + uint flags = NoFlags, + int compressLevel = CONSTANT_COMPRESSLEVEL_DEFAULT, + int compressThreshold = CONSTANT_COMPRESSTHRESHOLD_DEFAULT); + ~RCCFileInfo(); + + QString resourceName() const; + +public: + qint64 writeDataBlob(RCCResourceLibrary &lib, qint64 offset, QString *errorMessage); + qint64 writeDataName(RCCResourceLibrary &, qint64 offset); + void writeDataInfo(RCCResourceLibrary &lib); + + int m_flags; + QString m_name; + QLocale::Language m_language; + QLocale::Country m_country; + QFileInfo m_fileInfo; + RCCFileInfo *m_parent; + QHash<QString, RCCFileInfo*> m_children; + int m_compressLevel; + int m_compressThreshold; + + qint64 m_nameOffset; + qint64 m_dataOffset; + qint64 m_childOffset; +}; + +RCCFileInfo::RCCFileInfo(const QString &name, const QFileInfo &fileInfo, + QLocale::Language language, QLocale::Country country, uint flags, + int compressLevel, int compressThreshold) +{ + m_name = name; + m_fileInfo = fileInfo; + m_language = language; + m_country = country; + m_flags = flags; + m_parent = 0; + m_nameOffset = 0; + m_dataOffset = 0; + m_childOffset = 0; + m_compressLevel = compressLevel; + m_compressThreshold = compressThreshold; +} + +RCCFileInfo::~RCCFileInfo() +{ + qDeleteAll(m_children); +} + +QString RCCFileInfo::resourceName() const +{ + QString resource = m_name; + for (RCCFileInfo *p = m_parent; p; p = p->m_parent) + resource = resource.prepend(p->m_name + QLatin1Char('/')); + return QLatin1Char(':') + resource; +} + +void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) +{ + const bool text = (lib.m_format == RCCResourceLibrary::C_Code); + //some info + if (text) { + if (m_language != QLocale::C) { + lib.writeString(" // "); + lib.writeByteArray(resourceName().toLocal8Bit()); + lib.writeString(" ["); + lib.writeByteArray(QByteArray::number(m_country)); + lib.writeString("::"); + lib.writeByteArray(QByteArray::number(m_language)); + lib.writeString("[\n "); + } else { + lib.writeString(" // "); + lib.writeByteArray(resourceName().toLocal8Bit()); + lib.writeString("\n "); + } + } + + //pointer data + if (m_flags & RCCFileInfo::Directory) { + // name offset + lib.writeNumber4(m_nameOffset); + + // flags + lib.writeNumber2(m_flags); + + // child count + lib.writeNumber4(m_children.size()); + + // first child offset + lib.writeNumber4(m_childOffset); + } else { + // name offset + lib.writeNumber4(m_nameOffset); + + // flags + lib.writeNumber2(m_flags); + + // locale + lib.writeNumber2(m_country); + lib.writeNumber2(m_language); + + //data offset + lib.writeNumber4(m_dataOffset); + } + if (text) + lib.writeChar('\n'); +} + +qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset, + QString *errorMessage) +{ + const bool text = (lib.m_format == RCCResourceLibrary::C_Code); + + //capture the offset + m_dataOffset = offset; + + //find the data to be written + QFile file(m_fileInfo.absoluteFilePath()); + if (!file.open(QFile::ReadOnly)) { + *errorMessage = msgOpenReadFailed(m_fileInfo.absoluteFilePath(), file.errorString()); + return 0; + } + QByteArray data = file.readAll(); + +#ifndef QT_NO_COMPRESS + // Check if compression is useful for this file + if (m_compressLevel != 0 && data.size() != 0) { + QByteArray compressed = + qCompress(reinterpret_cast<uchar *>(data.data()), data.size(), m_compressLevel); + + int compressRatio = int(100.0 * (data.size() - compressed.size()) / data.size()); + if (compressRatio >= m_compressThreshold) { + data = compressed; + m_flags |= Compressed; + } + } +#endif // QT_NO_COMPRESS + + // some info + if (text) { + lib.writeString(" // "); + lib.writeByteArray(m_fileInfo.absoluteFilePath().toLocal8Bit()); + lib.writeString("\n "); + } + + // write the length + + lib.writeNumber4(data.size()); + if (text) + lib.writeString("\n "); + offset += 4; + + // write the payload + const char *p = data.constData(); + if (text) { + for (int i = data.size(), j = 0; --i >= 0; --j) { + lib.writeHex(*p++); + if (j == 0) { + lib.writeString("\n "); + j = 16; + } + } + } else { + for (int i = data.size(); --i >= 0; ) + lib.writeChar(*p++); + } + offset += data.size(); + + // done + if (text) + lib.writeString("\n "); + return offset; +} + +qint64 RCCFileInfo::writeDataName(RCCResourceLibrary &lib, qint64 offset) +{ + const bool text = (lib.m_format == RCCResourceLibrary::C_Code); + + // capture the offset + m_nameOffset = offset; + + // some info + if (text) { + lib.writeString(" // "); + lib.writeByteArray(m_name.toLocal8Bit()); + lib.writeString("\n "); + } + + // write the length + lib.writeNumber2(m_name.length()); + if (text) + lib.writeString("\n "); + offset += 2; + + // write the hash + lib.writeNumber4(qHash(m_name)); + if (text) + lib.writeString("\n "); + offset += 4; + + // write the m_name + const QChar *unicode = m_name.unicode(); + for (int i = 0; i < m_name.length(); ++i) { + lib.writeNumber2(unicode[i].unicode()); + if (text && i % 16 == 0) + lib.writeString("\n "); + } + offset += m_name.length()*2; + + // done + if (text) + lib.writeString("\n "); + return offset; +} + + +/////////////////////////////////////////////////////////// +// +// RCCResourceLibrary +// +/////////////////////////////////////////////////////////// + +RCCResourceLibrary::Strings::Strings() : + TAG_RCC(QLatin1String("RCC")), + TAG_RESOURCE(QLatin1String("qresource")), + TAG_FILE(QLatin1String("file")), + ATTRIBUTE_LANG(QLatin1String("lang")), + ATTRIBUTE_PREFIX(QLatin1String("prefix")), + ATTRIBUTE_ALIAS(QLatin1String("alias")), + ATTRIBUTE_THRESHOLD(QLatin1String("threshold")), + ATTRIBUTE_COMPRESS(QLatin1String("compress")) +{ +} + +RCCResourceLibrary::RCCResourceLibrary() + : m_root(0), + m_format(C_Code), + m_verbose(false), + m_compressLevel(CONSTANT_COMPRESSLEVEL_DEFAULT), + m_compressThreshold(CONSTANT_COMPRESSTHRESHOLD_DEFAULT), + m_treeOffset(0), + m_namesOffset(0), + m_dataOffset(0), + m_useNameSpace(CONSTANT_USENAMESPACE), + m_errorDevice(0) +{ + m_out.reserve(30 * 1000 * 1000); +} + +RCCResourceLibrary::~RCCResourceLibrary() +{ + delete m_root; +} + +bool RCCResourceLibrary::interpretResourceFile(QIODevice *inputDevice, + const QString &fname, QString currentPath, bool ignoreErrors) +{ + Q_ASSERT(m_errorDevice); + const QChar slash = QLatin1Char('/'); + if (!currentPath.isEmpty() && !currentPath.endsWith(slash)) + currentPath += slash; + + QDomDocument document; + { + QString errorMsg; + int errorLine = 0; + int errorColumn = 0; + if (!document.setContent(inputDevice, &errorMsg, &errorLine, &errorColumn)) { + if (ignoreErrors) + return true; + const QString msg = QString::fromUtf8("RCC Parse Error: '%1' Line: %2 Column: %3 [%4]\n").arg(fname).arg(errorLine).arg(errorColumn).arg(errorMsg); + m_errorDevice->write(msg.toUtf8()); + return false; + } + } + + QDomElement domRoot = document.firstChildElement(m_strings.TAG_RCC).toElement(); + if (!domRoot.isNull() && domRoot.tagName() == m_strings.TAG_RCC) { + for (QDomNode node = domRoot.firstChild(); !node.isNull(); node = node.nextSibling()) { + if (!node.isElement()) + continue; + + QDomElement child = node.toElement(); + if (!child.isNull() && child.tagName() == m_strings.TAG_RESOURCE) { + QLocale::Language language = QLocale::c().language(); + QLocale::Country country = QLocale::c().country(); + + if (child.hasAttribute(m_strings.ATTRIBUTE_LANG)) { + QString attribute = child.attribute(m_strings.ATTRIBUTE_LANG); + QLocale lang = QLocale(attribute); + language = lang.language(); + if (2 == attribute.length()) { + // Language only + country = QLocale::AnyCountry; + } else { + country = lang.country(); + } + } + + QString prefix; + if (child.hasAttribute(m_strings.ATTRIBUTE_PREFIX)) + prefix = child.attribute(m_strings.ATTRIBUTE_PREFIX); + if (!prefix.startsWith(slash)) + prefix.prepend(slash); + if (!prefix.endsWith(slash)) + prefix += slash; + + for (QDomNode res = child.firstChild(); !res.isNull(); res = res.nextSibling()) { + if (res.isElement() && res.toElement().tagName() == m_strings.TAG_FILE) { + + QString fileName(res.firstChild().toText().data()); + if (fileName.isEmpty()) { + const QString msg = QString::fromUtf8("RCC: Warning: Null node in XML of '%1'\n").arg(fname); + m_errorDevice->write(msg.toUtf8()); + } + QString alias; + if (res.toElement().hasAttribute(m_strings.ATTRIBUTE_ALIAS)) + alias = res.toElement().attribute(m_strings.ATTRIBUTE_ALIAS); + else + alias = fileName; + + int compressLevel = m_compressLevel; + if (res.toElement().hasAttribute(m_strings.ATTRIBUTE_COMPRESS)) + compressLevel = res.toElement().attribute(m_strings.ATTRIBUTE_COMPRESS).toInt(); + int compressThreshold = m_compressThreshold; + if (res.toElement().hasAttribute(m_strings.ATTRIBUTE_THRESHOLD)) + compressThreshold = res.toElement().attribute(m_strings.ATTRIBUTE_THRESHOLD).toInt(); + + // Special case for -no-compress. Overrides all other settings. + if (m_compressLevel == -2) + compressLevel = 0; + + alias = QDir::cleanPath(alias); + while (alias.startsWith(QLatin1String("../"))) + alias.remove(0, 3); + alias = QDir::cleanPath(m_resourceRoot) + prefix + alias; + + QString absFileName = fileName; + if (QDir::isRelativePath(absFileName)) + absFileName.prepend(currentPath); + QFileInfo file(absFileName); + if (!file.exists()) { + m_failedResources.push_back(absFileName); + const QString msg = QString::fromUtf8("RCC: Error in '%1': Cannot find file '%2'\n").arg(fname).arg(fileName); + m_errorDevice->write(msg.toUtf8()); + if (ignoreErrors) + continue; + else + return false; + } else if (file.isFile()) { + const bool arc = addFile(alias, RCCFileInfo(alias.section(slash, -1), file, language, country, + RCCFileInfo::NoFlags, compressLevel, compressThreshold)); + if (!arc) + m_failedResources.push_back(absFileName); + } else { + QDir dir; + if (file.isDir()) { + dir.setPath(file.filePath()); + } else { + dir.setPath(file.path()); + dir.setNameFilters(QStringList(file.fileName())); + if (alias.endsWith(file.fileName())) + alias = alias.left(alias.length()-file.fileName().length()); + } + if (!alias.endsWith(slash)) + alias += slash; + QDirIterator it(dir, QDirIterator::FollowSymlinks|QDirIterator::Subdirectories); + while (it.hasNext()) { + it.next(); + QFileInfo child(it.fileInfo()); + if (child.fileName() != QLatin1String(".") && child.fileName() != QLatin1String("..")) { + const bool arc = addFile(alias + child.fileName(), + RCCFileInfo(child.fileName(), child, language, country, + RCCFileInfo::NoFlags, compressLevel, compressThreshold)); + if (!arc) + m_failedResources.push_back(child.fileName()); + } + } + } + } + } + } + } + } + if (m_root == 0) { + const QString msg = QString::fromUtf8("RCC: Warning: No resources in '%1'.\n").arg(fname); + m_errorDevice->write(msg.toUtf8()); + if (!ignoreErrors && m_format == Binary) { + // create dummy entry, otherwise loading qith QResource will crash + m_root = new RCCFileInfo(QString(), QFileInfo(), + QLocale::C, QLocale::AnyCountry, RCCFileInfo::Directory); + } + } + + return true; +} + +bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file) +{ + Q_ASSERT(m_errorDevice); + if (file.m_fileInfo.size() > 0xffffffff) { + const QString msg = QString::fromUtf8("File too big: %1\n").arg(file.m_fileInfo.absoluteFilePath()); + m_errorDevice->write(msg.toUtf8()); + return false; + } + if (!m_root) + m_root = new RCCFileInfo(QString(), QFileInfo(), QLocale::C, QLocale::AnyCountry, RCCFileInfo::Directory); + + RCCFileInfo *parent = m_root; + const QStringList nodes = alias.split(QLatin1Char('/')); + for (int i = 1; i < nodes.size()-1; ++i) { + const QString node = nodes.at(i); + if (node.isEmpty()) + continue; + if (!parent->m_children.contains(node)) { + RCCFileInfo *s = new RCCFileInfo(node, QFileInfo(), QLocale::C, QLocale::AnyCountry, RCCFileInfo::Directory); + s->m_parent = parent; + parent->m_children.insert(node, s); + parent = s; + } else { + parent = parent->m_children[node]; + } + } + + const QString filename = nodes.at(nodes.size()-1); + RCCFileInfo *s = new RCCFileInfo(file); + s->m_parent = parent; + parent->m_children.insertMulti(filename, s); + return true; +} + +void RCCResourceLibrary::reset() +{ + if (m_root) { + delete m_root; + m_root = 0; + } + m_errorDevice = 0; + m_failedResources.clear(); +} + + +bool RCCResourceLibrary::readFiles(bool ignoreErrors, QIODevice &errorDevice) +{ + reset(); + m_errorDevice = &errorDevice; + //read in data + if (m_verbose) { + const QString msg = QString::fromUtf8("Processing %1 files [%2]\n") + .arg(m_fileNames.size()).arg(static_cast<int>(ignoreErrors)); + m_errorDevice->write(msg.toUtf8()); + } + for (int i = 0; i < m_fileNames.size(); ++i) { + QFile fileIn; + QString fname = m_fileNames.at(i); + QString pwd; + if (fname == QLatin1String("-")) { + fname = QLatin1String("(stdin)"); + pwd = QDir::currentPath(); + fileIn.setFileName(fname); + if (!fileIn.open(stdin, QIODevice::ReadOnly)) { + m_errorDevice->write(msgOpenReadFailed(fname, fileIn.errorString()).toUtf8()); + return false; + } + } else { + pwd = QFileInfo(fname).path(); + fileIn.setFileName(fname); + if (!fileIn.open(QIODevice::ReadOnly)) { + m_errorDevice->write(msgOpenReadFailed(fname, fileIn.errorString()).toUtf8()); + return false; + } + } + if (m_verbose) { + const QString msg = QString::fromUtf8("Interpreting %1\n").arg(fname); + m_errorDevice->write(msg.toUtf8()); + } + + if (!interpretResourceFile(&fileIn, fname, pwd, ignoreErrors)) + return false; + } + return true; +} + +QStringList RCCResourceLibrary::dataFiles() const +{ + QStringList ret; + QStack<RCCFileInfo*> pending; + + if (!m_root) + return ret; + pending.push(m_root); + while (!pending.isEmpty()) { + RCCFileInfo *file = pending.pop(); + for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin(); + it != file->m_children.end(); ++it) { + RCCFileInfo *child = it.value(); + if (child->m_flags & RCCFileInfo::Directory) + pending.push(child); + ret.append(child->m_fileInfo.filePath()); + } + } + return ret; +} + +// Determine map of resource identifier (':/newPrefix/images/p1.png') to file via recursion +static void resourceDataFileMapRecursion(const RCCFileInfo *m_root, const QString &path, RCCResourceLibrary::ResourceDataFileMap &m) +{ + typedef QHash<QString, RCCFileInfo*>::const_iterator ChildConstIterator; + const QChar slash = QLatin1Char('/'); + const ChildConstIterator cend = m_root->m_children.constEnd(); + for (ChildConstIterator it = m_root->m_children.constBegin(); it != cend; ++it) { + const RCCFileInfo *child = it.value(); + QString childName = path; + childName += slash; + childName += child->m_name; + if (child->m_flags & RCCFileInfo::Directory) { + resourceDataFileMapRecursion(child, childName, m); + } else { + m.insert(childName, child->m_fileInfo.filePath()); + } + } +} + +RCCResourceLibrary::ResourceDataFileMap RCCResourceLibrary::resourceDataFileMap() const +{ + ResourceDataFileMap rc; + if (m_root) + resourceDataFileMapRecursion(m_root, QString(QLatin1Char(':')), rc); + return rc; +} + +bool RCCResourceLibrary::output(QIODevice &outDevice, QIODevice &errorDevice) +{ + m_errorDevice = &errorDevice; + //write out + if (m_verbose) + m_errorDevice->write("Outputting code\n"); + if (!writeHeader()) { + m_errorDevice->write("Could not write header\n"); + return false; + } + if (m_root) { + if (!writeDataBlobs()) { + m_errorDevice->write("Could not write data blobs.\n"); + return false; + } + if (!writeDataNames()) { + m_errorDevice->write("Could not write file names\n"); + return false; + } + if (!writeDataStructure()) { + m_errorDevice->write("Could not write data tree\n"); + return false; + } + } + if (!writeInitializer()) { + m_errorDevice->write("Could not write footer\n"); + return false; + } + outDevice.write(m_out, m_out.size()); + return true; +} + +void RCCResourceLibrary::writeHex(quint8 tmp) +{ + const char * const digits = "0123456789abcdef"; + writeChar('0'); + writeChar('x'); + if (tmp < 16) { + writeChar(digits[tmp]); + } else { + writeChar(digits[tmp >> 4]); + writeChar(digits[tmp & 0xf]); + } + writeChar(','); +} + +void RCCResourceLibrary::writeNumber2(quint16 number) +{ + if (m_format == RCCResourceLibrary::Binary) { + writeChar(number >> 8); + writeChar(number); + } else { + writeHex(number >> 8); + writeHex(number); + } +} + +void RCCResourceLibrary::writeNumber4(quint32 number) +{ + if (m_format == RCCResourceLibrary::Binary) { + writeChar(number >> 24); + writeChar(number >> 16); + writeChar(number >> 8); + writeChar(number); + } else { + writeHex(number >> 24); + writeHex(number >> 16); + writeHex(number >> 8); + writeHex(number); + } +} + +bool RCCResourceLibrary::writeHeader() +{ + if (m_format == C_Code) { + writeString("/****************************************************************************\n"); + writeString("** Resource object code\n"); + writeString("**\n"); + writeString("** Created: "); + writeByteArray(QDateTime::currentDateTime().toString().toLatin1()); + writeString("\n** by: The Resource Compiler for Qt version "); + writeByteArray(QT_VERSION_STR); + writeString("\n**\n"); + writeString("** WARNING! All changes made in this file will be lost!\n"); + writeString( "*****************************************************************************/\n\n"); + writeString("#include <QtCore/qglobal.h>\n\n"); + } else if (m_format == Binary) { + writeString("qres"); + writeNumber4(0); + writeNumber4(0); + writeNumber4(0); + writeNumber4(0); + } + return true; +} + +bool RCCResourceLibrary::writeDataBlobs() +{ + Q_ASSERT(m_errorDevice); + if (m_format == C_Code) + writeString("static const unsigned char qt_resource_data[] = {\n"); + else if (m_format == Binary) + m_dataOffset = m_out.size(); + QStack<RCCFileInfo*> pending; + + if (!m_root) + return false; + + pending.push(m_root); + qint64 offset = 0; + QString errorMessage; + while (!pending.isEmpty()) { + RCCFileInfo *file = pending.pop(); + for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin(); + it != file->m_children.end(); ++it) { + RCCFileInfo *child = it.value(); + if (child->m_flags & RCCFileInfo::Directory) + pending.push(child); + else { + offset = child->writeDataBlob(*this, offset, &errorMessage); + if (offset == 0) + m_errorDevice->write(errorMessage.toUtf8()); + } + } + } + if (m_format == C_Code) + writeString("\n};\n\n"); + return true; +} + +bool RCCResourceLibrary::writeDataNames() +{ + if (m_format == C_Code) + writeString("static const unsigned char qt_resource_name[] = {\n"); + else if (m_format == Binary) + m_namesOffset = m_out.size(); + + QHash<QString, int> names; + QStack<RCCFileInfo*> pending; + + if (!m_root) + return false; + + pending.push(m_root); + qint64 offset = 0; + while (!pending.isEmpty()) { + RCCFileInfo *file = pending.pop(); + for (QHash<QString, RCCFileInfo*>::iterator it = file->m_children.begin(); + it != file->m_children.end(); ++it) { + RCCFileInfo *child = it.value(); + if (child->m_flags & RCCFileInfo::Directory) + pending.push(child); + if (names.contains(child->m_name)) { + child->m_nameOffset = names.value(child->m_name); + } else { + names.insert(child->m_name, offset); + offset = child->writeDataName(*this, offset); + } + } + } + if (m_format == C_Code) + writeString("\n};\n\n"); + return true; +} + +static bool qt_rcc_compare_hash(const RCCFileInfo *left, const RCCFileInfo *right) +{ + return qHash(left->m_name) < qHash(right->m_name); +} + +bool RCCResourceLibrary::writeDataStructure() +{ + if (m_format == C_Code) + writeString("static const unsigned char qt_resource_struct[] = {\n"); + else if (m_format == Binary) + m_treeOffset = m_out.size(); + QStack<RCCFileInfo*> pending; + + if (!m_root) + return false; + + //calculate the child offsets (flat) + pending.push(m_root); + int offset = 1; + while (!pending.isEmpty()) { + RCCFileInfo *file = pending.pop(); + file->m_childOffset = offset; + + //sort by hash value for binary lookup + QList<RCCFileInfo*> m_children = file->m_children.values(); + qSort(m_children.begin(), m_children.end(), qt_rcc_compare_hash); + + //write out the actual data now + for (int i = 0; i < m_children.size(); ++i) { + RCCFileInfo *child = m_children.at(i); + ++offset; + if (child->m_flags & RCCFileInfo::Directory) + pending.push(child); + } + } + + //write out the structure (ie iterate again!) + pending.push(m_root); + m_root->writeDataInfo(*this); + while (!pending.isEmpty()) { + RCCFileInfo *file = pending.pop(); + + //sort by hash value for binary lookup + QList<RCCFileInfo*> m_children = file->m_children.values(); + qSort(m_children.begin(), m_children.end(), qt_rcc_compare_hash); + + //write out the actual data now + for (int i = 0; i < m_children.size(); ++i) { + RCCFileInfo *child = m_children.at(i); + child->writeDataInfo(*this); + if (child->m_flags & RCCFileInfo::Directory) + pending.push(child); + } + } + if (m_format == C_Code) + writeString("\n};\n\n"); + + return true; +} + +void RCCResourceLibrary::writeMangleNamespaceFunction(const QByteArray &name) +{ + if (m_useNameSpace) { + writeString("QT_MANGLE_NAMESPACE("); + writeByteArray(name); + writeChar(')'); + } else { + writeByteArray(name); + } +} + +void RCCResourceLibrary::writeAddNamespaceFunction(const QByteArray &name) +{ + if (m_useNameSpace) { + writeString("QT_PREPEND_NAMESPACE("); + writeByteArray(name); + writeChar(')'); + } else { + writeByteArray(name); + } +} + +bool RCCResourceLibrary::writeInitializer() +{ + if (m_format == C_Code) { + //write("\nQT_BEGIN_NAMESPACE\n"); + QString initName = m_initName; + if (!initName.isEmpty()) { + initName.prepend(QLatin1Char('_')); + initName.replace(QRegExp(QLatin1String("[^a-zA-Z0-9_]")), QLatin1String("_")); + } + + //init + if (m_useNameSpace) + writeString("QT_BEGIN_NAMESPACE\n\n"); + if (m_root) { + writeString("extern bool qRegisterResourceData\n " + "(int, const unsigned char *, " + "const unsigned char *, const unsigned char *);\n\n"); + writeString("extern bool qUnregisterResourceData\n " + "(int, const unsigned char *, " + "const unsigned char *, const unsigned char *);\n\n"); + } + if (m_useNameSpace) + writeString("QT_END_NAMESPACE\n\n\n"); + QString initResources = QLatin1String("qInitResources"); + initResources += initName; + writeString("int "); + writeMangleNamespaceFunction(initResources.toLatin1()); + writeString("()\n{\n"); + + if (m_root) { + writeString(" "); + writeAddNamespaceFunction("qRegisterResourceData"); + writeString("\n (0x01, qt_resource_struct, " + "qt_resource_name, qt_resource_data);\n"); + } + writeString(" return 1;\n"); + writeString("}\n\n"); + writeString("Q_CONSTRUCTOR_FUNCTION("); + writeMangleNamespaceFunction(initResources.toLatin1()); + writeString(")\n\n"); + + //cleanup + QString cleanResources = QLatin1String("qCleanupResources"); + cleanResources += initName; + writeString("int "); + writeMangleNamespaceFunction(cleanResources.toLatin1()); + writeString("()\n{\n"); + if (m_root) { + writeString(" "); + writeAddNamespaceFunction("qUnregisterResourceData"); + writeString("\n (0x01, qt_resource_struct, " + "qt_resource_name, qt_resource_data);\n"); + } + writeString(" return 1;\n"); + writeString("}\n\n"); + writeString("Q_DESTRUCTOR_FUNCTION("); + writeMangleNamespaceFunction(cleanResources.toLatin1()); + writeString(")\n\n"); + } else if (m_format == Binary) { + int i = 4; + char *p = m_out.data(); + p[i++] = 0; // 0x01 + p[i++] = 0; + p[i++] = 0; + p[i++] = 1; + + p[i++] = (m_treeOffset >> 24) & 0xff; + p[i++] = (m_treeOffset >> 16) & 0xff; + p[i++] = (m_treeOffset >> 8) & 0xff; + p[i++] = (m_treeOffset >> 0) & 0xff; + + p[i++] = (m_dataOffset >> 24) & 0xff; + p[i++] = (m_dataOffset >> 16) & 0xff; + p[i++] = (m_dataOffset >> 8) & 0xff; + p[i++] = (m_dataOffset >> 0) & 0xff; + + p[i++] = (m_namesOffset >> 24) & 0xff; + p[i++] = (m_namesOffset >> 16) & 0xff; + p[i++] = (m_namesOffset >> 8) & 0xff; + p[i++] = (m_namesOffset >> 0) & 0xff; + } + return true; +} + +QT_END_NAMESPACE diff --git a/installerbuilder/binarycreator/rcc/rcc.h b/installerbuilder/binarycreator/rcc/rcc.h new file mode 100644 index 000000000..66b8339d1 --- /dev/null +++ b/installerbuilder/binarycreator/rcc/rcc.h @@ -0,0 +1,153 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef RCC_H +#define RCC_H + +#include <QtCore/QStringList> +#include <QtCore/QHash> +#include <QtCore/QString> + +QT_BEGIN_NAMESPACE + +class RCCFileInfo; +class QIODevice; +class QTextStream; + + +class RCCResourceLibrary +{ + RCCResourceLibrary(const RCCResourceLibrary &); + RCCResourceLibrary &operator=(const RCCResourceLibrary &); + +public: + RCCResourceLibrary(); + ~RCCResourceLibrary(); + + bool output(QIODevice &out, QIODevice &errorDevice); + + bool readFiles(bool ignoreErrors, QIODevice &errorDevice); + + enum Format { Binary, C_Code }; + void setFormat(Format f) { m_format = f; } + Format format() const { return m_format; } + + void setInputFiles(const QStringList &files) { m_fileNames = files; } + QStringList inputFiles() const { return m_fileNames; } + + QStringList dataFiles() const; + + // Return a map of resource identifier (':/newPrefix/images/p1.png') to file. + typedef QHash<QString, QString> ResourceDataFileMap; + ResourceDataFileMap resourceDataFileMap() const; + + void setVerbose(bool b) { m_verbose = b; } + bool verbose() const { return m_verbose; } + + void setInitName(const QString &name) { m_initName = name; } + QString initName() const { return m_initName; } + + void setCompressLevel(int c) { m_compressLevel = c; } + int compressLevel() const { return m_compressLevel; } + + void setCompressThreshold(int t) { m_compressThreshold = t; } + int compressThreshold() const { return m_compressThreshold; } + + void setResourceRoot(const QString &root) { m_resourceRoot = root; } + QString resourceRoot() const { return m_resourceRoot; } + + void setUseNameSpace(bool v) { m_useNameSpace = v; } + bool useNameSpace() const { return m_useNameSpace; } + + QStringList failedResources() const { return m_failedResources; } + +private: + struct Strings { + Strings(); + const QString TAG_RCC; + const QString TAG_RESOURCE; + const QString TAG_FILE; + const QString ATTRIBUTE_LANG; + const QString ATTRIBUTE_PREFIX; + const QString ATTRIBUTE_ALIAS; + const QString ATTRIBUTE_THRESHOLD; + const QString ATTRIBUTE_COMPRESS; + }; + friend class RCCFileInfo; + void reset(); + bool addFile(const QString &alias, const RCCFileInfo &file); + bool interpretResourceFile(QIODevice *inputDevice, const QString &file, + QString currentPath = QString(), bool ignoreErrors = false); + bool writeHeader(); + bool writeDataBlobs(); + bool writeDataNames(); + bool writeDataStructure(); + bool writeInitializer(); + void writeMangleNamespaceFunction(const QByteArray &name); + void writeAddNamespaceFunction(const QByteArray &name); + void writeHex(quint8 number); + void writeNumber2(quint16 number); + void writeNumber4(quint32 number); + void writeChar(char c) { m_out.append(c); } + void writeByteArray(const QByteArray &); + void write(const char *, int len); + + const Strings m_strings; + RCCFileInfo *m_root; + QStringList m_fileNames; + QString m_resourceRoot; + QString m_initName; + Format m_format; + bool m_verbose; + int m_compressLevel; + int m_compressThreshold; + int m_treeOffset; + int m_namesOffset; + int m_dataOffset; + bool m_useNameSpace; + QStringList m_failedResources; + QIODevice *m_errorDevice; + QByteArray m_out; +}; + +QT_END_NAMESPACE + +#endif // RCC_H diff --git a/installerbuilder/binarycreator/rcc/rccmain.cpp b/installerbuilder/binarycreator/rcc/rccmain.cpp new file mode 100644 index 000000000..2ab985445 --- /dev/null +++ b/installerbuilder/binarycreator/rcc/rccmain.cpp @@ -0,0 +1,264 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** 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, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, 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. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <rcc.h> +#include "qcorecmdlineargs_p.h" + +#include <QDebug> +#include <QDir> +#include <QFile> +#include <QFileInfo> +#include <QTextStream> + +QT_BEGIN_NAMESPACE + +void showHelp(const QString &argv0, const QString &error) +{ + fprintf(stderr, "Qt resource compiler\n"); + if (!error.isEmpty()) + fprintf(stderr, "%s: %s\n", qPrintable(argv0), qPrintable(error)); + fprintf(stderr, "Usage: %s [options] <inputs>\n\n" + "Options:\n" + " -o file write output to file rather than stdout\n" + " -name name create an external initialization function with name\n" + " -threshold level threshold to consider compressing files\n" + " -compress level compress input files by level\n" + " -root path prefix resource access path with root path\n" + " -no-compress disable all compression\n" + " -binary output a binary file for use as a dynamic resource\n" + " -namespace turn off namespace macros\n" + " -project Output a resource file containing all\n" + " files from the current directory\n" + " -version display version\n" + " -help display this information\n", + qPrintable(argv0)); +} + +void dumpRecursive(const QDir &dir, QTextStream &out) +{ + QFileInfoList entries = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot + | QDir::NoSymLinks); + foreach (QFileInfo entry, entries) { + if (entry.isDir()) { + dumpRecursive(entry.filePath(), out); + } else { + out << QLatin1String("<file>") + << entry.filePath() + << QLatin1String("</file>\n"); + } + } +} + +int createProject(const QString &outFileName) +{ + QDir currentDir = QDir::current(); + QString currentDirName = currentDir.dirName(); + if (currentDirName.isEmpty()) + currentDirName = QLatin1String("root"); + + QFile file; + bool isOk = false; + if (outFileName.isEmpty()) { + isOk = file.open(stdout, QFile::WriteOnly | QFile::Text); + } else { + file.setFileName(outFileName); + isOk = file.open(QFile::WriteOnly | QFile::Text); + } + if (!isOk) { + fprintf(stderr, "Unable to open %s: %s\n", + outFileName.isEmpty() ? qPrintable(outFileName) : "standard output", + qPrintable(file.errorString())); + return 1; + } + + QTextStream out(&file); + out << QLatin1String("<!DOCTYPE RCC><RCC version=\"1.0\">\n" + "<qresource>\n"); + + // use "." as dir to get relative file pathes + dumpRecursive(QDir(QLatin1String(".")), out); + + out << QLatin1String("</qresource>\n" + "</RCC>\n"); + + return 0; +} + +int runRcc(int argc, char *argv[]) +{ + QString outFilename; + bool helpRequested = false; + bool list = false; + bool projectRequested = false; + QStringList filenamesIn; + + QStringList args = qCmdLineArgs(argc, argv); + + RCCResourceLibrary library; + + //parse options + QString errorMsg; + for (int i = 1; i < args.count() && errorMsg.isEmpty(); i++) { + if (args[i].isEmpty()) + continue; + if (args[i][0] == QLatin1Char('-')) { // option + QString opt = args[i]; + if (opt == QLatin1String("-o")) { + if (!(i < argc-1)) { + errorMsg = QLatin1String("Missing output name"); + break; + } + outFilename = args[++i]; + } else if (opt == QLatin1String("-name")) { + if (!(i < argc-1)) { + errorMsg = QLatin1String("Missing target name"); + break; + } + library.setInitName(args[++i]); + } else if (opt == QLatin1String("-root")) { + if (!(i < argc-1)) { + errorMsg = QLatin1String("Missing root path"); + break; + } + library.setResourceRoot(QDir::cleanPath(args[++i])); + if (library.resourceRoot().isEmpty() + || library.resourceRoot().at(0) != QLatin1Char('/')) + errorMsg = QLatin1String("Root must start with a /"); + } else if (opt == QLatin1String("-compress")) { + if (!(i < argc-1)) { + errorMsg = QLatin1String("Missing compression level"); + break; + } + library.setCompressLevel(args[++i].toInt()); + } else if (opt == QLatin1String("-threshold")) { + if (!(i < argc-1)) { + errorMsg = QLatin1String("Missing compression threshold"); + break; + } + library.setCompressThreshold(args[++i].toInt()); + } else if (opt == QLatin1String("-binary")) { + library.setFormat(RCCResourceLibrary::Binary); + } else if (opt == QLatin1String("-namespace")) { + library.setUseNameSpace(!library.useNameSpace()); + } else if (opt == QLatin1String("-verbose")) { + library.setVerbose(true); + } else if (opt == QLatin1String("-list")) { + list = true; + } else if (opt == QLatin1String("-version") || opt == QLatin1String("-v")) { + fprintf(stderr, "Qt Resource Compiler version %s\n", QT_VERSION_STR); + return 1; + } else if (opt == QLatin1String("-help") || opt == QLatin1String("-h")) { + helpRequested = true; + } else if (opt == QLatin1String("-no-compress")) { + library.setCompressLevel(-2); + } else if (opt == QLatin1String("-project")) { + projectRequested = true; + } else { + errorMsg = QString::fromLatin1("Unknown option: '%1'").arg(args[i]); + } + } else { + if (!QFile::exists(args[i])) { + qWarning("%s: File does not exist '%s'", + qPrintable(args[0]), qPrintable(args[i])); + return 1; + } + filenamesIn.append(args[i]); + } + } + + if (projectRequested && !helpRequested) { + return createProject(outFilename); + } + + if (!filenamesIn.size() || !errorMsg.isEmpty() || helpRequested) { + showHelp(args[0], errorMsg); + return 1; + } + QFile errorDevice; + errorDevice.open(stderr, QIODevice::WriteOnly|QIODevice::Text); + + if (library.verbose()) + errorDevice.write("Qt resource compiler\n"); + + library.setInputFiles(filenamesIn); + + if (!library.readFiles(list, errorDevice)) + return 1; + + // open output + QFile out; + QIODevice::OpenMode mode = QIODevice::WriteOnly; + if (library.format() == RCCResourceLibrary::C_Code) + mode |= QIODevice::Text; + + if (outFilename.isEmpty() || outFilename == QLatin1String("-")) { + // using this overload close() only flushes. + out.open(stdout, mode); + } else { + out.setFileName(outFilename); + if (!out.open(mode)) { + const QString msg = QString::fromUtf8("Unable to open %1 for writing: %2\n").arg(outFilename).arg(out.errorString()); + errorDevice.write(msg.toUtf8()); + return 1; + } + } + + // do the task + if (list) { + const QStringList data = library.dataFiles(); + for (int i = 0; i < data.size(); ++i) { + out.write(qPrintable(QDir::cleanPath(data.at(i)))); + out.write("\n"); + } + return 0; + } + + return library.output(out, errorDevice) ? 0 : 1; +} + +QT_END_NAMESPACE + +#if 0 +int main(int argc, char *argv[]) +{ + return QT_PREPEND_NAMESPACE(runRcc)(argc, argv); +} +#endif diff --git a/installerbuilder/binarycreator/resources/copylibsintobundle.sh b/installerbuilder/binarycreator/resources/copylibsintobundle.sh new file mode 100644 index 000000000..2b997f9b5 --- /dev/null +++ b/installerbuilder/binarycreator/resources/copylibsintobundle.sh @@ -0,0 +1,161 @@ +#!/bin/sh + +# this script puts all libs directly needed by the bundle into it + +QTDIR="" +IS_DEBUG=0 +HAVE_CORE=0 +HAVE_SVG=0 +HAVE_PHONON=0 +HAVE_SCRIPT=0 +HAVE_SQL=0 +HAVE_WEBKIT=0 + +function handleFile() +{ + local FILE=$1 + local BUNDLE=$2 + + # all dynamic libs directly needed by the bundle, which are not in /System/Library or in /usr/lib (which are system default libs, which we don't want) + local LIBS=`otool -L $FILE | grep -v 'executable_path' | grep -v '/System/Library' | grep -v '/usr/lib' | grep '/' | sed -ne 's,^ *\(.*\) (.*,\1,p'` + + local lib + for lib in $LIBS; do + local NAME=`basename $lib` + + if echo $NAME | grep 'QtCore' >/dev/null; then + HAVE_CORE=1 + QTDIR=`echo $lib | sed -ne 's,^\(.*\)/lib/[^/]*QtCore.*$,\1,p'` + if echo $NAME | grep 'debug' >/dev/null; then + IS_DEBUG=1 + fi + elif echo $NAME | grep 'QtSvg' >/dev/null; then + HAVE_SVG=1 + elif echo $NAME | grep 'phonon' >/dev/null; then + HAVE_PHONON=1 + elif echo $NAME | grep 'QtScript' >/dev/null; then + HAVE_SCRIPT=1 + elif echo $NAME | grep 'QtSql' >/dev/null; then + HAVE_SQL=1 + elif echo $NAME | grep 'QtWebKit' >/dev/null; then + HAVE_WEBKIT=1 + fi + + if [ `basename $FILE` != $NAME ]; then + + # this part handles libraries which are Mac OS X frameworks + if echo $lib | grep '\.framework' >/dev/null; then + local FRAMEWORKPATH=`echo $lib | sed -ne 's,\(.*\.framework\).*,\1,p'` + local FRAMEWORKNAME=`basename $FRAMEWORKPATH` + local NEWFRAMEWORKPATH=`echo $lib | sed -ne "s,.*\($FRAMEWORKNAME\),\1,p"` + + # Qt installed via the precompled binaries... + if [ $FRAMEWORKPATH = $FRAMEWORKNAME ]; then + FRAMEWORKPATH="/Library/Frameworks/$FRAMEWORKNAME" + if [ ! -e "$FRAMEWORKPATH" ]; then + echo "Framework $FRAMEWORKNAME not found." + exit 1 + fi + fi + + if [ ! -e "$BUNDLE/Contents/Frameworks/$NEWFRAMEWORKPATH" ]; then + echo Embedding framework $FRAMEWORKNAME + + + # copy the framework into the bundle + cp -R $FRAMEWORKPATH $BUNDLE/Contents/Frameworks + # remove debug libs we've copied + find $BUNDLE/Contents/Frameworks/$FRAMEWORKNAME -regex '.*_debug\(\.dSYM\)*' | xargs rm -rf + + handleFile "$BUNDLE/Contents/Frameworks/$NEWFRAMEWORKPATH" "$BUNDLE" + fi + # and inform the dynamic linker about this + install_name_tool -change $lib @executable_path/../Frameworks/$NEWFRAMEWORKPATH $FILE + + + # this part handles 'normal' dynamic libraries (.dylib) + else + if [ ! -e "$BUNDLE/Contents/Frameworks/$NAME" ]; then + echo Embedding library $NAME + + # Qt installed via the precompled binaries... + if [ $lib = $NAME ]; then + lib="/Library/Frameworks/$NAME" + if [ ! -e "$lib" ]; then + lib="/usr/lib/$NAME" + fi + if [ ! -e "$lib" ]; then + echo "Library $NAME not found." + exit 1 + fi + fi + + # copy the lib into the bundle + cp $lib $BUNDLE/Contents/Frameworks + handleFile "$BUNDLE/Contents/Frameworks/$NAME" "$BUNDLE" + fi + + # and inform the dynamic linker about this + install_name_tool -change $lib @executable_path/../Frameworks/$NAME $FILE + fi + + fi + done +} + +function handleQtPlugins() +{ + local PLUGINPATH=$QTDIR/plugins + + # QTDIR was not found, then we're using /Developer/Applications/Qt + if [ "$PLUGINPATH" = "/plugins" ]; then + PLUGINPATH="/Developer/Applications/Qt/plugins" + fi + + CLASS=$1 + EXECUTABLE=$2 + BUNDLE=$3 + mkdir -p $BUNDLE/Contents/plugins/$CLASS + echo Add $CLASS plugins + for plugin in `ls $PLUGINPATH/$CLASS/*`; do + plugin=`basename $plugin` + if echo $plugin | grep 'debug' >/dev/null; then + #if [ $IS_DEBUG -eq 1 ]; then + cp "$PLUGINPATH/$CLASS/$plugin" $BUNDLE/Contents/plugins/$CLASS + install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE + handleFile $BUNDLE/Contents/plugins/$CLASS/$plugin $BUNDLE + #fi + else + #if [ $IS_DEBUG -eq 0 ]; then + cp "$PLUGINPATH/$CLASS/$plugin" $BUNDLE/Contents/plugins/$CLASS + install_name_tool -change $plugin @executable_path/../plugins/$CLASS/$plugin $EXECUTABLE + handleFile $BUNDLE/Contents/plugins/$CLASS/$plugin $BUNDLE + #fi + fi + done +} + +# the app bundle we're working with +BUNDLE=$1 +# the executable inside of the bundle +EXECUTABLE=$BUNDLE/Contents/MacOS/`xargs < $BUNDLE/Contents/Info.plist | sed -ne 's,.*<key>CFBundleExecutable</key> <string>\([^<]*\)</string>.*,\1,p'` + +mkdir -p $BUNDLE/Contents/Frameworks + +handleFile $EXECUTABLE $BUNDLE + +if [ $HAVE_CORE -eq 1 ]; then + handleQtPlugins "imageformats" "$EXECUTABLE" "$BUNDLE" +fi +if [ $HAVE_SVG -eq 1 ]; then + handleQtPlugins "iconengines" "$EXECUTABLE" "$BUNDLE" +fi +if [ $HAVE_PHONON -eq 1 ]; then + handleQtPlugins "phonon_backend" "$EXECUTABLE" "$BUNDLE" +fi +if [ $HAVE_SQL -eq 1 ]; then + handleQtPlugins "sqldrivers" "$EXECUTABLE" "$BUNDLE" +fi +if [ $HAVE_WEBKIT -eq 1 ]; then + handleQtPlugins "codecs" "$EXECUTABLE" "$BUNDLE" +fi diff --git a/installerbuilder/binarycreator/resources/default_icon_mac.icns b/installerbuilder/binarycreator/resources/default_icon_mac.icns Binary files differnew file mode 100644 index 000000000..8d870d649 --- /dev/null +++ b/installerbuilder/binarycreator/resources/default_icon_mac.icns diff --git a/installerbuilder/binarycreator/resources/mkdmg.sh b/installerbuilder/binarycreator/resources/mkdmg.sh new file mode 100644 index 000000000..46606c125 --- /dev/null +++ b/installerbuilder/binarycreator/resources/mkdmg.sh @@ -0,0 +1,37 @@ +#!/bin/sh +# +# Creates a disk image (dmg) on Mac OS X from the command line. +# usage: +# mkdmg <volname> <vers> <srcdir> +# +# Where <volname> is the name to use for the mounted image, <vers> is the version +# number of the volume and <srcdir> is where the contents to put on the dmg are. +# +# The result will be a file called <volname>-<vers>.dmg + +if [ $# != 2 ]; then + echo "usage: mkdmg.sh volname srcdir" + exit 0 +fi + +VOL="$1" +FILES="$2" +PATHNAME=`dirname $FILES` + +DMG=`mktemp "/tmp/$VOL.XXXXXX.dmg"` + +# create temporary disk image and format, ejecting when done +SIZE=`du -sk ${FILES} | sed -n 's,^\([0-9]*\).*,\1,p'` +SIZE=$((${SIZE}/1000+1)) +hdiutil create "$DMG" -megabytes ${SIZE} -ov -volname "$VOL" -type UDIF -fs HFS+ >/dev/null +DISK=`hdid "$DMG" | sed -ne 's,^\(.*\) *Apple_H.*,\1,p'` +MOUNT=`hdid "$DMG" | sed -ne 's,^.*Apple_HFS[^/]*\(/.*\)$,\1,p'` + +# mount and copy files onto volume +cp -R "$PATHNAME/`basename $FILES`" "$MOUNT" +hdiutil eject $DISK >/dev/null + +# convert to compressed image, delete temp image +rm -f "$PATHNAME/${VOL}.dmg" +hdiutil convert "$DMG" -format UDZO -o "$PATHNAME/${VOL}.dmg" >/dev/null +rm -f "$DMG" |