Changeset 94 for trunk/mkspecs

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/mkspecs

Files:

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

trunk/mkspecs/features/moc.prf

@@ -2 +2 @@
 #global defaults
 isEmpty(QMAKE_MOC) {
-    win32:QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe
+    win32|os2: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)
+    }
+    os2 {
+        isEmpty(QMAKE_INCPATH_RSP_VAR):I = $(INCPATH)
+        else:I = @$($$QMAKE_INCPATH_RSP_VAR)
+        isEmpty(QMAKE_DEFINES_RSP_VAR):D = $(INCPATH)
+        else:D = @$($$QMAKE_DEFINES_RSP_VAR)
+
+        return($$QMAKE_MOC $$D $$I $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2)
     }
     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_DEFINES_RSP_VAR   = DEFINES_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) @$(DEFINES_RSP) @$(INCPATH_RSP) -o $obj $src
+    QMAKE_RUN_CC_IMP    = $(CC) -c @$(CFLAGS_RSP) @$(DEFINES_RSP) @$(INCPATH_RSP) -o $@ $<
+    QMAKE_RUN_CXX       = $(CXX) -c @$(CXXFLAGS_RSP) @$(DEFINES_RSP) @$(INCPATH_RSP) -o $obj $src
+    QMAKE_RUN_CXX_IMP   = $(CXX) -c @$(CXXFLAGS_RSP) @$(DEFINES_RSP) @$(INCPATH_RSP) -o $@ $<
     QMAKE_OBJECTS_REF   = @$(OBJECTS_RSP)
 }