Changeset 561 for trunk/tools/linguist/lupdate

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/linguist/lupdate/cpp.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/tools/linguist/lupdate/cpp.cpp )
• tools/linguist/lupdate/java.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/tools/linguist/lupdate/java.cpp )
• tools/linguist/lupdate/lupdate.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/tools/linguist/lupdate/lupdate.h )
• tools/linguist/lupdate/lupdate.pro (modified) (1 diff)
• tools/linguist/lupdate/main.cpp (modified) (19 diffs)
• tools/linguist/lupdate/merge.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/tools/linguist/lupdate/merge.cpp )
• tools/linguist/lupdate/qscript.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/tools/linguist/lupdate/qscript.cpp )
• tools/linguist/lupdate/qscript.g (copied) (copied from branches/vendor/nokia/qt/4.6.1/tools/linguist/lupdate/qscript.g )
• tools/linguist/lupdate/ui.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/tools/linguist/lupdate/ui.cpp )

trunk/tools/linguist/lupdate/lupdate.pro

@@ -15 +15 @@
 include(../shared/formats.pri)
 include(../shared/proparser.pri)
-include(../shared/translatortools.pri)
 
-SOURCES += main.cpp
+SOURCES += \
+    main.cpp \
+    merge.cpp \
+    ../shared/simtexth.cpp \
+    \
+    cpp.cpp \
+    java.cpp \
+    qscript.cpp \
+    ui.cpp
+
+HEADERS += \
+    lupdate.h \
+    ../shared/simtexth.h
 
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII

trunk/tools/linguist/lupdate/main.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 Qt Linguist 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$
 **
 ****************************************************************************/
 
-#include "translator.h"
-#include "translatortools.h"
-#include "profileevaluator.h"
+#include "lupdate.h"
+
+#include <translator.h>
+#include <profileevaluator.h>
+#include <proreader.h>
 
 #include <QtCore/QCoreApplication>
@@ -53 +55 @@
 #include <QtCore/QTextCodec>
 
+
+
 static QString m_defaultExtensions;
 
-static void printOut(const QString & out)
+static void print(const QString & out)
 {
     qWarning("%s", qPrintable(out));
 }
 
+
+
+
+
+
 static void recursiveFileInfoList(const QDir &dir,
-    const QStringList &nameFilters, QDir::Filters filter, bool recursive,
+    const QS,
     QFileInfoList *fileinfolist)
 {
-    if (recursive)
-        filter |= QDir::AllDirs;
-    QFileInfoList entries = dir.entryInfoList(nameFilters, filter);
-
-    QFileInfoList::iterator it;
-    for (it = entries.begin(); it != entries.end(); ++it) {
-        QString fname = it->fileName();
-        if (fname != QLatin1String(".") && fname != QLatin1String("..")) {
-            if (it->isDir())
-                recursiveFileInfoList(QDir(it->absoluteFilePath()), nameFilters, filter, recursive, fileinfolist);
-            else
-                fileinfolist->append(*it);
-        }
-    }
+    foreach (const QFileInfo &fi, dir.entryInfoList(filter))
+        if (fi.isDir())
+            recursiveFileInfoList(QDir(fi.absoluteFilePath()), nameFilters, filter, fileinfolist);
+        else if (nameFilters.contains(fi.suffix()))
+            fileinfolist->append(fi);
 }
 
@@ -84 +84 @@
     printOut(QObject::tr(
         "Usage:\n"
-        "    lupdate [options] [project-file]\n"
+        "    lupdate [options] [project-file]\n"
         "    lupdate [options] [source-file|path]... -ts ts-files\n\n"
-        "lupdate is part of Qt's Linguist tool chain. It can be used as a\n"
-        "stand-alone tool to create XML based translations files in the .ts\n"
-        "format from translatable messages in C++ and Java source code.\n\n"
-        "lupdate can also merge such messages into existing .ts files.\n\n"
+        "lupdate is part of Qt's Linguist tool chain. It \n"
+        "\n"
+        "\n"
+        " files.\n\n"
         "Options:\n"
         "    -help  Display this information and exit.\n"
@@ -103 +103 @@
         "           Do not explain what is being done.\n"
         "    -no-sort\n"
-        "           Do not sort contexts in .ts files.\n"
+        "           Do not sort contexts in  files.\n"
         "    -no-recursive\n"
         "           Do not recursively scan the following directories.\n"
         "    -recursive\n"
-        "           Recursively scan the following directories.\n"
+        "           Recursively scan the following directories (default).\n"
+        "    -I <includepath> or -I<includepath>\n"
+        "           Additional location to look for include files.\n"
+        "           May be specified multiple times.\n"
         "    -locations {absolute|relative|none}\n"
-        "           Specify/override how source code references are saved in ts files.\n"
+        "           Specify/override how source code references are saved in  files.\n"
         "           Default is absolute.\n"
         "    -no-ui-lines\n"
-        "           Do not record line numbers in references to .ui files.\n"
+        "           Do not record line numbers in references to  files.\n"
         "    -disable-heuristic {sametext|similartext|number}\n"
         "           Disable the named merge heuristic. Can be specified multiple times.\n"
@@ -119 +122 @@
         "           file syntax but different file suffix\n"
         "    -source-language <language>[_<region>]\n"
-        "           Specify/override the language of the source strings. Defaults to\n"
-        "           POSIX if not specified and the file does not name it yet.\n"
+        "           Specify\n"
+        "           .\n"
         "    -target-language <language>[_<region>]\n"
-        "           Specify/override the language of the translation.\n"
-        "           The target language is guessed from the file name if this option\n"
-        "           is not specified and the file contents name no language yet.\n"
+        "           Specify the language of the translations for new files.\n"
+        "           Guessed from the file name if not specified.\n"
         "    -version\n"
         "           Display the version of lupdate and exit.\n"
@@ -143 +145 @@
         if (QFile(fileName).exists()) {
             if (!tor.load(fileName, cd, QLatin1String("auto"))) {
-                printOut(cd.error());
+                print(cd.error());
                 *fail = true;
                 continue;
@@ -166 +168 @@
             if (!targetLanguage.isEmpty())
                 tor.setLanguageCode(targetLanguage);
+
+
             if (!sourceLanguage.isEmpty())
                 tor.setSourceLanguageCode(sourceLanguage);
@@ -179 +183 @@
             printOut(QObject::tr("Updating '%1'...\n").arg(fn));
 
+
         if (tor.locationsType() == Translator::NoLocations) // Could be set from file
-            options |= NoLocations;
-        Translator out = merge(tor, fetchedTor, options, err);
+            ptions |= NoLocations;
+        Translator out = merge(tor, fetchedTor, ptions, err);
         if (!codecForTr.isEmpty())
             out.setCodecName(codecForTr);
@@ -198 +203 @@
         out.stripEmptyContexts();
 
+
+
+
+
+
         if (!out.save(fileName, cd, QLatin1String("auto"))) {
-            printOut(cd.error());
+            print(cd.error());
             *fail = true;
         }
@@ -217 +227 @@
     QStringList tsFileNames;
     QStringList proFiles;
+
+
     QStringList sourceFiles;
+
     QString targetLanguage;
     QString sourceLanguage;
@@ -230 +243 @@
 
     QString extensions = m_defaultExtensions;
-    QStringList extensionsNameFilters;
+    QS extensionsNameFilters;
 
     for (int  i = 1; i < argc; ++i) {
@@ -343 +356 @@
             proFiles += args[i];
             numFiles++;
+
+
+
+
+
+
+
+
+
+
+
+
             continue;
         } else if (arg.startsWith(QLatin1String("-")) && arg != QLatin1String("-")) {
@@ -388 +413 @@
                     printOut(QObject::tr("Scanning directory '%1'...").arg(arg));
                 QDir dir = QDir(fi.filePath());
+
                 if (extensionsNameFilters.isEmpty()) {
-                    extensions = extensions.trimmed();
-                    // Remove the potential dot in front of each extension
-                    if (extensions.startsWith(QLatin1Char('.')))
-                        extensions.remove(0,1);
-                    extensions.replace(QLatin1String(",."), QLatin1String(","));
-
-                    extensions.insert(0, QLatin1String("*."));
-                    extensions.replace(QLatin1Char(','), QLatin1String(",*."));
-                    extensionsNameFilters = extensions.split(QLatin1Char(','));
+                    foreach (QString ext, extensions.split(QLatin1Char(','))) {
+                        ext = ext.trimmed();
+                        if (ext.startsWith(QLatin1Char('.')))
+                            ext.remove(0, 1);
+                        extensionsNameFilters.insert(ext);
+                    }
                 }
                 QDir::Filters filters = QDir::Files | QDir::NoSymLinks;
+
+
                 QFileInfoList fileinfolist;
-                recursiveFileInfoList(dir, extensionsNameFilters, filters,
-                    recursiveScan, &fileinfolist);
-                QFileInfoList::iterator ii;
-                QString fn;
-                for (ii = fileinfolist.begin(); ii != fileinfolist.end(); ++ii) {
-                    // Make sure the path separator is stored with '/' in the ts file
-                    sourceFiles << ii->canonicalFilePath().replace(QLatin1Char('\\'), QLatin1Char('/'));
+                recursiveFileInfoList(dir, extensionsNameFilters, filters, &fileinfolist);
+                int scanRootLen = dir.absolutePath().length();
+                foreach (const QFileInfo &fi, fileinfolist) {
+                    QString fn = QDir::cleanPath(fi.absoluteFilePath());
+                    sourceFiles << fn;
+
+                    if (!fn.endsWith(QLatin1String(".java"))
+                        && !fn.endsWith(QLatin1String(".ui"))
+                        && !fn.endsWith(QLatin1String(".js"))
+                        && !fn.endsWith(QLatin1String(".qs"))) {
+                        int offset = 0;
+                        int depth = 0;
+                        do {
+                            offset = fn.lastIndexOf(QLatin1Char('/'), offset - 1);
+                            QString ffn = fn.mid(offset + 1);
+                            allCSources.insert(ffn, fn);
+                        } while (++depth < 3 && offset > scanRootLen);
+                    }
                 }
             } else {
-                sourceFiles << fi.canonicalFilePath().replace(QLatin1Char('\\'), QLatin1Char('/'));
+                sourceFiles << ;
             }
         }
     } // for args
 
+
+
 
     bool firstPass = true;
@@ -422 +460 @@
         cd.m_defaultContext = defaultContext;
         cd.m_noUiLines = options & NoUiLines;
+
+
+
 
         QStringList tsFiles = tsFileNames;
@@ -451 +492 @@
             }
 
-            evaluateProFile(visitor, &variables);
+            cd.m_includePath += visitor.values(QLatin1String("INCLUDEPATH"));
+
+            evaluateProFile(visitor, &variables, pfi.absolutePath());
 
             sourceFiles = variables.value("SOURCES");
@@ -459 +502 @@
                 codecForTr = tmp.first().toLatin1();
                 fetchedTor.setCodecName(codecForTr);
+
             }
             tmp = variables.value("CODECFORSRC");
@@ -473 +517 @@
         }
 
+
         for (QStringList::iterator it = sourceFiles.begin(); it != sourceFiles.end(); ++it) {
-            if (it->endsWith(QLatin1String(".java"), Qt::CaseInsensitive)) {
-                cd.m_sourceFileName = *it;
-                fetchedTor.load(*it, cd, QLatin1String("java"));
-                //fetchtr_java(*it, &fetchedTor, defaultContext, true, codecForSource);
-            }
-            else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive)) {
-                fetchedTor.load(*it, cd, QLatin1String("ui"));
-                //fetchedTor.load(*it + QLatin1String(".h"), cd, QLatin1String("cpp"));
-                //fetchtr_ui(*it, &fetchedTor, defaultContext, true);
-                //fetchtr_cpp(*it + QLatin1String(".h"), &fetchedTor,
-                //             defaultContext, false, codecForSource);
-            }
+            if (it->endsWith(QLatin1String(".java"), Qt::CaseInsensitive))
+                loadJava(fetchedTor, *it, cd);
+            else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive)
+                     || it->endsWith(QLatin1String(".jui"), Qt::CaseInsensitive))
+                loadUI(fetchedTor, *it, cd);
             else if (it->endsWith(QLatin1String(".js"), Qt::CaseInsensitive)
-                || it->endsWith(QLatin1String(".qs"), Qt::CaseInsensitive)) {
-                fetchedTor.load(*it, cd, QLatin1String("js"));
-            } else {
-                fetchedTor.load(*it, cd, QLatin1String("cpp"));
-                //fetchtr_cpp(*it, &fetchedTor, defaultContext, true, codecForSource);
-            }
-        }
+                     || it->endsWith(QLatin1String(".qs"), Qt::CaseInsensitive))
+                loadQScript(fetchedTor, *it, cd);
+            else
+                sourceFilesCpp << *it;
+        }
+        loadCPP(fetchedTor, sourceFilesCpp, cd);
         if (!cd.error().isEmpty())
             printOut(cd.error());