Changeset 1026 for trunk

Timestamp:

Aug 25, 2011, 9:22:50 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

mkspecs/os2: Use FAST_BUILD make macro to disable slow noncritical steps.

At present, setting FAST_BUILD will disable generation of the .sym file for the
EXE or DLL target as this involves a slow script that converts Watcom maps to
IBM maps and a very slow mapsym utility (they both may take tens of minutes
to finish if the original DLL has a lot of exports, like QtGui or QtWebKit).

Location:

trunk/mkspecs

Files:

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

trunk/mkspecs/features/os2/sym.prf

@@ -3 +3 @@
 exe_or_dll { 
     build_pass|isEmpty(BUILDS) {
-        !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK += $$escape_expand(\\n\\t)
-        QMAKE_POST_LINK += $$QMAKE_RUN_MAPSYM
+        !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n)
+        QMAKE_POST_LINK = $$QMAKE_POST_LINK$$QMAKE_IFNDEF FAST_BUILD$$escape_expand(\\n\\t)
+        QMAKE_POST_LINK = $$QMAKE_POST_LINK$$QMAKE_RUN_MAPSYM
         QMAKE_CLEAN += $$QMAKE_SYM_FILE
         !contains(CONFIG, map) {
             QMAKE_LFLAGS += $$QMAKE_LFLAGS_MAP # from map.prf
-            QMAKE_POST_LINK += $$escape_expand(\\n\\t)$(DEL_FILE) $$QMAKE_MAP_FILE
+            QMAKE_POST_LINK $$escape_expand(\\n\\t)$(DEL_FILE) $$QMAKE_MAP_FILE
         }
-    
         # also copy .sym file to DLLDESTDIR (as Win32MakefileGenerator does for .dll)
         !isEmpty(DLLDESTDIR) {
             for(d, DLLDESTDIR) {
-                QMAKE_POST_LINK += $$escape_expand(\\n\\t)-$(COPY_FILE) $$QMAKE_SYM_FILE $$fixpath_target($$d)
+                QMAKE_POST_LINK $$escape_expand(\\n\\t)-$(COPY_FILE) $$QMAKE_SYM_FILE $$fixpath_target($$d)
             }
         }
+
         
         # also install .sym file to target.path

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

@@ -175 +175 @@
     $(QMAKESPECDIR)\\wmapsym.cmd $$QMAKE_MAP_FILE $$QMAKE_SYM_FILE
 
+
+
+
+
 load(qt_config)