Changeset 956

Timestamp:

Aug 10, 2011, 7:00:44 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Fix using relative cmd paths in mapsym wrapper.

It is necessary since the path to the mapsym command may be relative
(as in case of wmapsym). Note that for this to work we had to add argument
quoting support since REXX doesn't have it per se.

File:

• trunk/mkspecs/os2-g++/runmapsym.cmd (modified) (4 diffs)

trunk/mkspecs/os2-g++/runmapsym.cmd

@@ -8 +8 @@
 '@echo off'
 
-parse arg aMapSymEXE aMapFile aSymFile
+if (RxFuncQuery('SysLoadFuncs')) then do
+    call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
+    call SysLoadFuncs
+end
 
-if (aMapSymEXE == '' | aMapFile == '' | aSymFile == '') then do
+parse arg aArgs
+call TokenizeString aArgs, 'G.!args'
+
+if (G.!args.0 < 3) then do
     say "Usage: runmapsym <mapsym_cmd> <map_file> <sym_file>"
     exit 255
 end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 mapFile = stream(aMapFile, 'C', 'QUERY EXISTS')
@@ -20 +48 @@
     exit 255
 end
-
-curDir = directory()
 
 symDir = filespec('D', aSymFile)||filespec('P', aSymFile)
@@ -34 +60 @@
 symFile = fileSpec('N', aSymFile)
 
-'call' aMapSymExe mapFile
+'call' apSymExe mapFile
 
 if (rc \== 0) then do
@@ -57 +83 @@
 
 exit rc
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+