Changeset 35 for trunk/qmake/generators/os2/gnumake.cpp

Timestamp:

Jun 17, 2009, 11:30:01 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: os2/GNUMAKE: Overcome 1024 char CMD.EXE limitation with response files.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -338 +338 @@
 void GNUMakefileGenerator::writeObjectsPart(QTextStream &t)
 {
-    /* @todo generate response files for the linker to overcome the 1024 chars
-     * CMD.EXE limitation */
     Win32MakefileGenerator::writeObjectsPart(t);
+    createLinkerResponseFiles(t);
+
+    /* this function is a nice place to also handle compiler options response
+     * files */
+    createCompilerResponseFiles(t);
 }
 
@@ -428 +431 @@
 }
 
+void GNUMakefileGenerator::writeProjectVarToStream(QTextStream &t, const QString &var)
+{
+    QStringList &list = project->values(var);
+    for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) {
+        t << (*it) << endl;
+    }
+}
+
+QString GNUMakefileGenerator::makeResponseFileName(const QString &base)
+{
+    QString fileName = base + "." + var("TARGET");
+    if (!var("BUILD_NAME").isEmpty()) {
+        fileName += "." + var("BUILD_NAME");
+    }
+    fileName += ".rsp";
+    QString filePath = project->first("OBJECTS_DIR");
+    if (filePath.isEmpty())
+        filePath = Option::output_dir;
+    filePath = Option::fixPathToTargetOS(filePath + QDir::separator() + fileName);
+    return filePath;
+}
+
+void GNUMakefileGenerator::createCompilerResponseFiles(QTextStream &t)
+{
+    static const char *vars[] = { "CFLAGS",   /*<=*/ "QMAKE_CFLAGS",
+                                  "CXXFLAGS", /*<=*/ "QMAKE_CXXFLAGS",
+                                  "INCPATH",  /*<=*/ "INCPATH" };
+
+    /* QMAKE_XXX_RSP_VAR is used as a flag whether it is necessary to
+     * generate response files to overcome the 1024 chars CMD.EXE limitation.
+     * When this variable is defined, a response file with the relevant
+     * information will be generated and its full path will be stored in an
+     * environment variable with the given name which can then be referred to in
+     * other places of qmake.conf (e.g. rules) */
+
+    for (size_t i = 0; i < sizeof(vars)/sizeof(vars[0]); i+=2) {
+        QString rspVar =
+            project->first(QString().sprintf("QMAKE_%s_RSP_VAR", vars[i]));
+        if (!rspVar.isEmpty()) {
+            QString fileName = makeResponseFileName(vars[i]);
+            t << rspVar.leftJustified(14) << "= " << fileName << endl;
+            QFile file(fileName);
+            if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+                QTextStream rt(&file);
+                writeProjectVarToStream(rt, vars[i+1]);
+                rt.flush();
+                file.close();
+            }
+            project->values("QMAKE_DISTCLEAN").append("$(" + rspVar + ")");
+        }
+    }
+}
+
+void GNUMakefileGenerator::createLinkerResponseFiles(QTextStream &t)
+{
+    /* see createCompilerResponseFiles() */
+    QString var = project->first("QMAKE_OBJECTS_RSP_VAR");
+    if (!var.isEmpty()) {
+        QString fileName = makeResponseFileName("OBJECTS");
+        t << var.leftJustified(14) << "= " << fileName << endl;
+        QFile file(fileName);
+        if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            QTextStream rt(&file);
+            writeProjectVarToStream(rt, "OBJECTS");
+            rt.flush();
+            file.close();
+        }
+        project->values("QMAKE_DISTCLEAN").append("$(" + var + ")");
+    }
+}
+
 QT_END_NAMESPACE