Changeset 561 for trunk/tools/macdeployqt/shared

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/macdeployqt/shared/shared.cpp (modified) (37 diffs)
• tools/macdeployqt/shared/shared.h (modified) (6 diffs)

trunk/tools/macdeployqt/shared/shared.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the tools applications of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.
+** 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.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** 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.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -51 +51 @@
 
 bool runStripEnabled = true;
+
 
 using std::cout;
@@ -62 +63 @@
 QDebug operator<<(QDebug debug, const FrameworkInfo &info)
 {
+
     debug << "Framework directory" << info.frameworkDirectory << "\n";
-    debug << "Framework name" << info.frameworkName << "\n";
     debug << "Framework path" << info.frameworkPath << "\n";
     debug << "Binary directory" << info.binaryDirectory << "\n";
@@ -72 +73 @@
     debug << "Deployed install name" << info.deployedInstallName << "\n";
     debug << "Source file Path" << info.sourceFilePath << "\n";
-    debug << "Deployed Directtory (relative to bundle)" << info.destinationDirectory << "\n";
-    
+    debug << "Deployed Directory (relative to bundle)" << info.destinationDirectory << "\n";
+
     return debug;
 }
@@ -90 +91 @@
 {
     if (QFile::copy(from, to)) {
-        qDebug() << "copied" << from << "to" << to;
+        LogNormal() << " copied:" << from;
+        LogNormal() << " to" << to;
         return true;
     } else {
-        qDebug() << "ERROR: file copy failed from" << from << "to" << to;
+        LogError() << "file copy failed from" << from;
+        LogError() << " to" << to;
         return false;
     }
 }
 
-
-FrameworkInfo parseOtoolLibraryLine(const QString &line)
+FrameworkInfo parseOtoolLibraryLine(const QString &line, bool useDebugLibs)
 {
     FrameworkInfo info;
@@ -106 +108 @@
     if (trimmed.isEmpty())
         return info;
-        
+
     // Don't deploy system libraries.
     if (trimmed.startsWith("/System/Library/") ||
@@ -112 +114 @@
         || trimmed.startsWith("@executable_path"))
         return info;
-        
+
     enum State {QtPath, FrameworkName, DylibName, Version, End};
     State state = QtPath;
@@ -118 +120 @@
     QString name;
     QString qtPath;
+
 
     // Split the line into [Qt-path]/lib/qt[Module].framework/Versions/[Version]/
@@ -123 +126 @@
     while (part < parts.count()) {
         const QString currentPart = parts.at(part).simplified() ;
-//        qDebug() << "currentPart" << currentPart;
         ++part;
         if (currentPart == "")
@@ -149 +151 @@
                     state = DylibName;
                 }
-                
+
                 --part;
                 continue;
             }
             qtPath += (currentPart + "/");
-        
-        } if (state == FrameworkName) { 
+
+        } if (state == FrameworkName) {
             // remove ".framework"
             name = currentPart;
@@ -164 +166 @@
             continue;
         } if (state == DylibName) {
-            name =  currentPart.split(" (compatibility").at(0);
+            name = currentPart.split(" (compatibility").at(0);
             info.frameworkName = name;
-            info.installName += info.frameworkName;
-            info.deployedInstallName = "@executable_path/../Frameworks/" + info.frameworkName;
-            info.binaryName = name;
-            info.frameworkPath = info.frameworkDirectory + info.frameworkName;
+            info.;
+            info.ame;
+            info.ame;
+            info.frameworkPath = info.frameworkDirectory + info.Name;
             info.sourceFilePath = info.frameworkPath;
             info.destinationDirectory = bundleFrameworkDirectory + "/";
+
+
             state = End;
             ++part;
@@ -177 +181 @@
         } else if (state == Version) {
             info.version = currentPart;
-            info.binaryDirectory = "Versions/" + info.version; 
-            info.binaryName = name;
+            info.binaryDirectory = "Versions/" + info.version;
+            info.binaryName = name;
             info.binaryPath = "/" + info.binaryDirectory + "/" + info.binaryName;
-            info.installName += info.frameworkName + info.binaryPath;
+            info.installName += info.frameworkName + ;
             info.deployedInstallName = "@executable_path/../Frameworks/" + info.frameworkName + info.binaryPath;
             info.frameworkPath = info.frameworkDirectory + info.frameworkName;
             info.sourceFilePath = info.frameworkPath + info.binaryPath;
             info.destinationDirectory = bundleFrameworkDirectory + "/" + info.frameworkName + "/" + info.binaryDirectory;
-
             state = End;
         } else if (state == End) {
@@ -199 +202 @@
     QString appName = QFileInfo(appBundlePath).completeBaseName();
     QString binaryPath = appBundlePath  + "/Contents/MacOS/" + appName;
-    
+
     if (QFile::exists(binaryPath))
         return binaryPath;
-    qDebug() << "Error: Could not find bundle binary for" << appBundlePath;
+    Could not find bundle binary for" << appBundlePath;
     return QString();
 }
 
-QList<FrameworkInfo> getQtFrameworks(const QStringList &otoolLines)
-{
-    QList<FrameworkInfo> libraries; 
+QList<FrameworkInfo> getQtFrameworks(const QStringList &otoolLines)
+{
+    QList<FrameworkInfo> libraries;
     foreach(const QString line, otoolLines) {
-        FrameworkInfo info = parseOtoolLibraryLine(line);
+        FrameworkInfo info = parseOtoolLibraryLine(line);
         if (info.frameworkName.isEmpty() == false) {
+
+
             libraries.append(info);
         }
@@ -218 +223 @@
 }
 
-QList<FrameworkInfo> getQtFrameworks(const QString &path)
-{
+QList<FrameworkInfo> getQtFrameworks(const QString &path, bool useDebugLibs)
+{
+    LogDebug() << "Using otool:";
+    LogDebug() << " inspecting" << path;
     QProcess otool;
     otool.start("otool", QStringList() << "-L" << path);
     otool.waitForFinished();
-    
+
     if (otool.exitCode() != 0) {
-        qDebug() << otool.readAllStandardError();
-    }
-    
+        () << otool.readAllStandardError();
+    }
+
     QString output = otool.readAllStandardOutput();
     QStringList outputLines = output.split("\n");
@@ -234 +241 @@
         outputLines.removeFirst(); // frameworks and dylibs lists themselves as a dependency.
 
-    return getQtFrameworks(outputLines);
+    return getQtFrameworks(outputLines);
 }
 
@@ -257 +264 @@
 QString copyFramework(const FrameworkInfo &framework, const QString path)
 {
-    const QString from = framework.sourceFilePath;
-    const QString toDir = path + "/" + framework.destinationDirectory;
-    const QString to = toDir + "/" + framework.binaryName;
+    QString from = framework.sourceFilePath;
+    QString toDir = path + "/" + framework.destinationDirectory;
+    QString to = toDir + "/" + framework.binaryName;
 
     if (QFile::exists(from) == false) {
-        qDebug() << "ERROR: no file at" << from;
+        no file at" << from;
         return QString();
     }
@@ -269 +276 @@
     QDir dir;
     if (dir.mkpath(toDir) == false) {
-        qDebug() << "ERROR: could not create destination directory" << to;
+        could not create destination directory" << to;
         return QString();
     }
-    
+
 
     if (QFile::exists(to)) {
-//        qDebug() << framework.frameworkName << "already deployed, skip";
         return QString();
     }
-    
+
     copyFilePrintStatus(from, to);
 
-    const QString resourcesSourcePath = framework.frameworkPath + "/Resources"; 
-    const QString resourcesDestianationPath = path + "/Contents/Frameworks/" + framework.frameworkName + "/Resources"; 
+    const QString resourcesSourcePath = framework.frameworkPath + "/Resources";
+    const QString resourcesDestianationPath = path + "/Contents/Frameworks/" + framework.frameworkName + "/Resources";
     recursiveCopy(resourcesSourcePath, resourcesDestianationPath);
 
@@ -294 +300 @@
     installNametool.waitForFinished();
     if (installNametool.exitCode() != 0) {
-        qDebug() << installNametool.readAllStandardError();
-        qDebug() << installNametool.readAllStandardOutput();
+        () << installNametool.readAllStandardError();
+        () << installNametool.readAllStandardOutput();
     }
 }
@@ -301 +307 @@
 void changeIdentification(const QString &id, const QString &binaryPath)
 {
-//    qDebug() << "change identification on" << binaryPath << id;
+    LogDebug() << "Using install_name_tool:";
+    LogDebug() << " change identification in" << binaryPath;
+    LogDebug() << " to" << id;
     runInstallNameTool(QStringList() << "-id" << id << binaryPath);
 }
@@ -307 +315 @@
 void changeInstallName(const QString &oldName, const QString &newName, const QString &binaryPath)
 {
-//    qDebug() << "change install name on" << binaryPath << oldName << newName;
+    LogDebug() << "Using install_name_tool:";
+    LogDebug() << " in" << binaryPath;
+    LogDebug() << " change reference" << oldName;
+    LogDebug() << " to" << newName;
     runInstallNameTool(QStringList() << "-change" << oldName << newName << binaryPath);
 }
@@ -316 +327 @@
         return;
 
+
+
     QProcess strip;
     strip.start("strip", QStringList() << "-x" << binaryPath);
     strip.waitForFinished();
     if (strip.exitCode() != 0) {
-        qDebug() << strip.readAllStandardError();
-        qDebug() << strip.readAllStandardOutput();
-    } else {
-        qDebug() << "stripped" << binaryPath;
+        LogError() << strip.readAllStandardError();
+        LogError() << strip.readAllStandardOutput();
     }
 }
@@ -334 +345 @@
     a list of actually deployed frameworks.
 */
-DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks, const QString &bundlePath, const QString &binaryPath)
-{
+DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
+        const QString &bundlePath, const QString &binaryPath, bool useDebugLibs)
+{
+    LogNormal();
+    LogNormal() << "Deploying Qt frameworks found inside:" << binaryPath;
     QStringList copiedFrameworks;
     DeploymentInfo deploymenInfo;
-    
+
     while (frameworks.isEmpty() == false) {
         const FrameworkInfo framework = frameworks.takeFirst();
         copiedFrameworks.append(framework.frameworkName);
-        
+
         // Get the qt path from one of the Qt frameworks;
-        if (deploymenInfo.qtPath == QString() && framework.frameworkName.contains("Qt") 
+        if (deploymenInfo.qtPath() && framework.frameworkName.contains("Qt") 
             && framework.frameworkDirectory.contains("/lib"))
         {
@@ -351 +365 @@
         }
 
-//        qDebug() << "";
-//        qDebug() << "deploy" << framework.frameworkName;
-
         if (framework.installName.startsWith("/@executable_path/")) {
-            qDebug()  << framework.frameworkName << "already deployed, skipping.";
+            ()  << framework.frameworkName << "already deployed, skipping.";
             continue;
         }
-        
+
         // Install_name_tool the new id into the binary
         changeInstallName(framework.installName, framework.deployedInstallName, binaryPath);
@@ -365 +376 @@
         const QString deployedBinaryPath = copyFramework(framework, bundlePath);
         // Skip the rest if already was deployed.
-        if (deployedBinaryPath == QString())
+        if (deployedBinaryPath())
             continue;
-        
+
         runStrip(deployedBinaryPath);
 
@@ -373 +384 @@
         changeIdentification(framework.deployedInstallName, deployedBinaryPath);
         // Check for framework dependencies
-        QList<FrameworkInfo> dependencies = getQtFrameworks(deployedBinaryPath);
+        QList<FrameworkInfo> dependencies = getQtFrameworks(deployedBinaryPath);
 
         foreach (FrameworkInfo dependency, dependencies) {
-//            qDebug() << "dependent framework" << dependency.installName << deployedBinaryPath;
             changeInstallName(dependency.installName, dependency.deployedInstallName, deployedBinaryPath);
-            
+
             // Deploy framework if neccesary.
             if (copiedFrameworks.contains(dependency.frameworkName) == false && frameworks.contains(dependency) == false) {
@@ -389 +399 @@
 }
 
-DeploymentInfo deployQtFrameworks(const QString &appBundlePath)
+DeploymentInfo deployQtFrameworks(const QString &appBundlePath)
 {
    ApplicationBundleInfo applicationBundle;
    applicationBundle.path = appBundlePath;
    applicationBundle.binaryPath = findAppBinary(appBundlePath);
-   return deployQtFrameworks(getQtFrameworks(applicationBundle.binaryPath), applicationBundle.path, applicationBundle.binaryPath);
-}
-
-void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pluginSourcePath, const QString pluginDestinationPath, DeploymentInfo deploymentInfo)
-{
+   QList<FrameworkInfo> frameworks = getQtFrameworks(applicationBundle.binaryPath, useDebugLibs);
+   if (frameworks.isEmpty()) {
+        LogWarning();
+        LogWarning() << "Could not find any external Qt frameworks to deploy in" << appBundlePath;
+        LogWarning() << "Perhaps macdeployqt was already used on" << appBundlePath << "?";
+        LogWarning() << "If so, you will need to rebuild" << appBundlePath << "before trying again.";
+        return DeploymentInfo();
+   } else {
+       return deployQtFrameworks(frameworks, applicationBundle.path, applicationBundle.binaryPath, useDebugLibs);
+   }
+}
+
+void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pluginSourcePath,
+        const QString pluginDestinationPath, DeploymentInfo deploymentInfo, bool useDebugLibs)
+{
+    LogNormal() << "Deploying plugins from" << pluginSourcePath;
     QStringList plugins = QDir(pluginSourcePath).entryList(QStringList() << "*.dylib");
 
     foreach (QString pluginName, plugins) {
-        
-        // Skip some Qt plugins based on what frameworks were deployed:
-        //qDebug() << pluginSourcePath << deploymentInfo.pluginPath;
-        
         if (pluginSourcePath.contains(deploymentInfo.pluginPath)) {
             QStringList deployedFrameworks = deploymentInfo.deployedFrameworks;
 
-            // Skip the debug versions of the plugins
-            if (pluginName.endsWith("_debug.dylib"))
+            // Skip the debug versions of the plugins, unless specified otherwise.
+            if (!useDebugLibs && pluginName.endsWith("_debug.dylib"))
+                continue;
+
+            // Skip the release versions of the plugins, unless specified otherwise.
+            if (useDebugLibs && !pluginName.endsWith("_debug.dylib"))
                 continue;
 
@@ -421 +442 @@
             if (pluginName.contains("libqglgraphicssystem"))
                 continue;
-#endif            
+#endif
             // Deploy accessibility for Qt3Support only if the Qt3Support.framework is in use
             if (deployedFrameworks.indexOf("Qt3Support.framework") == -1 && pluginName.contains("accessiblecompatwidgets"))
@@ -449 +470 @@
         const QString destinationPath = pluginDestinationPath + "/" + pluginName;
         if (copyFilePrintStatus(sourcePath, destinationPath)) {
-        
-        runStrip(destinationPath);
-
-        // Special case for the phonon plugin: CoreVideo is not available as a separate framework
-        // on panther, link against the QuartzCore framework instead. (QuartzCore contians CoreVideo.)
-        if (pluginName.contains("libphonon_qt7")) {
-            changeInstallName("/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo",
-                              "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore",
-                                destinationPath);
-        }
-
-//        qDebug() << "deploy plugin depedencies:";
-            QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath);
-//            qDebug() << frameworks;
-            deployQtFrameworks(frameworks, appBundleInfo.path, destinationPath);
-//        qDebug() << "deploy plugin depedencies done";
+
+            runStrip(destinationPath);
+
+            // Special case for the phonon plugin: CoreVideo is not available as a separate framework
+            // on panther, link against the QuartzCore framework instead. (QuartzCore contians CoreVideo.)
+            if (pluginName.contains("libphonon_qt7")) {
+                changeInstallName("/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo",
+                        "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore",
+                        destinationPath);
+            }
+
+            QList<FrameworkInfo> frameworks = getQtFrameworks(destinationPath, useDebugLibs);
+            deployQtFrameworks(frameworks, appBundleInfo.path, destinationPath, useDebugLibs);
         }
     } // foreach plugins
@@ -470 +488 @@
     QStringList subdirs = QDir(pluginSourcePath).entryList(QStringList() << "*", QDir::Dirs | QDir::NoDotAndDotDot);
     foreach (const QString &subdir, subdirs)
-        deployPlugins(appBundleInfo, pluginSourcePath + "/" + subdir, pluginDestinationPath + "/" + subdir, deploymentInfo);
+        deployPlugins(appBundleInfo, pluginSourcePath + "/" + subdir, pluginDestinationPath + "/" + subdir, deploymentInfo);
 }
 
@@ -480 +498 @@
 
     QDir().mkpath(filePath);
-    
+
     QFile qtconf(fileName);
     if (qtconf.exists()) {
-        qDebug() << "";
-        qDebug() << "Warning:" << fileName << "already exists, will not overwrite.";
-        qDebug() << "To make sure the plugins are loaded from the correct location,";
-        qDebug() << "please make sure qt.conf contains the following lines:";
-        qDebug() << contents;
-        qDebug() << "";
+        ;
+         << fileName << "already exists, will not overwrite.";
+        g() << "To make sure the plugins are loaded from the correct location,";
+        g() << "please make sure qt.conf contains the following lines:";
+        ;
+        ";
         return;
     }
@@ -494 +512 @@
     qtconf.open(QIODevice::WriteOnly);
     if (qtconf.write(contents) != -1) {
-        qDebug() << "";
-        qDebug() << "Created configuration file:" << fileName;
-        qDebug() << "This file sets the plugin search path to" << appBundlePath + "/Contents/PlugIns";
-        qDebug() << "";
-    }
-}
-
-void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo)
+        LogNormal() << "Created configuration file:" << fileName;
+        LogNormal() << "This file sets the plugin search path to" << appBundlePath + "/Contents/PlugIns";
+    }
+}
+
+void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, bool useDebugLibs)
 {
     ApplicationBundleInfo applicationBundle;
     applicationBundle.path = appBundlePath;
     applicationBundle.binaryPath = findAppBinary(appBundlePath);
-   
+
     const QString pluginDestinationPath = appBundlePath + "/" + "Contents/PlugIns";
-    
-//    qDebug() << "";
-//    qDebug() << "recursively copying plugins from" << deploymentInfo.pluginPath << "to" << pluginDestinationPath;
-    deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo);
+    deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo, useDebugLibs);
 }
 
@@ -517 +530 @@
 void changeQtFrameworks(const QList<FrameworkInfo> frameworks, const QString &appBinaryPath, const QString &absoluteQtPath)
 {
-    qDebug() << "Changing" << appBinaryPath << "to link against Qt in" << absoluteQtPath;
+    LogNormal() << "Changing" << appBinaryPath << "to link against";
+    LogNormal() << "Qt in" << absoluteQtPath;
     QString finalQtPath = absoluteQtPath;
 
-    if (absoluteQtPath.startsWith("/Library/Frameworks") == false)
+    if ()
         finalQtPath += "/lib/";
 
@@ -526 +540 @@
         const QString oldBinaryId = framework.installName;
         const QString newBinaryId = finalQtPath + framework.frameworkName +  framework.binaryPath;
-        qDebug() << "Changing" << oldBinaryId << "to" << newBinaryId;
         changeInstallName(oldBinaryId, newBinaryId, appBinaryPath);
     }
 }
 
-void changeQtFrameworks(const QString appPath, const QString &qtPath)
+void changeQtFrameworks(const QString appPath, const QString &qtPath)
 {
     const QString appBinaryPath = findAppBinary(appPath);
-    const QList<FrameworkInfo> qtFrameworks = getQtFrameworks(appBinaryPath);
-    const QString absoluteQtPath = QDir(qtPath).absolutePath();
-    changeQtFrameworks(qtFrameworks, appBinaryPath, absoluteQtPath);
+    const QList<FrameworkInfo> frameworks = getQtFrameworks(appBinaryPath, useDebugLibs);
+    if (frameworks.isEmpty()) {
+        LogWarning();
+        LogWarning() << "Could not find any _external_ Qt frameworks to change in" << appPath;
+        return;
+    } else {
+        const QString absoluteQtPath = QDir(qtPath).absolutePath();
+        changeQtFrameworks(frameworks, appBinaryPath, absoluteQtPath);
+    }
 }