Changeset 561 for trunk/tools/macdeployqt/macdeployqt/main.cpp

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/macdeployqt/main.cpp (modified) (8 diffs)

trunk/tools/macdeployqt/macdeployqt/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -52 +52 @@
         qDebug() << "";
         qDebug() << "Options:";
-        qDebug() << "   -no-plugins: Skip plugin deployment";
-        qDebug() << "   -dmg       : Create a .dmg disk image";
-        qDebug() << "   -no-strip  : Don't run 'strip' on the binaries";
+        qDebug() << "   -verbose=<0-3>  : 0 = no output, 1 = error/warning (default), 2 = normal, 3 = debug";
+        qDebug() << "   -no-plugins     : Skip plugin deployment";
+        qDebug() << "   -dmg            : Create a .dmg disk image";
+        qDebug() << "   -no-strip       : Don't run 'strip' on the binaries";
+        qDebug() << "   -use-debug-libs : Deploy with debug versions of frameworks and plugins (implies -no-strip)";
         qDebug() << "";
         qDebug() << "macdeployqt takes an application bundle as input and makes it";
@@ -69 +71 @@
         return 0;
     }
-    
+
     if (appBundlePath.endsWith("/"))
         appBundlePath.chop(1);
-    
+
     if (QDir().exists(appBundlePath) == false) {
         qDebug() << "Error: Could not find app bundle" << appBundlePath;
@@ -80 +82 @@
     bool plugins = true;
     bool dmg = false;
+    bool useDebugLibs = false;
     extern bool runStripEnabled;
 
@@ -85 +88 @@
         QByteArray argument = QByteArray(argv[i]);
         if (argument == QByteArray("-no-plugins")) {
+            LogDebug() << "Argument found:" << argument;
             plugins = false;
         } else if (argument == QByteArray("-dmg")) {
+            LogDebug() << "Argument found:" << argument;
             dmg = true;
         } else if (argument == QByteArray("-no-strip")) {
+            LogDebug() << "Argument found:" << argument;
             runStripEnabled = false;
+        } else if (argument == QByteArray("-use-debug-libs")) {
+            LogDebug() << "Argument found:" << argument;
+            useDebugLibs = true;
+            runStripEnabled = false;
+        } else if (argument.startsWith(QByteArray("-verbose"))) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf("=");
+            bool ok = false;
+            int number = argument.mid(index+1).toInt(&ok);
+            if (!ok)
+                LogError() << "Could not parse verbose level";
+            else
+                logLevel = number;
         } else if (argument.startsWith("-")) {
-            qDebug() << "Error: Unknown option" << argument << "\n";
+            LogError() << "Unknown argument" << argument << "\n";
             return 0;
         }
      }
 
-    DeploymentInfo deploymentInfo  = deployQtFrameworks(appBundlePath);
+    DeploymentInfo deploymentInfo  = deployQtFrameworks(appBundlePath, useDebugLibs);
 
     if (plugins) {
@@ -104 +123 @@
             deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins";
 
-        qDebug() << "";
-        qDebug() << "Deploying plugins from" << deploymentInfo.pluginPath;
-        deployPlugins(appBundlePath, deploymentInfo);
+        LogNormal();
+        deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
         createQtConf(appBundlePath);
     }
 
     if (dmg) {
+        LogNormal();
         createDiskImage(appBundlePath);
     }