Changeset 954

Timestamp:

Aug 10, 2011, 5:22:54 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Added support for .SYM file generation on OS/2.

This is done through the 'sym' CONFIG option which is on
by default if mapsym is found during configure.

Location:

trunk

Files:

• README.OS2 (modified) (2 diffs)
• configure.cmd (modified) (4 diffs)
• mkspecs/features/os2/map.prf (modified) (1 diff)
• mkspecs/features/os2/sym.prf (added)
• mkspecs/os2-g++/qmake.conf (modified) (1 diff)
• mkspecs/os2-g++/runmapsym.cmd (added)
• mkspecs/os2-g++/wmapsym.cmd (added)

trunk/README.OS2

@@ -57 +57 @@
 the corresponding feature:
 
-  - LxLite 1.3.3 or above (not tested) to enable the compression of Qt DLLs and
-    application executables (which saves hard disk space and application startup
-    time). If you use a recent version of eComStation (e.g. 2.0 rc6) you will
-    already have LxLite installed. Otherwise, you may take it from here:
+  - MAPSYM 4.00.000 (Oct 4 2001) to enable generation of symbol (.SYM) files for
+    DLLs and executables. This tool comes with OS/2 Toolkit 4.5. Note that other
+    versions of this tool may not work correctly.
+
+  - LxLite 1.3.3 or above (not tested) to enable the compression of DLLs and
+    executables (which saves hard disk space and application startup time). If
+    you use a recent version of eComStation (e.g. 2.0 rc6) you will already have
+    LxLite installed. Otherwise, you may take it from here:
 
       http://www.os2site.com/sw/util/archiver/lxlt133.zip
@@ -378 +382 @@
                     DLLs. This option is set by default.
 
+  sym               Turns on generation of the .sym files for executables and
+                    DLLs. The option is turned on by default if configure.cmd
+                    is able to find the MAPSYM tool in PATH.
+
   exepack           Turns on compression for executables and DLLs. The option is
                     turned on by default for release builds if configure.cmd
-                    finds a compression tool (LxLite) in PATH.
+                    is able to find a compression tool (LxLite) in PATH.
 
   highmem           Turns on high memory usage for dynamically allocated memory

trunk/configure.cmd

@@ -356 +356 @@
 
     /* variables that override ones in qmake.conf */
+    G.QMAKE_MAPSYM = ""
     G.QMAKE_EXEPACK = ""
     G.QMAKE_EXEPACK_FLAGS = ""
@@ -633 +634 @@
 */
     end
+
+    /* detect the mapsym program */
+    if (G.QMAKE_MAPSYM == "") then
+        G.QMAKE_MAPSYM = SysSearchPath('PATH', 'mapsym.cmd')
+    if (G.QMAKE_MAPSYM == "") then
+        G.QMAKE_MAPSYM = SysSearchPath('PATH', 'mapsym.exe')
+    if (G.QMAKE_MAPSYM \== "") then
+        G.QMAKE_MAPSYM = "mapsym" /* try to be smart and rely on PATH */
 
     /* detect the exepack program */
@@ -1828 +1837 @@
 '# qmake.conf overrides'G.EOL
 
+    if (G.QMAKE_MAPSYM \== '') then do
+        call charout qconfig_pri_new,,
+'QMAKE_MAPSYM = 'G.QMAKE_MAPSYM||G.EOL
+    end
+
     if (G.QMAKE_EXEPACK \== '') then do
         call charout qconfig_pri_new,,
@@ -2076 +2090 @@
     if (G.CFG_PTMALLOC \== "no") then
         call SayLog "Use ptmalloc ........... "G.CFG_PTMALLOC
+
+    if (G.QMAKE_MAPSYM \== "") then
+        call SayLog "Symbol file support .... yes ("G.QMAKE_MAPSYM")"
+    else
+        call SayLog "Symbol file support .... no"
 
     if (G.QMAKE_EXEPACK \== "") then

trunk/mkspecs/features/os2/map.prf

@@ -2 +2 @@
     build_pass|isEmpty(BUILDS) {
         QMAKE_LFLAGS += $$QMAKE_LFLAGS_MAP
-        QMAKE_CLEAN += $(basename $(DESTDIR_TARGET)).map
+        QMAKE_CLEAN += $$QMAKE_MAP_FILE
     }
 }

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

@@ -166 +166 @@
 QMAKE_STRIP     =
 
+QMAKE_MAP_FILE  = $(basename $(DESTDIR_TARGET)).map
+QMAKE_SYM_FILE  = $(basename $(DESTDIR_TARGET)).sym
+ilink:QMAKE_RUN_MAPSYM  = $(QMAKESPECDIR)\\runmapsym.cmd \
+    mapsym $$QMAKE_MAP_FILE $$QMAKE_SYM_FILE
+wlink:QMAKE_RUN_MAPSYM  = $(QMAKESPECDIR)\\runmapsym.cmd \
+    $(QMAKESPECDIR)\\wmapsym.cmd $$QMAKE_MAP_FILE $$QMAKE_SYM_FILE
+
 load(qt_config)