Changeset 94

Timestamp:

Jul 29, 2009, 8:57:31 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/OS/2: Added DEFINES_RSP file generation to overcome command line length limitation when calling moc (#23).

Location:

trunk

Files:

• mkspecs/features/moc.prf (modified) (3 diffs)
• mkspecs/os2-g++/qmake.conf (modified) (1 diff)
• qmake/generators/os2/gnumake.cpp (modified) (3 diffs)

trunk/mkspecs/features/moc.prf

@@ -2 +2 @@
 #global defaults
 isEmpty(QMAKE_MOC) {
-    win32:QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe
+    win32:QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe
     else:QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
 }
@@ -11 +11 @@
 # This function on Windows puts the includes into a .inc file which moc will read, if the project
 # has more than 30 includes. We do this to overcome a command-line limit on Win < XP
-# Otherwise the function simply returns the normal command-line for moc
+# Otherwise the function simply returns the normal command-line for moc. On OS/2
+# (where similar command line length restrictions apply) the function does a similar
+# substitiution using response files defined in mkspecs/os2-*/qmake.conf (which are
+# also used by the compiler andn other tools)
 defineReplace(mocCmd) {
     win32:count($$list($$INCPATH), 40, >) {
@@ -34 +37 @@
         RET += $$QMAKE_MOC $(DEFINES) @$$INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2
         return($$RET)
+
+
+
+
+
+
+
+
     }
     return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2)

trunk/mkspecs/os2-g++/qmake.conf

@@ -59 +59 @@
     QMAKE_CFLAGS_RSP_VAR    = CFLAGS_RSP
     QMAKE_CXXFLAGS_RSP_VAR  = CXXFLAGS_RSP
+
     QMAKE_INCPATH_RSP_VAR   = INCPATH_RSP
     QMAKE_OBJECTS_RSP_VAR   = OBJECTS_RSP
-    QMAKE_RUN_CC        = $(CC) -c @$(CFLAGS_RSP) @$(INCPATH_RSP) -o $obj $src
-    QMAKE_RUN_CC_IMP    = $(CC) -c @$(CFLAGS_RSP) @$(INCPATH_RSP) -o $@ $<
-    QMAKE_RUN_CXX       = $(CXX) -c @$(CXXFLAGS_RSP) @$(INCPATH_RSP) -o $obj $src
-    QMAKE_RUN_CXX_IMP   = $(CXX) -c @$(CXXFLAGS_RSP) @$(INCPATH_RSP) -o $@ $<
+    QMAKE_RUN_CC        = $(CC) -c @$(CFLAGS_RSP) @$(INCPATH_RSP) -o $obj $src
+    QMAKE_RUN_CC_IMP    = $(CC) -c @$(CFLAGS_RSP) @$(INCPATH_RSP) -o $@ $<
+    QMAKE_RUN_CXX       = $(CXX) -c @$(CXXFLAGS_RSP) @$(INCPATH_RSP) -o $obj $src
+    QMAKE_RUN_CXX_IMP   = $(CXX) -c @$(CXXFLAGS_RSP) @$(INCPATH_RSP) -o $@ $<
     QMAKE_OBJECTS_REF   = @$(OBJECTS_RSP)
 }

trunk/qmake/generators/os2/gnumake.cpp

@@ -535 +535 @@
 void GNUMakefileGenerator::createCompilerResponseFiles(QTextStream &t)
 {
-    static const char *vars[] = { "CFLAGS",   /*<=*/ "QMAKE_CFLAGS",
-                                  "CXXFLAGS", /*<=*/ "QMAKE_CXXFLAGS",
-                                  "INCPATH",  /*<=*/ "INCLUDEPATH" };
+    static const char *vars[] = { "CFLAGS", "CXXFLAGS", "DEFINES", "INCPATH" };
 
     /* QMAKE_XXX_RSP_VAR is used as a flag whether it is necessary to
@@ -546 +544 @@
      * other places of qmake.conf (e.g. rules) */
 
-    for (size_t i = 0; i < sizeof(vars)/sizeof(vars[0]); i+=2) {
+    for (size_t i = 0; i < sizeof(vars)/sizeof(vars[0]); ) {
         QString rspVar =
             project->first(QString().sprintf("QMAKE_%s_RSP_VAR", vars[i]));
@@ -555 +553 @@
             if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
                 QTextStream rt(&file);
-                if (!qstrcmp(vars[i+1], "INCLUDEPATH")) {
+                if (!qstrcmp(vars[i], "CFLAGS")) {
+                    rt << varGlue("QMAKE_CFLAGS", QString::null, "\n", "\n");
+                } else if (!qstrcmp(vars[i], "CXXFLAGS")) {
+                    rt << varGlue("QMAKE_CXXFLAGS", QString::null, "\n", "\n");
+                } else if (!qstrcmp(vars[i], "DEFINES")) {
+                    rt << varGlue("PRL_EXPORT_DEFINES", "-D", "\n-D", "\n")
+                       << varGlue("DEFINES", "-D", "\n-D", "\n");
+                } else if (!qstrcmp(vars[i], "INCPATH")) {
                     QString opt = var("QMAKE_CFLAGS_INCDIR");
-                    rt << varGlue(vars[i+1], opt, "\n" + opt, "\n");
+                    rt << varGlue(, opt, "\n" + opt, "\n");
                 } else {
-                    rt << varGlue(vars[i+1], QString::null, "\n", "\n")
-                       << varGlue("PRL_EXPORT_DEFINES", "-D", "\n-D", "\n")
-                       << varGlue("DEFINES", "-D", "\n-D", "\n");
+                    Q_ASSERT(false);
                 }
                 rt.flush();