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

@@ -1388,33 +1388,6 static void writeHelperFunctions(QTextStream &stream, const AbstractMetaClass *m
1388	<< "}" << endl << endl;	1388	<< "}" << endl << endl;
1389	}	1389	}
1390		1390
1391	void writeQtScriptQtBindingsLicense(QTextStream &stream)
1392	{
1393	stream
1394	<< "/****************************************************************************" << endl
1395	<< "**" << endl
1396	<< "** Copyright (C) 2008 Trolltech ASA. All rights reserved." << endl
1397	<< "**" << endl
1398	<< "** This file is part of the Qt Script Qt Bindings project on Trolltech Labs." << endl
1399	<< "**" << endl
1400	<< "** This file may be used under the terms of the GNU General Public" << endl
1401	<< "** License version 2.0 as published by the Free Software Foundation" << endl
1402	<< "** and appearing in the file LICENSE.GPL included in the packaging of" << endl
1403	<< "** this file. Please review the following information to ensure GNU" << endl
1404	<< "** General Public Licensing requirements will be met:" << endl
1405	<< "** http://www.trolltech.com/products/qt/opensource.html" << endl
1406	<< "**" << endl
1407	<< "** If you are unsure which license is appropriate for your use, please" << endl
1408	<< "** review the following information:" << endl
1409	<< "** http://www.trolltech.com/products/qt/licensing.html or contact the" << endl
1410	<< "** sales department at sales@trolltech.com." << endl
1411	<< "**" << endl
1412	<< "** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE" << endl
1413	<< "** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE." << endl
1414	<< "**" << endl
1415	<< "****************************************************************************/" << endl
1416	<< endl;
1417	}
1418		1391
1419	/*!	1392	/*!
1420	Finds the functions in \a meta_class that we actually want to	1393	Finds the functions in \a meta_class that we actually want to
@@ -1465,9 +1438,6 static void writeFunctionSignaturesString(QTextStream &s, const AbstractMetaFunc
1465	*/	1438	*/
1466	void ClassGenerator::write(QTextStream &stream, const AbstractMetaClass *meta_class)	1439	void ClassGenerator::write(QTextStream &stream, const AbstractMetaClass *meta_class)
1467	{	1440	{
1468	if (FileOut::license)
1469	writeQtScriptQtBindingsLicense(stream);
1470
1471	// write common includes	1441	// write common includes
1472	stream << "#include <QtScript/QScriptEngine>" << endl;	1442	stream << "#include <QtScript/QScriptEngine>" << endl;
1473	stream << "#include <QtScript/QScriptContext>" << endl;	1443	stream << "#include <QtScript/QScriptContext>" << endl;

generator/prigenerator.cpp +73 -2

@@ -40,6 +40,7
40	****************************************************************************/	40	****************************************************************************/
41		41
42	#include "prigenerator.h"	42	#include "prigenerator.h"
		43	#include "shellgenerator.h"
43	#include "reporthandler.h"	44	#include "reporthandler.h"
44	#include "fileout.h"	45	#include "fileout.h"
45		46
@@ -53,6 +54,63 void PriGenerator::addSource(const QString &folder, const QString &source)
53	priHash[folder].sources << source;	54	priHash[folder].sources << source;
54	}	55	}
55		56
		57	static void collectAndRemoveFile(QTextStream& stream, const QString& file) {
		58	QFile f(file);
		59	if (f.open(QIODevice::ReadOnly \| QIODevice::Text)) {
		60	QString s = QString::fromLatin1(f.readAll());
		61	if (file.endsWith(".cpp")) {
		62	// remove first line include
		63	s = s.mid(s.indexOf('\n')+1);
		64	}
		65	stream << s;
		66	f.close();
		67	QFile::remove(file);
		68	}
		69	}
		70
		71	static QString combineIncludes(const QString& text) {
		72	QStringList lines = text.split('\n');
		73	QSet<QString> includes;
		74	QString result;
		75	foreach(QString line, lines) {
		76	if (line.startsWith("#include")) {
		77	includes.insert(line);
		78	} else if (line.startsWith("#")) {
		79	// skip preprocessor stuff
		80	} else {
		81	result += line + "\n";
		82	}
		83	}
		84	QStringList includeList = includes.toList();
		85	qSort(includeList);
		86	result = includeList.join("\n") + result;
		87	return result;
		88	}
		89
		90	static QStringList compactFiles(const QStringList& list, const QString& ext, const QString& dir, const QString& prefix) {
		91	QStringList outList;
		92	int count = list.count();
		93	int fileNum = 0;
		94	while (count>0) {
		95	QString outFileName = prefix + QString::number(fileNum) + ext;
		96	FileOut file(dir + "/" + outFileName);
		97	if (ext == ".cpp") {
		98	file.stream << "#include \"" + prefix + QString::number(fileNum) + ".h\"\n";
		99	}
		100	outList << outFileName;
		101	QString allText;
		102	QTextStream ts(&allText);
		103	for (int i = 0; i<MAX_CLASSES_PER_FILE && count>0; i++) {
		104	collectAndRemoveFile(ts, dir + "/" + list.at(list.length()-count));
		105	count--;
		106	}
		107	allText = combineIncludes(allText);
		108	file.stream << allText;
		109	fileNum++;
		110	}
		111	return outList;
		112	}
		113
56	void PriGenerator::generate()	114	void PriGenerator::generate()
57	{	115	{
58	QHashIterator<QString, Pri> pri(priHash);	116	QHashIterator<QString, Pri> pri(priHash);
@@ -63,9 +121,19 void PriGenerator::generate()
63	continue;	121	continue;
64		122
65	QString folder = pri.key();	123	QString folder = pri.key();
66	FileOut file(m_out_dir + "/generated_cpp/" + folder + "/" + folder + ".pri");	124	folder.replace('\\','/');
67	file.stream << "HEADERS += \\\n";	125	folder = folder.left(folder.indexOf('/'));
		126
68	qSort(list.begin(), list.end());	127	qSort(list.begin(), list.end());
		128	FileOut file(m_out_dir + "/generated_cpp/" + pri.key());
		129
		130	// strange idea to do the file compacting so late, but it is the most effective way without patching the generator a lot
		131	bool compact = true;
		132	if (compact) {
		133	list = compactFiles(list, ".h", m_out_dir + "/generated_cpp/" + folder, folder);
		134	}
		135
		136	file.stream << "HEADERS += \\\n";
69	foreach (const QString &entry, list) {	137	foreach (const QString &entry, list) {
70	file.stream << " $$PWD/" << entry << " \\\n";	138	file.stream << " $$PWD/" << entry << " \\\n";
71	}	139	}
@@ -74,6 +142,9 void PriGenerator::generate()
74	file.stream << "SOURCES += \\\n";	142	file.stream << "SOURCES += \\\n";
75	list = pri.value().sources;	143	list = pri.value().sources;
76	qSort(list.begin(), list.end());	144	qSort(list.begin(), list.end());
		145	if (compact) {
		146	list = compactFiles(list, ".cpp", m_out_dir + "/generated_cpp/" + folder, folder);
		147	}
77	foreach (const QString &entry, list) {	148	foreach (const QString &entry, list) {
78	file.stream << " $$PWD/" << entry << " \\\n";	149	file.stream << " $$PWD/" << entry << " \\\n";
79	}	150	}

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) {
+                  for (int i=0; i<(list.count()+MAX_CLASSES_PER_FILE-1) / MAX_CLASSES_PER_FILE; i++) {
-                    s << "#include \"" << ShellGenerator::wrapperClassName(cls) << ".h\"" << endl;
+                    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