Changeset 972 for trunk

Timestamp:

Aug 12, 2011, 3:53:17 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Make .sym generation part of main target rule.

Previously the .sym file was a separate rule depending on the target.
However, it actually needed not the target itself, but a map file generated
when generating the target. Since for EXE targets different builds
generate the EXE file under the same name but may not generate the
map file, the .sym generation could fail (e.g. if building the release after
the debug).

Note that under the new scheme there is a problem of the .sym file not
being generated at all in this case. But that's a different story since having
two distinct targets (release and debug) output to the same file is
confusing per se and there is no clean solution for that other than using
separate dirs for debug/release (which is always a good thing).

Location:

trunk/mkspecs/features/os2

Files:

• exepack.prf (modified) (1 diff)
• sym.prf (modified) (1 diff)

trunk/mkspecs/features/os2/exepack.prf

@@ -4 +4 @@
     build_pass|isEmpty(BUILDS) {
         CONFIG(release, debug|release) {
-            !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK += $$escape_expand(\n\t)
+            !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK += $$escape_expand(\\n\\t)
             QMAKE_POST_LINK += $$QMAKE_EXEPACK $$QMAKE_EXEPACK_FLAGS $@ $$QMAKE_EXEPACK_POST_FLAGS
         }

trunk/mkspecs/features/os2/sym.prf

@@ -3 +3 @@
 contains(TEMPLATE, ".*app")|dll { 
     build_pass|isEmpty(BUILDS) {
-        make_sym.target = $$QMAKE_SYM_FILE
-        make_sym.depends = $(DESTDIR_TARGET)
-        make_sym.commands = $$QMAKE_RUN_MAPSYM
+        !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK += $$escape_expand(\\n\\t)
+        QMAKE_POST_LINK += $$QMAKE_RUN_MAPSYM
+        QMAKE_CLEAN += $$QMAKE_SYM_FILE
         !contains(CONFIG, map) {
             QMAKE_LFLAGS += $$QMAKE_LFLAGS_MAP # from map.prf
-            make_sym.commands = $${make_sym.commands}$$escape_expand(\\n\\t)\
-                                $(DEL_FILE) $$QMAKE_MAP_FILE
+            QMAKE_POST_LINK += $$escape_expand(\\n\\t)$(DEL_FILE) $$QMAKE_MAP_FILE
         }
-        ALL_DEPS += $$make_sym.target
-        QMAKE_CLEAN += $$make_sym.target
-        QMAKE_EXTRA_TARGETS += make_sym
-
+    
         # also copy .sym file to DLLDESTDIR (as Win32MakefileGenerator does for .dll)
         !isEmpty(DLLDESTDIR) {
             for(d, DLLDESTDIR) {
-                make_sym.commands = $${make_sym.commands}$$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
         contains(INSTALLS, target):!contains(CONFIG, no_install_debuginfo) {