Changeset 118

Timestamp:

Aug 15, 2006, 1:36:11 PM (19 years ago)

Author:

dmik

Message:

configure.cmd: Fixed: adding paths to envirionment variables could sometimes produce duplicates which led to the 'Command line too long' error message.

File:

• trunk/configure.cmd (modified) (8 diffs)

trunk/configure.cmd

@@ -414 +414 @@
     call lineout G.!QtCmd, '        if (wordpos(''debug'', line, 3) > 0) then DEBUG = 1'
     call lineout G.!QtCmd, 'end'
+    call lineout G.!QtCmd, 'call lineout QTDIR''\.qtos2config'''
     call lineout G.!QtCmd, ''
     call lineout G.!QtCmd, '/* parse command line */'
@@ -437 +438 @@
     call lineout G.!QtCmd, 'if (\DEBUG) then do'
     call lineout G.!QtCmd, '    /* releae versions come first */'
-    call lineout G.!QtCmd, '    call AddPathEnv ''PATH'', QTDIR''\bin'''
-    call lineout G.!QtCmd, '    call AddPathEnv ''PATH'', QTDIR''\bin\debug'''
-    call lineout G.!QtCmd, '    call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin'''
-    call lineout G.!QtCmd, '    call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin\debug'''
+    call lineout G.!QtCmd, '    call AddPathEnv ''PATH'', QTDIR''\bin'', ''A'''
+    call lineout G.!QtCmd, '    call AddPathEnv ''PATH'', QTDIR''\bin\debug'', ''A'''
+    call lineout G.!QtCmd, '    call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin'', ''A'''
+    call lineout G.!QtCmd, '    call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin\debug'', ''A'''
     call lineout G.!QtCmd, 'end'
     call lineout G.!QtCmd, 'else do'
     call lineout G.!QtCmd, '    /* debug versions come first */'
-    call lineout G.!QtCmd, '    call AddPathEnv ''PATH'', QTDIR''\bin\debug'''
-    call lineout G.!QtCmd, '    call AddPathEnv ''PATH'', QTDIR''\bin'''
-    call lineout G.!QtCmd, '    call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin\debug'''
-    call lineout G.!QtCmd, '    call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin'''
+    call lineout G.!QtCmd, '    call AddPathEnv ''PATH'', QTDIR''\bin\debug'', ''A'''
+    call lineout G.!QtCmd, '    call AddPathEnv ''PATH'', QTDIR''\bin'', ''A'''
+    call lineout G.!QtCmd, '    call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin\debug'', ''A'''
+    call lineout G.!QtCmd, '    call AddPathEnv ''BEGINLIBPATH'', QTDIR''\bin'', ''A'''
     call lineout G.!QtCmd, 'end'
     call lineout G.!QtCmd, ''
@@ -516 +517 @@
         parse var paths path';'paths
         if (path \== '') then
-            call AddPathVar 'G.!temp', path, 1
+            call AddPathVar 'G.!temp', path, 'P'
     end
     /* second pass: generate AddPathEnv calls */
@@ -523 +524 @@
         parse var paths path';'paths
         if (path \== '') then
-            call lineout G.!QtCmd, 'call AddPathEnv '''env''','''QuotePath(path)''', 1'
+            call lineout G.!QtCmd, 'call AddPathEnv '''env''','''QuotePath(path)''', ''P'''
     end
     return
@@ -968 +969 @@
     parse arg path
     path = FixDirNoSlash(path)
-    call AddPathEnv 'PATH', Opt.!ILINKPath.!addPath, 1
-    call AddPathEnv 'BEGINLIBPATH', Opt.!ILINKPath.!addLibPath, 1
+    call AddPathEnv 'PATH', Opt.!ILINKPath.!addPath, '''P'''
+    call AddPathEnv 'BEGINLIBPATH', Opt.!ILINKPath.!addLibPath, '''P'''
     address 'cmd' 'ilink.exe | more'
     say
@@ -1003 +1004 @@
     parse arg path
     path = FixDirNoSlash(path)
-    call AddPathEnv 'PATH', Opt.!GNUMakePath.!addPath, 1
-    call AddPathEnv 'BEGINLIBPATH', Opt.!GNUMakePath.!addLibPath, 1
+    call AddPathEnv 'PATH', Opt.!GNUMakePath.!addPath, '''P'''
+    call AddPathEnv 'BEGINLIBPATH', Opt.!GNUMakePath.!addLibPath, '''P'''
     address 'cmd' 'make.exe --version | more'
     say
@@ -1631 +1632 @@
  *  Adds the given path to the contents of the given variable
  *  containing a list of paths separated by semicolons.
- *  This function guarantees that the given path is contained only once
- *  in the variable.
+ *  This function guarantees that if the given path is already contained in the
+ *  variable, the number of occurences will not increase (but the order may be
+ *  rearranged depending on the mode argument).
  *
  *  @param  name        variable name
  *  @param  path        path to add
- *  @param  prepend     1 will put the path to the beginning, otherwise it
- *                      will be appended to the end of the variable's contents.
+ *  @param  mode        'P' (prepend): remove the old occurence of path (if any)
+ *                          and put it to the beginning of the variable's contents
+ *                      'A' (append): remove the old occurence of path (if any)
+ *                          and put it to the end of the variable's contents
+ *                      otherwise: append path to the variable only if it's
+ *                          not already contained there
  *  @param  environment either '' to act on REXX variables or 'OS2ENVIRONMENT'
  *                      to act on OS/2 environment variables
  *
- *  @version 1.0
+ *  @version 1.1
  */
 /* <<< export to qt.cmd starts */
 AddPathVar: procedure expose (Globals)
-    parse arg name, path, prepend, environment
+    parse arg name, path, mode, environment
     if (path == '') then return
     if (verify(path, ' +', 'M') > 0) then path = '"'path'"'
-    prepend = (prepend == 1)
+    mode = translate(mode)
+    prepend = (mode == 'P') /* strictly prepend */
+    append = (mode == 'A') /* strictly append */
     os2Env = (translate(environment) == 'OS2ENVIRONMENT')
     if (os2Env) then do
@@ -1656 +1664 @@
     end
     else cur = value(name)
+    /* locate the previous occurence of path */
     l = length(path)
-    p = pos(translate(path), translate(cur))
-    cb = ''; ca = ''
-    found = (p > 0)
-    if (found) then do
+    found = 0; p = 1
+    pathUpper = translate(path)
+    curUpper = translate(cur)
+    do while (\found)
+        p = pos(pathUpper, curUpper, p)
+        if (p == 0) then leave
+        cb = ''; ca = ''
         if (p > 1) then cb = substr(cur, p - 1, 1)
         if (p + l <= length(cur)) then ca = substr(cur, p + l, 1)
         found = (cb == '' | cb == ';') & (ca == '' | ca == ';')
+        if (\found) then p = p + 1
     end
     if (found) then do
-        if (\prepend) then return
-        if (ca == ';') then l = l + 1
-        cur = delstr(cur, p, l)
-    end
-    if (prepend) then do
-        if (left(cur, 1) \== ';') then cur = ';'cur
-        cur = path||cur
-    end
-    else do
-        if (cur \== '' & right(cur, 1) \== ';') then cur = cur';'
-        cur = cur||path
+        /* remove the old occurence when in strict P or A mode */
+        if (prepend | append) then cur = delstr(cur, p, l)
+    end
+    /* add path when necessary */
+    if (prepend) then cur = path';'cur
+    else if (append | \found) then cur = cur';'path
+    /* remove excessive semicolons */
+    cur = strip(cur, 'B', ';')
+    p = 1
+    do forever
+        p = pos(';;', cur, p)
+        if (p == 0) then leave
+        cur = delstr(cur, p, 1)
     end
     if (os2Env) then do