GIT_REPOSITORIES/LPP/PythonQt Commit - r92:f97ec94c87a9

added experimental compacting to avoid generation of hundreds of files that all include the same stuff...

florianlink -

r92:f97ec94c87a9

parent child

Context file:

r92:f97ec94c87a9

Collapse all files

generator/classgenerator.cpp 0 -30

                         << "}" << endl << endl;
              }
-             void writeQtScriptQtBindingsLicense(QTextStream &stream)
+             {
-                 stream
-                     << "/****************************************************************************" << endl
-                     << "**" << endl
-                     << "** Copyright (C) 2008 Trolltech ASA. All rights reserved." << endl
-                     << "**" << endl
-                     << "** This file is part of the Qt Script Qt Bindings project on Trolltech Labs." << endl
-                     << "**" << endl
-                     << "** This file may be used under the terms of the GNU General Public" << endl
-                     << "** License version 2.0 as published by the Free Software Foundation" << endl
-                     << "** and appearing in the file LICENSE.GPL included in the packaging of" << endl
-                     << "** this file.  Please review the following information to ensure GNU" << endl
-                     << "** General Public Licensing requirements will be met:" << endl
-                     << "** http://www.trolltech.com/products/qt/opensource.html" << endl
-                     << "**" << endl
-                     << "** If you are unsure which license is appropriate for your use, please" << endl
-                     << "** review the following information:" << endl
-                     << "** http://www.trolltech.com/products/qt/licensing.html or contact the" << endl
-                     << "** sales department at sales@trolltech.com." << endl
-                     << "**" << endl
-                     << "** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE" << endl
-                     << "** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE." << endl
-                     << "**" << endl
-                     << "****************************************************************************/" << endl
-                     << endl;
+             }
              /*!
                Finds the functions in \a meta_class that we actually want to
              */
              void ClassGenerator::write(QTextStream &stream, const AbstractMetaClass *meta_class)
              {
-                 if (FileOut::license)
-                     writeQtScriptQtBindingsLicense(stream);
                  // write common includes
                  stream << "#include <QtScript/QScriptEngine>" << endl;
                  stream << "#include <QtScript/QScriptContext>" << endl;

generator/prigenerator.cpp +73 -2

              ****************************************************************************/
              #include "prigenerator.h"
+             #include "shellgenerator.h"
              #include "reporthandler.h"
              #include "fileout.h"
                  priHash[folder].sources << source;
              }
+             static void collectAndRemoveFile(QTextStream& stream, const QString& file) {
+               QFile f(file);
+               if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                 QString s = QString::fromLatin1(f.readAll());
+                 if (file.endsWith(".cpp")) {
+                   // remove first line include
+                   s = s.mid(s.indexOf('\n')+1);
+                 }
+                 stream << s;
+                 f.close();
+                 QFile::remove(file);
+               }
+             }
+             static QString combineIncludes(const QString& text) {
+               QStringList lines = text.split('\n');
+               QSet<QString> includes;
+               QString result;
+               foreach(QString line, lines) {
+                 if (line.startsWith("#include")) {
+                   includes.insert(line);
+                 } else if (line.startsWith("#")) {
+                   // skip preprocessor stuff
+                 } else {
+                   result += line + "\n";
+                 }
+               }
+               QStringList includeList = includes.toList();
+               qSort(includeList);
+               result = includeList.join("\n") + result;
+               return result;
+             }
+             static QStringList compactFiles(const QStringList& list, const QString& ext, const QString& dir, const QString& prefix) {
+               QStringList outList;
+               int count = list.count();
+               int fileNum = 0;
+               while (count>0) {
+                 QString outFileName = prefix + QString::number(fileNum) + ext;
+                 FileOut file(dir + "/" + outFileName);
+                 if (ext == ".cpp") {
+                   file.stream << "#include \"" + prefix + QString::number(fileNum) + ".h\"\n";
+                 }
+                 outList << outFileName;
+                 QString allText;
+                 QTextStream ts(&allText);
+                 for (int i = 0; i<MAX_CLASSES_PER_FILE && count>0; i++) {
+                   collectAndRemoveFile(ts,  dir + "/" + list.at(list.length()-count));
+                   count--;
+                 }
+                 allText = combineIncludes(allText);
+                 file.stream << allText;
+                 fileNum++;
+               }
+               return outList;
+             }
              void PriGenerator::generate()
              {
                  QHashIterator<QString, Pri> pri(priHash);
                          continue;
                      QString folder = pri.key();
-                     FileOut file(m_out_dir + "/generated_cpp/" + folder + "/" + folder + ".pri");
-                     file.stream << "HEADERS += \\\n";
+                     folder.replace('\\','/');
+                     folder = folder.left(folder.indexOf('/'));
                      qSort(list.begin(), list.end());
+                     FileOut file(m_out_dir + "/generated_cpp/" + pri.key());
+                     // strange idea to do the file compacting so late, but it is the most effective way without patching the generator a lot
+                     bool compact = true;
+                     if (compact) {
+                       list = compactFiles(list, ".h", m_out_dir + "/generated_cpp/" + folder, folder);
+                     }
+                     file.stream << "HEADERS += \\\n";
                      foreach (const QString &entry, list) {
-                         file.stream << "           $$PWD/" << entry << " \\\n";
                      }
                      file.stream << "SOURCES += \\\n";
                      list = pri.value().sources;
                      qSort(list.begin(), list.end());
+                     if (compact) {
+                       list = compactFiles(list, ".cpp", m_out_dir + "/generated_cpp/" + folder, folder);
+                     }
                      foreach (const QString &entry, list) {
                          file.stream << "           $$PWD/" << entry << " \\\n";
                      }

generator/setupgenerator.cpp +2 -7

                packHash[cls->package()].append(cls);
              }
-             void writeQtScriptQtBindingsLicense(QTextStream &stream);
              void maybeDeclareMetaType(QTextStream &stream, const QString &typeName,
                                        QSet<QString> &registeredTypeNames);
              bool hasDefaultConstructor(const AbstractMetaClass *meta_class);
                    FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/" + packKey + "_init.cpp");
                    QTextStream &s = initFile.stream;
-                   if (FileOut::license)
-                     writeQtScriptQtBindingsLicense(s);
                    s << "#include <PythonQt.h>" << endl;
-                   foreach (const AbstractMetaClass *cls, list) {
-                     s << "#include \"" << ShellGenerator::wrapperClassName(cls) << ".h\"" << endl;
+                   for (int i=0; i<(list.count()+MAX_CLASSES_PER_FILE-1) / MAX_CLASSES_PER_FILE; i++) {
+                     s << "#include \"" << packKey << QString::number(i) << ".h\"" << endl;
                    }
                    s << endl;

generator/setupgenerator.h +4 0

                  void addClass(const AbstractMetaClass *cls);
+               static void writeInclude(QTextStream &stream, const Include &inc);
+               static bool isSpecialStreamingOperator(const AbstractMetaFunction *fun);
-              private:
                 QStringList writePolymorphicHandler(QTextStream &s, const QString &package,
                   const AbstractMetaClassList &classes);

generator/shellgenerator.cpp +3 0

                  builtIn.insert("QFont");
                  builtIn.insert("QPixmap");
                  builtIn.insert("QBrush");
+                 builtIn.insert("QBitArray");
                  builtIn.insert("QPalette");
+                 builtIn.insert("QPen");
                  builtIn.insert("QIcon");
                  builtIn.insert("QImage");
                  builtIn.insert("QPolygon");
                }
                return builtIn.contains(name);
              }

generator/shellgenerator.h +2 0

              #include "metaqtscript.h"
              #include "prigenerator.h"
+             #define MAX_CLASSES_PER_FILE 20
              class ShellGenerator : public Generator
              {
                  Q_OBJECT

generator/shellheadergenerator.cpp +2 -6

                return QString("PythonQtWrapper_%1.h").arg(meta_class->name());
              }
-             void writeQtScriptQtBindingsLicense(QTextStream &stream);
              void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)
              {
+               if (!ShellGenerator::isBuiltIn(meta_class->name())) {
                setupGenerator->addClass(meta_class);
-               if (FileOut::license)
-                 writeQtScriptQtBindingsLicense(s);
+               }
                QString include_block = "PYTHONQTWRAPPER_" + meta_class->name().toUpper() + "_H";

generator/shellimplgenerator.cpp 0 -4

              {
              }
-             void writeQtScriptQtBindingsLicense(QTextStream &stream);
              void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)
              {
-               if (FileOut::license)
-                 writeQtScriptQtBindingsLicense(s);
                QString pro_file_name = meta_class->package().replace(".", "_") + "/" + meta_class->package().replace(".", "_") + ".pri";

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages