MCL/sf/mw/qt: comparison tools/linguist/lrelease/main.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 ****************************************************************************/
 #include "translator.h"
 #include "proreader.h"
+#ifndef QT_BOOTSTRAPPED
 #include <QtCore/QCoreApplication>
+#include <QtCore/QTranslator>
+#endif
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QRegExp>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QTextStream>
-#include <QtCore/QTranslator>
+QT_USE_NAMESPACE
+#ifdef QT_BOOTSTRAPPED
+static void initBinaryDir(
+#ifndef Q_OS_WIN
+const char *argv0
+#endif
+);
+#endif
 static void printOut(const QString & out)
 {
 QTextStream stream(stdout);
 stream << out;
 "    -nounfinished\n"
 "           Do not include unfinished translations\n"
 "    -removeidentical\n"
 "           If the translated text is the same as\n"
 "           the source text, do not include the message\n"
+"    -markuntranslated <prefix>\n"
+"           If a message has no real translation, use the source text\n"
+"           prefixed with the given string instead\n"
 "    -silent\n"
 "           Do not explain what is being done\n"
 "    -version\n"
 "           Display the version of lrelease and exit\n"
 ));
 }
 return ok;
 }
 static bool releaseTranslator(Translator &tor, const QString &qmFileName,
-bool verbose, bool ignoreUnfinished,
+ConversionData &cd, bool removeIdentical)
-bool removeIdentical, bool idBased, TranslatorSaveMode mode)
+{
-{
+tor.reportDuplicates(tor.resolveDuplicates(), qmFileName, cd.isVerbose());
-Translator::reportDuplicates(tor.resolveDuplicates(), qmFileName, verbose);
+if (cd.isVerbose())
-if (verbose)
 printOut(QCoreApplication::tr( "Updating '%1'...\n").arg(qmFileName));
 if (removeIdentical) {
-if ( verbose )
+if (cd.isVerbose())
 printOut(QCoreApplication::tr( "Removing translations equal to source text in '%1'...\n").arg(qmFileName));
 tor.stripIdenticalSourceTranslations();
 }
 QFile file(qmFileName);
 qWarning("lrelease error: cannot create '%s': %s\n",
 qPrintable(qmFileName), qPrintable(file.errorString()));
 return false;
 }
-ConversionData cd;
 tor.normalizeTranslations(cd);
-cd.m_verbose = verbose;
-cd.m_ignoreUnfinished = ignoreUnfinished;
-cd.m_idBased = idBased;
-cd.m_saveMode = mode;
 bool ok = tor.release(&file, cd);
 file.close();
 if (!ok) {
 qWarning("lrelease error: cannot save '%s': %s\n",
 printOut(cd.error());
 }
 return true;
 }
-static bool releaseTsFile(const QString& tsFileName, bool verbose,
+static bool releaseTsFile(const QString& tsFileName,
-bool ignoreUnfinished, bool removeIdentical, bool idBased, TranslatorSaveMode mode)
+ConversionData &cd, bool removeIdentical)
 {
 Translator tor;
-if (!loadTsFile(tor, tsFileName, verbose))
+if (!loadTsFile(tor, tsFileName, cd.isVerbose()))
 return false;
 QString qmFileName = tsFileName;
 foreach (const Translator::FileFormat &fmt, Translator::registeredFileFormats()) {
 if (qmFileName.endsWith(QLatin1Char('.') + fmt.extension)) {
 break;
 }
 }
 qmFileName += QLatin1String(".qm");
-return releaseTranslator(tor, qmFileName, verbose, ignoreUnfinished, removeIdentical, idBased, mode);
+return releaseTranslator(tor, qmFileName, cd, removeIdentical);
 }
 int main(int argc, char **argv)
 {
+#ifdef QT_BOOTSTRAPPED
+initBinaryDir(
+#ifndef Q_OS_WIN
+argv[0]
+#endif
+);
+#else
 QCoreApplication app(argc, argv);
-QStringList args = app.arguments();
 QTranslator translator;
 if (translator.load(QLatin1String("lrelease_") + QLocale::system().name()))
 app.installTranslator(&translator);
+#endif
-bool verbose = true; // the default is true starting with Qt 4.2
-bool ignoreUnfinished = false;
+ConversionData cd;
-bool idBased = false;
+cd.m_verbose = true; // the default is true starting with Qt 4.2
-// the default mode is SaveEverything starting with Qt 4.2
-TranslatorSaveMode mode = SaveEverything;
 bool removeIdentical = false;
 Translator tor;
+QStringList inputFiles;
 QString outputFile;
-int numFiles = 0;
 for (int i = 1; i < argc; ++i) {
-if (args[i] == QLatin1String("-compress")) {
+if (!strcmp(argv[i], "-compress")) {
-mode = SaveStripped;
+cd.m_saveMode = SaveStripped;
 continue;
-} else if (args[i] == QLatin1String("-idbased")) {
+} else if (!strcmp(argv[i], "-idbased")) {
-idBased = true;
+cd.m_idBased = true;
 continue;
-} else if (args[i] == QLatin1String("-nocompress")) {
+} else if (!strcmp(argv[i], "-nocompress")) {
-mode = SaveEverything;
+cd.m_saveMode = SaveEverything;
 continue;
-} else if (args[i] == QLatin1String("-removeidentical")) {
+} else if (!strcmp(argv[i], "-removeidentical")) {
 removeIdentical = true;
 continue;
-} else if (args[i] == QLatin1String("-nounfinished")) {
+} else if (!strcmp(argv[i], "-nounfinished")) {
-ignoreUnfinished = true;
+cd.m_ignoreUnfinished = true;
 continue;
-} else if (args[i] == QLatin1String("-silent")) {
+} else if (!strcmp(argv[i], "-markuntranslated")) {
-verbose = false;
-continue;
-} else if (args[i] == QLatin1String("-verbose")) {
-verbose = true;
-continue;
-} else if (args[i] == QLatin1String("-version")) {
-printOut(QCoreApplication::tr( "lrelease version %1\n").arg(QLatin1String(QT_VERSION_STR)) );
-return 0;
-} else if (args[i] == QLatin1String("-qm")) {
 if (i == argc - 1) {
 printUsage();
 return 1;
 }
-i++;
+cd.m_unTrPrefix = QString::fromLocal8Bit(argv[++i]);
-outputFile = args[i];
+} else if (!strcmp(argv[i], "-silent")) {
-} else if (args[i] == QLatin1String("-help")) {
+cd.m_verbose = false;
+continue;
+} else if (!strcmp(argv[i], "-verbose")) {
+cd.m_verbose = true;
+continue;
+} else if (!strcmp(argv[i], "-version")) {
+printOut(QCoreApplication::tr( "lrelease version %1\n").arg(QLatin1String(QT_VERSION_STR)) );
+return 0;
+} else if (!strcmp(argv[i], "-qm")) {
+if (i == argc - 1) {
+printUsage();
+return 1;
+}
+outputFile = QString::fromLocal8Bit(argv[++i]);
+} else if (!strcmp(argv[i], "-help")) {
 printUsage();
 return 0;
-} else if (args[i][0] == QLatin1Char('-')) {
+} else if (argv[i][0] == '-') {
 printUsage();
 return 1;
 } else {
-numFiles++;
+inputFiles << QString::fromLocal8Bit(argv[i]);
 }
 }
-if (numFiles == 0) {
+if (inputFiles.isEmpty()) {
 printUsage();
 return 1;
 }
-for (int i = 1; i < argc; ++i) {
+foreach (const QString &inputFile, inputFiles) {
-if (args[i][0] == QLatin1Char('-') || args[i] == outputFile)
+if (inputFile.endsWith(QLatin1String(".pro"), Qt::CaseInsensitive)
-continue;
+|| inputFile.endsWith(QLatin1String(".pri"), Qt::CaseInsensitive)) {
-if (args[i].endsWith(QLatin1String(".pro"), Qt::CaseInsensitive)
-|| args[i].endsWith(QLatin1String(".pri"), Qt::CaseInsensitive)) {
 QHash<QByteArray, QStringList> varMap;
-bool ok = evaluateProFile(args[i], verbose, &varMap );
+bool ok = evaluateProFile(inputFile, cd.isVerbose(), &varMap);
 if (ok) {
 QStringList translations = varMap.value("TRANSLATIONS");
 if (translations.isEmpty()) {
 qWarning("lrelease warning: Met no 'TRANSLATIONS' entry in"
 " project file '%s'\n",
-qPrintable(args[i]));
+qPrintable(inputFile));
 } else {
 foreach (const QString &trans, translations)
-if (!releaseTsFile(trans, verbose, ignoreUnfinished, removeIdentical, idBased, mode))
+if (!releaseTsFile(trans, cd, removeIdentical))
 return 1;
 }
 } else {
 qWarning("error: lrelease encountered project file functionality that is currently not supported.\n"
 "You might want to consider using TS files as input instead of a project file.\n"
 "Try the following syntax:\n"
 "    lrelease [options] ts-files [-qm qm-file]\n");
 }
 } else {
 if (outputFile.isEmpty()) {
-if (!releaseTsFile(args[i], verbose, ignoreUnfinished, removeIdentical, idBased, mode))
+if (!releaseTsFile(inputFile, cd, removeIdentical))
 return 1;
 } else {
-if (!loadTsFile(tor, args[i], verbose))
+if (!loadTsFile(tor, inputFile, cd.isVerbose()))
 return 1;
 }
 }
 }
 if (!outputFile.isEmpty())
-return releaseTranslator(tor, outputFile, verbose, ignoreUnfinished,
+return releaseTranslator(tor, outputFile, cd, removeIdentical) ? 0 : 1;
-removeIdentical, idBased, mode) ? 0 : 1;
 return 0;
 }
+#ifdef QT_BOOTSTRAPPED
+#ifdef Q_OS_WIN
+# include <windows.h>
+#endif
+static QString binDir;
+static void initBinaryDir(
+#ifndef Q_OS_WIN
+const char *_argv0
+#endif
+)
+{
+#ifdef Q_OS_WIN
+wchar_t module_name[MAX_PATH];
+GetModuleFileName(0, module_name, MAX_PATH);
+QFileInfo filePath = QString::fromWCharArray(module_name);
+binDir = filePath.filePath();
+#else
+QString argv0 = QFile::decodeName(QByteArray(_argv0));
+QString absPath;
+if (!argv0.isEmpty() && argv0.at(0) == QLatin1Char('/')) {
+/*
+If argv0 starts with a slash, it is already an absolute
+file path.
+*/
+absPath = argv0;
+} else if (argv0.contains(QLatin1Char('/'))) {
+/*
+If argv0 contains one or more slashes, it is a file path
+relative to the current directory.
+*/
+absPath = QDir::current().absoluteFilePath(argv0);
+} else {
+/*
+Otherwise, the file path has to be determined using the
+PATH environment variable.
+*/
+QByteArray pEnv = qgetenv("PATH");
+QDir currentDir = QDir::current();
+QStringList paths = QString::fromLocal8Bit(pEnv.constData()).split(QLatin1String(":"));
+for (QStringList::const_iterator p = paths.constBegin(); p != paths.constEnd(); ++p) {
+if ((*p).isEmpty())
+continue;
+QString candidate = currentDir.absoluteFilePath(*p + QLatin1Char('/') + argv0);
+QFileInfo candidate_fi(candidate);
+if (candidate_fi.exists() && !candidate_fi.isDir()) {
+binDir = candidate_fi.canonicalPath();
+return;
+}
+}
+return;
+}
+QFileInfo fi(absPath);
+if (fi.exists())
+binDir = fi.canonicalPath();
+#endif
+}
+QT_BEGIN_NAMESPACE
+// The name is hard-coded in QLibraryInfo
+QString qmake_libraryInfoFile()
+{
+if (binDir.isEmpty())
+return QString();
+return QDir(binDir).filePath(QString::fromLatin1("qt.conf"));
+}
+QT_END_NAMESPACE
+#endif // QT_BOOTSTRAPPED

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7