Changeset 956 for trunk/mkspecs

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
+
+aMapSymEXE = G.!args.1
+aMapFile = G.!args.2
+aSymFile = G.!args.3
+
+curDir = directory()
+
+mapSymExeDir = filespec('D', aMapSymEXE)||filespec('P', aMapSymEXE)
+if (mapSymExeDir \== '') then do
+    if (right(mapSymExeDir, 2) \== ':\') then
+        mapSymExeDir = strip(mapSymExeDir, 'T', '\')
+    mapSymExeDir = directory(mapSymExeDir)
+    if (mapSymExeDir == '') then do
+        say 'ERROR: Directory of "'aMapSymEXE'" does not exist.'
+        exit 255
+    end
+    if (right(mapSymExeDir, 2) \== ':\') then
+        mapSymExeDir = mapSymExeDir'\'
+    mapSymExe = mapSymExeDir||filespec('N', aMapSymEXE)
+end
+
+call directory curDir
 
 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' mapSymExe mapFile
 
 if (rc \== 0) then do
@@ -57 +83 @@
 
 exit rc
+
+/**
+ *  Returns a list of all words from the string as a stem.
+ *  Delimiters are spaces, tabs and new line characters.
+ *  Words containg spaces must be enclosed with double
+ *  quotes. Double quote symbols that need to be a part
+ *  of the word, must be doubled.
+ *
+ *  @param string   the string to tokenize
+ *  @param stem
+ *      the name of the stem. The stem must be global
+ *      (i.e. its name must start with 'G.!'), for example,
+ *      'G.!wordlist'.
+ *  @param leave_ws
+ *      1 means whitespace chars are considered as a part of words they follow.
+ *      Leading whitespace (if any) is always a part of the first word (if any).
+ *
+ *  @version 1.1
+ */
+TokenizeString: procedure expose G.
+
+    parse arg string, stem, leave_ws
+    leave_ws = (leave_ws == 1)
+
+    delims  = '20090D0A'x
+    quote   = '22'x /* " */
+
+    num = 0
+    token = ''
+
+    len = length(string)
+    last_state = '' /* D - in delim, Q - in quotes, W - in word */
+    seen_QW = 0
+
+    do i = 1 to len
+        c = substr(string, i, 1)
+        /* determine a new state */
+        if (c == quote) then do
+            if (last_state == 'Q') then do
+                /* detect two double quotes in a row */
+                if (substr(string, i + 1, 1) == quote) then i = i + 1
+                else state = 'W'
+            end
+            else state = 'Q'
+        end
+        else if (verify(c, delims) == 0 & last_state \== 'Q') then do
+            state = 'D'
+        end
+        else do
+            if (last_state == 'Q') then state = 'Q'
+            else state = 'W'
+        end
+        /* process state transitions */
+        if ((last_state == 'Q' | state == 'Q') & state \== last_state) then c = ''
+        else if (state == 'D' & \leave_ws) then c = ''
+        if (last_state == 'D' & state \== 'D' & seen_QW) then do
+            /* flush the token */
+            num = num + 1
+            call value stem'.'num, token
+            token = ''
+        end
+        token = token||c
+        last_state = state
+        seen_QW = (seen_QW | state \== 'D')
+    end
+
+    /* flush the last token if any */
+    if (token \== '' | seen_QW) then do
+        num = num + 1
+        call value stem'.'num, token
+    end
+
+    call value stem'.0', num
+
+    return