Changeset 128

Timestamp:

Sep 17, 2006, 10:10:13 PM (19 years ago)

Author:

dmik

Message:

General: configure.cmd:

• Various improvements to the tools configuration routines (compiler, linker, etc.); in particular, the selection process can now be canceled using Esc in many places (not currently used, see below);
• Added code to optionally configure the usage of the Innotek Font Engine (Freetype 2) support library but it's all commented for now due to lack of the ft2lib.lib file supported by GCC.

Location:

trunk

Files:

• configure.cmd (modified) (39 diffs)
• src/kernel/qt_kernel.pri (modified) (1 diff)

trunk/configure.cmd

@@ -62 +62 @@
 Opt.!MNG        = 1
 Opt.!GIF        = 0 /* WARNING: license restrictions apply when setting to 1! */
+
+/* extra OS/2 specific features */
+/* @todo (r=dmik) commented out until there is a GCC compatible FT2 support lib
+Opt.!Extra.!FT2LIB              = ''
+Opt.!Extra.!FT2LIB.0            = 0
+Opt.!Extra.!FT2LIB.!choice      = ''
+Opt.!Extra.!FT2LIB.!enabled     = ''
+*/
 
 Opt.!QTCustomDefines  = ''
@@ -288 +296 @@
     call WriteVar G.!ConfigCache, 'Opt.!GIF'
 
+/* @todo (r=dmik) commented out until there is a GCC compatible FT2 support lib
+    call WriteStem G.!ConfigCache, 'Opt.!Extra.!FT2LIB'
+    call WriteVar G.!ConfigCache, 'Opt.!Extra.!FT2LIB.!choice'
+    call WriteVar G.!ConfigCache, 'Opt.!Extra.!FT2LIB.!enabled'
+*/    
     call WriteVar G.!ConfigCache, 'Opt.!QTCustomDefines'
     
@@ -315 +328 @@
     Opt.!GNUMAKEPath.!changed = 0
 
+/* @todo (r=dmik) commented out until there is a GCC compatible FT2 support lib
+    Opt.!Extra.!FT2LIB.!changed = 0
+*/
     return
 
@@ -335 +351 @@
     call SaySay 'generated by GCC into OS/2 executables.'
     say
-    call SaySay 'Also, the GNU Make utility version 3.81beta1 or newer (statically'
-    call SaySay 'linked to intl.dll) is required.'
+    call SaySay 'Also, the GNU Make utility version 3.81beta1 or newer is required.'
     say
 
     do until (Opt.!GCCPath \= '')
-        call MenuSelectPath,
+        Opt.!GCCPath = MenuSelectPath(,
             'Opt.!GCCPath',,
             'Select where to search for a GCC installation:',,
@@ -346 +361 @@
             'ERROR: Could not find a valid GCC installation'||G.!EOL||,
             'in ''%1''!'||G.!EOL||,
-            'Please read the documentation.'
+            'Please read the documentation.')
     end
     call WriteConfigCache
 
     do until (Opt.!ILINKPath \= '')
-        call MenuSelectPath,
+        Opt.!ILINKPath = MenuSelectPath(,
             'Opt.!ILINKPath',,
             'Select where to search for an ILINK installation:',,
@@ -357 +372 @@
             'ERROR: Could not find a valid ILINK installation'||G.!EOL||,
             'in ''%1''!'||G.!EOL||,
-            'Please read the documentation.'
+            'Please read the documentation.')
     end
     call WriteConfigCache
 
     do until (Opt.!GNUMakePath \= '')
-        call MenuSelectPath,
+        Opt.!GNUMakePath = MenuSelectPath(,
             'Opt.!GNUMakePath',,
             'Select where to search for the GNU Make utility:',,
@@ -368 +383 @@
             'ERROR: Could not find a GNU Make utility'||G.!EOL||,
             'in ''%1''!'||G.!EOL||,
-            'Please read the documentation.'
+            'Please read the documentation.')
     end
     call WriteConfigCache
@@ -463 +478 @@
      */
     call ConfigureCompiler_GenAddPathEnv 'PATH',,
-        Opt.!GCCPath.!addPath';'Opt.!ILINKPath.!addPath';'Opt.!GNUMAKEPath.!addPath
+        Opt.!GCCPath.!path';'Opt.!ILINKPath.!path';'Opt.!GNUMAKEPath.!path
     call ConfigureCompiler_GenAddPathEnv 'BEGINLIBPATH',,
-        Opt.!GCCPath.!addLibPath';'Opt.!ILINKPath.!addLibPath';'Opt.!GNUMAKEPath.!addLibPath
+        Opt.!GCCPath.!libpath';'Opt.!ILINKPath.!libpath';'Opt.!GNUMAKEPath.!libpath
     call lineout G.!QtCmd, ''
     call lineout G.!QtCmd, '/*'
@@ -536 +551 @@
     say
 
+    /* Qt library type */
+    
     G.!Choices.0 = 2
     G.!Choices.1 = 'Dynamic link library (DLL)'
@@ -575 +592 @@
     end
 
+    /* Qt library debug level */
+    
     G.!Choices.0 = 2
     G.!Choices.1 = 'Release (no debug information)'
@@ -581 +600 @@
     Opt.!RELEASE = -choice + 2
 
+    /* Optional Qt modules */
+    
     G.!Choices.0 = 4
     do forever
@@ -589 +610 @@
         call SaySay 'Enable or disable optional Qt library modules'
         choice = GetChoice('(pressing Enter will accept the current selection):',,
-                           'G.!Choices',, 1)
+                           'G.!Choices',, 'E')
         select
             when choice == 1 then Opt.!NETWORK = \Opt.!NETWORK
@@ -599 +620 @@
     end
 
+    /* InnoTek Font Engine Support */
+
+/* @todo (r=dmik) commented out until there is a GCC compatible FT2 support lib
+    do forever
+        call SaySay "Enable InnoTek Font Engine support in Qt?"
+        Opt.!Extra.!FT2LIB.!enabled =,
+            GetYesNo("(answering Y (yes) is recommended)",,
+                     Opt.!Extra.!FT2LIB.!enabled)
+        if (Opt.!Extra.!FT2LIB.!enabled) then do
+            path = MenuSelectPath(,
+                'Opt.!Extra.!FT2LIB',,
+                'Select where to search for the Innotek Font Engine support library:',,
+                'ft2lib.h', 'CheckFT2LIBPath', 'CheckFT2LIBVersion',,
+                'ERROR: Could not find the Innotek Font Engine support library'||G.!EOL||,
+                'in ''%1''!'||G.!EOL||,
+                'Please read the documentation.',,
+                'C')
+            if (path \== '') then do
+                Opt.!Extra.!FT2LIB = path
+                leave
+            end
+            Opt.!Extra.!FT2LIB.!enabled = 0
+        end
+        else leave
+    end
+
+    call WriteConfigCache
+*/    
+    /* Custom Qt defines */
+                  
     if (OfficialBuildConfig == '') then do
         call SaySay 'Enter a list of custom Qt defines separated by spaces'
@@ -609 +660 @@
     call WriteConfigCache
 
+    /* Generate setup files for Qt */
+    
     BasicModules = 'kernel tools widgets dialogs styles'
     BasicModulesHeader =,
@@ -673 +726 @@
     OptionalConfig = strip(OptionalConfig)
 
+    ExtraConfig = ''
+/* @todo (r=dmik) commented out until there is a GCC compatible FT2 support lib
+    if (Opt.!Extra.!FT2LIB.!enabled) then do
+        ExtraConfig = ExtraConfig 'pm_ft2lib'
+    end
+*/
+    ExtraConfig = strip(ExtraConfig)
+    
     ConfigHeader =,
         '/* Everything */'G.!EOL||,
@@ -731 +792 @@
         call SaySay 'Custom defines : 'Opt.!QTCustomDefines
     say
-
+/* @todo (r=dmik) commented out until there is a GCC compatible FT2 support lib
+    call SaySay 'Innotek Font Engine support  : 'GetYesNoText(Opt.!Extra.!FT2LIB.!enabled)
+    say
+*/
     call WaitForAnyKey
 
@@ -762 +826 @@
                               'minimal-config small-config medium-config large-config full-config ',
                               ReleaseOrDebug' thread' OptionalConfig,
-                              'bigcodecs no-tablet incremental create_prl link_prl'
+                              'bigcodecs no-tablet incremental create_prl link_prl',
+                              ExtraConfig
     call lineout qmake_cache, 'QMAKESPEC=os2-g++'
     call lineout qmake_cache, 'QT_BUILD_TREE='QuotePath(G.!QTDir)
@@ -775 +840 @@
     call lineout qmake_cache, 'data.path='QuotePath(G.!QTDirP)
     call lineout qmake_cache, 'translations.path='QuotePath(G.!QTDirP'\translations')
+    call lineout qmake_cache, ''
+/* @todo (r=dmik) commented out until there is a GCC compatible FT2 support lib
+    if (Opt.!Extra.!FT2LIB.!enabled) then do
+        call lineout qmake_cache, 'pm_ft2lib.include='Opt.!Extra.!FT2LIB.!include
+        call lineout qmake_cache, 'pm_ft2lib.lib='Opt.!Extra.!FT2LIB.!lib
+    end
+*/
     call lineout qmake_cache
 
@@ -919 +991 @@
  */
 CheckGCCPath: procedure expose (Globals)
-    parse arg path, beforeCheckVer
-    beforeCheckVer = (beforeCheckVer == 1)
+    parse arg path, finalCheck
+    finalCheck = (finalCheck == 1)
     path = FixDirNoSlash(path)
     if (FileExists(path'\bin\gccenv.cmd') & FileExists(path'\bin\gcc.exe')) then do
-        if (beforeCheckVer) then do
-            Opt.!GCCPath.!addPath = ''
-            Opt.!GCCPath.!addLibPath = ''
-        end
-    end
-    else return 0
-    return 1
+        if (finalCheck) then do
+            Opt.!GCCPath.!path = ''
+            Opt.!GCCPath.!libpath = ''
+            return 1
+        end
+        return path
+    end
+    /* not valid */
+    if (finalCheck) then return 0
+    return ''
 
 /**
@@ -945 +1020 @@
  */
 CheckILINKPath: procedure expose (Globals)
-    parse arg path, beforeCheckVer
-    beforeCheckVer = (beforeCheckVer == 1)
+    parse arg path, finalCheck
+    finalCheck = (finalCheck == 1)
     path = FixDirNoSlash(path)
-    if (translate(right(path, 4)) == '\BIN' &,
-        FileExists(path'\ilink.exe') & FileExists(path'\..\dll\cppom30.dll')) then do
-        if (beforeCheckVer) then do
-            Opt.!ILINKPath.!addPath = path
-            Opt.!ILINKPath.!addLibPath = left(path, length(path) - 4)'\dll'
-        end
-    end
-    else if (FileExists(path'\ilink.exe') & FileExists(path'\cppom30.dll')) then do
-        if (beforeCheckVer) then do
-            Opt.!ILINKPath.!addPath = path
-            Opt.!ILINKPath.!addLibPath = path
-        end
-    end
-    else return 0
-    return 1
+    base = path
+    if (\finalCheck) then do
+        if (translate(right(path, 4)) == '\BIN') then
+            base = left(path, length(path) - 4)
+    end
+    if (FileExists(base'\bin\ilink.exe') & FileExists(base'\dll\cppom30.dll')) then do
+        /* the \bin and \dll case (as in the VAC3 installation) */
+        if (finalCheck) then do
+            Opt.!ILINKPath.!path = base'\bin'
+            Opt.!ILINKPath.!libpath = base'\dll'
+            return 1
+        end
+        return base
+    end
+    else if (FileExists(base'\ilink.exe') & FileExists(base'\cppom30.dll')) then do
+        /* ilink.exe and DLLs are in the same dir */
+        if (finalCheck) then do
+            Opt.!ILINKPath.!path = base
+            Opt.!ILINKPath.!libpath = base
+            return 1
+        end
+        return base
+    end
+    /* not valid */
+    if (finalCheck) then return 0
+    return ''
 
 /**
@@ -969 +1055 @@
     parse arg path
     path = FixDirNoSlash(path)
-    call AddPathEnv 'PATH', Opt.!ILINKPath.!addPath, '''P'''
-    call AddPathEnv 'BEGINLIBPATH', Opt.!ILINKPath.!addLibPath, '''P'''
+    call AddPathEnv 'PATH', Opt.!ILINKPath.!path, '''P'''
+    call AddPathEnv 'BEGINLIBPATH', Opt.!ILINKPath.!libpath, '''P'''
     address 'cmd' 'ilink.exe | more'
     say
@@ -979 +1065 @@
  */
 CheckGNUMakePath: procedure expose (Globals)
-    parse arg path, beforeCheckVer
-    beforeCheckVer = (beforeCheckVer == 1)
+    parse arg path, finalCheck
+    finalCheck = (finalCheck == 1)
     path = FixDirNoSlash(path)
     if (FileExists(path'\make.exe')) then do
+        /* make.exe and DLLs are in the same dir */
         if (FileExists(path'\intl.dll')) then do
-            if (beforeCheckVer) then do
-                Opt.!GNUMakePath.!addPath = path
-                Opt.!GNUMakePath.!addLibPath = path
+            /* have intl.dll */
+            if (finalCheck) then do
+                Opt.!GNUMakePath.!path = path
+                Opt.!GNUMakePath.!libpath = path
+                return 1
             end
         end
         else do
-            if (beforeCheckVer) then do
-                Opt.!GNUMakePath.!addPath = path
-                Opt.!GNUMakePath.!addLibPath = ''
-            end
-        end
-    end
-    else return 0
-    return 1
+            /* no intl.dll */
+            if (finalCheck) then do
+                Opt.!GNUMakePath.!path = path
+                Opt.!GNUMakePath.!libpath = ''
+                return 1
+            end
+        end
+        return path
+    end
+    /* not valid */
+    if (finalCheck) then return 0
+    return ''
 
 /**
@@ -1004 +1097 @@
     parse arg path
     path = FixDirNoSlash(path)
-    call AddPathEnv 'PATH', Opt.!GNUMakePath.!addPath, '''P'''
-    call AddPathEnv 'BEGINLIBPATH', Opt.!GNUMakePath.!addLibPath, '''P'''
+    call AddPathEnv 'PATH', Opt.!GNUMakePath.!path, '''P'''
+    call AddPathEnv 'BEGINLIBPATH', Opt.!GNUMakePath.!libpath, '''P'''
     address 'cmd' 'make.exe --version | more'
     say
@@ -1011 +1104 @@
     return GetYesNo("Accept the above version?", def)
 
+/**
+ */
+CheckFT2LIBPath: procedure expose (Globals)
+    parse arg path, finalCheck
+    finalCheck = (finalCheck == 1)
+    path = FixDirNoSlash(path)
+    base = path
+    if (\finalCheck) then do
+        if (translate(right(path, 8)) == '\INCLUDE') then
+            base = left(path, length(path) - 8)
+        else if (translate(right(path, 2)) == '\H') then
+            base = left(path, length(path) - 2)
+    end
+    if (FileExists(base'\include\ft2lib.h') & FileExists(base'\lib\ft2lib.lib')) then do
+        /* the \include and \lib case */
+        if (finalCheck) then do
+            Opt.!Extra.!FT2LIB.!include = base'\include'
+            Opt.!Extra.!FT2LIB.!lib = base'\lib'
+            return 1
+        end
+        return base
+    end
+    else if (FileExists(base'\h\ft2lib.h') & FileExists(base'\lib\ft2lib.lib')) then do
+        /* the \h and \lib case */
+        if (finalCheck) then do
+            Opt.!Extra.!FT2LIB.!include = base'\h'
+            Opt.!Extra.!FT2LIB.!lib = base'\lib'
+            return 1
+        end
+        return base
+    end
+    else if (FileExists(base'\ft2lib.h') & FileExists(base'\ft2lib.lib')) then do
+        /* both are in the same dir */
+        if (finalCheck) then do
+            Opt.!Extra.!FT2LIB.!include = base
+            Opt.!Extra.!FT2LIB.!lib = base
+            return 1
+        end
+        return base
+    end
+    /* not valid */
+    if (finalCheck) then return 0
+    return ''
+
+/**
+ */
+CheckFT2LIBVersion: procedure expose (Globals)
+    parse arg path
+    path = FixDirNoSlash(path)
+    address 'cmd' 'dir' Opt.!Extra.!FT2LIB.!include'\ft2lib.h',
+                        Opt.!Extra.!FT2LIB.!lib'\ft2lib.lib'
+    say
+    if (Opt.!Extra.!FT2LIB.!changed \== 1) then def = 'Y'; else def = ''
+    return GetYesNo("Accept the above version?", def)
+    
 /**
  */
@@ -1017 +1165 @@
     if (n == 1) then return '[X]'
     else return '[ ]'
+
+/**
+ */
+GetYesNoText: procedure expose (Globals)
+    parse arg n
+    if (n == 1 | n == 'Y' | n == 'y') then return 'Yes'
+    else return 'No'
 
 /* utility functions
@@ -1118 +1273 @@
     
 /**
- *  Displays a prompt to input a text line and
- *  returns the line entered by the user.
+ *  Displays a prompt to input a text line and returns the line entered by the
+ *  user. Letters in the mode argument have the following meanings:
+ *
+ *      N -- empty lines are not allowed (e.g. '' can never be returned)
+ *      C -- ESC can be pressed to cancel input ('1B'x is returned)
  *
  *  @param  prompt  prompt to display
  *  @param  default initial line contents
- *  @return         selected directory
+ *  @param  mode    input mode string consisting of letters as described above
+ *  @return         entered line
  */
 InputLine: procedure expose (Globals)
 
-    parse arg prompt, default
+    parse arg prompt, default, mode
     call SaySay prompt
     say
 
+    mode = translate(mode)
+    allow_empty = pos('N', mode) == 0
+    allow_cancel = pos('C', mode) > 0
+    
     line = default
     len = length(line)
@@ -1160 +1323 @@
             when (key == '0D'x) then do
                 /* Enter */
+                if (line == '' & \allow_empty) then iterate
                 say
+                leave
+            end
+            when (key == '1B'x) then do
+                /* ESC */
+                line = key
                 leave
             end
@@ -1225 +1394 @@
 
 /**
- *  Shows the prompt to input a directory path and
- *  returns the path entered by the user. The procedure
- *  does not return until a valid existing path is entered.
+ *  Shows the prompt to input a directory path and returns the path entered by
+ *  the user. The procedure does not return until a valid existing path is
+ *  entered or until ESC is pressed in which case it returns ''.
  *
  *  @param  prompt  prompt to show
@@ -1237 +1406 @@
     dir = default
     do forever
-        dir = InputLine(prompt, dir)
+        dir = InputLine(prompt, dir, 'NC')
+        if (dir == '1B'x) then do
+            say
+            return '' /* canceled */
+        end
         if (DirExists(dir)) then leave
         call SayErr 'The entered directory does not exist.'
@@ -1249 +1422 @@
  *  @param  prompt  prompt to show (specify '' to suppress the prompt)
  *  @param  default default choice:
- *      ''      - no default choice
- *      'Y'     - default is yes
- *      other   - default is no
+ *      ''          - no default choice
+ *      'Y' or 1    - default is yes
+ *      other       - default is no
  *  @return
  *      1 if Yes is selected, otherwise 0
@@ -1258 +1431 @@
     parse arg prompt, default
     default = translate(default)
-    if (default \== '' & default \== 'Y') then default = 'N'
+    if (default == 1) then default = 'Y'
+    else if (default \== '' & default \== 'Y') then default = 'N'
     if (prompt \= '') then call SaySay prompt
     say
     call SayPrompt '[YN] ', 1
-    yn = ReadChoice('YN',, default, 1)
+    yn = ReadChoice('YN',, default, 'I')
     say
     say
@@ -1268 +1442 @@
 
 /**
- *  Shows a menu of choices and returns the
- *  menu item number selected by the user.
+ *  Shows a menu of choices and returns the menu item number selected by the
+ *  user. Letters in the mode argument have the following meanings:
+ *
+ *      E -- allow to press Enter w/o a choice (will return '')
+ *      C -- ESC can be pressed to cancel selection (will return -1)
  *
  *  @param  prompt  prompt to display
  *  @param  stem    stem containing a list of choices
  *  @param  default default choice
- *  @param  allowEnter
- *      1 allows to press Enter w/o a choice (will return '')
+ *  @param  mode    input mode string consisting of letters as described above
  *  @return
  *      selected menu item number
  */
 GetChoice: procedure expose (Globals)
-    parse arg prompt, stem, default, allowEnter
-    allowEnter = (allowEnter == 1)
+    parse arg prompt, stem, default, mode
+    mode = translate(mode)
+    allowEnter = pos('E', mode) > 0
+    allowESC = pos('C', mode) > 0
     count = value(stem'.0')
     if (count == 0) then return
@@ -1294 +1472 @@
         prompt = choices
         if (allowEnter) then prompt = prompt'/Enter'
+        if (allowESC) then do
+            prompt = prompt'/Esc'
+            choices = choices||'1B'x
+        end
         if (first > 1) then do
             extChoices = extChoices||'49'x
@@ -1317 +1499 @@
         end
         call SayPrompt '['prompt'] ', 1
-        n = ReadChoice(choices, extChoices, def,, allowEnter)
+        n = ReadChoice(choices, extChoices, def, mode)
         say
         say
+        if (n == '1B'x) then do
+            return -1
+        end
         if (n == '0E49'x) then do
             first = first - 10
@@ -1338 +1523 @@
 /**
  *  Reads a one-key choice from the keyboard.
+ *  user. Letters in the mode argument have the following meanings:
+ *
+ *      E -- allow to press Enter w/o a choice (will return '')
+ *      C -- ESC can be pressed to cancel selection (will return '1B'x)
+ *      I -- ignore case of pressed letters
  *
  *  @param  choices     string of allowed one-key choices
  *  @param  extChoices  string of allowed one-extended-key choices
  *  @param  default     default choice (can be a key from choices)
- *  @param  ignoreCase  1 ignores case of letters
- *  @param  allowEnter
- *      1 allows to press Enter w/o a choice (will return '')
+ *  @param  mode        input mode string consisting of letters as described above
  *  @return
  *      entered key (prefixed with 'E0'x if from extChoices)
  */
 ReadChoice: procedure expose (Globals)
-    parse arg choices, extChoices, default, ignoreCase, allowEnter
-    ignoreCase = (ignoreCase == 1)
-    allowEnter = (allowEnter == 1)
+    parse arg choices, extChoices, default, mode
+    mode = translate(mode)
+    ignoreCase = pos('I', mode) > 0
+    allowEnter = pos('E', mode) > 0
+    allowCancel = pos('C', mode) > 0
     choice = default
     call charout, choice
@@ -1364 +1554 @@
         if (\extended & ignoreCase) then key = translate(key)
         select
+            when (allowCancel & \extended & key == '1B'x) then do
+                choice = key
+                leave
+            end
             when (choice == '' & \extended & verify(key, choices) == 0) then do
                 choice = key
@@ -1390 +1584 @@
 
 /**
- *  Shows a menu to select a path.
- *  The last of menu entries allows to enter a new location to search for valid
- *  paths (this operation will completely overwrite all the stem entries passed
- *  to this function).
+ *  Shows a menu to select a path from the list of entries.
+ *
+ *  A special menu entry is automatically added as the last choice that allows
+ *  to enter a new location to search for valid paths (this operation will
+ *  completely overwrite all the menu entries passed to this function in the
+ *  stem).
+ *
+ *  Letters in the mode argument have the following meanings:
+ *
+ *      C -- ESC can be pressed to cancel selection (will return '')
  *
  *  @param  stem
@@ -1400 +1600 @@
  *  @param  prompt
  *      prompt to display
- *  @param  default
- *      default choice
  *  @param  searchPattern
  *      pattern to search for when selecting suitable paths in the new location
@@ -1408 +1606 @@
  *  @param  checkPath
  *      name of the funciton to check the path. The first argument is the path
- *      to check, the second argument is 1 if this function is called just before
- *      checkVer (this can be used to pass data to checkVer (using global
- *      vafiables) necessary to perform a version check).
+ *      to check. If the second argument is 0, it means a preliminary check (i.e.
+ *      the path is the result of the SysFileThree procedure); checkPath must
+ *      return a validated (and probably modified) path on success or '' if the
+ *       path is invalid. If the second argument is 1, it's a final check
+ *      (path is what returned by the preliminary check call); checkPath must
+ *      return either 1 on success or 0 on failure. The final check is done
+ *      right before calling checkVer, so it can set some global variables in
+ *      order to pass necessary data to checkVer and to the global level for
+ *      further configuration.
  *  @param  checkVer
  *      name of the funciton to check the version. The argument is a path to
- *      check the version for.
+ *      check the version for (as returned by checkPath after the preliminary
+ *      check call).
  *  @param  errPath
  *      error message to display when a path check fails (%1 will be replaced
  *      with the failed path name)
+ *  @param  mode
+ *      input mode string consisting of letters as described above
  *  @return
- *      when both path and version checks succeed, stem variable itself
- *      (i.e. w/o any indexes) will contain a path selected and stem'.!choice'
- *      will contain the selected item number; otherwise the stem variable will
- *      be empty (this also includes the case when a user typed a new location
- *      and the stem was overwritten with a list of new paths found)
+ *      the selected path or '' if the selection was canceled.
+ *      If a non-empty path is returned, stem'.!choice' will contain
+ *      the selected item number, otherwise it will be empty.
  */
 MenuSelectPath: procedure expose (Globals)
 
-    parse arg stem, prompt, searchPattern, checkPath, checkVer, errPath
+    parse arg stem, prompt, searchPattern, checkPath, checkVer, errPath, mode
+    
+    mode = translate(mode)
+    if (pos('C', mode) > 0) then mode = 'C'
+    else mode = ''
 
     if (symbol('Static.!MenuSelectPath.!Recent') \= 'VAR') then
         Static.!MenuSelectPath.!Recent = '' 
     
-    call value stem, ''
-
-    n = value(stem'.0') + 1
-    call SysStemInsert stem, n, '[type a location...]'
-    if (n == 1) then default = 1
-    else default = value(stem'.!choice')
-
-    choice = GetChoice(prompt, stem, default)
-    call SysStemDelete stem, n
-
-    if (choice == n) then do
-        path = InputDir('Enter a location where to start searching from:',,
-                        Static.!MenuSelectPath.!Recent)
-        Static.!MenuSelectPath.!Recent = path
-        call SaySay 'Please wait...'
+    do forever
+
+        n = value(stem'.0') + 1
+        call SysStemInsert stem, n, '[type a location...]'
+        if (n == 1) then default = 1
+        else default = value(stem'.!choice')
+
+        choice = GetChoice(prompt, stem, default, mode)
+        call SysStemDelete stem, n
+    
+        if (choice == -1) then return '' /* canceled */
+
+        if (choice == n) then do
+            call value stem'.!choice', ''
+            path = InputDir('Enter a location where to start searching from ',
+                            '(or Esc to cancel):',,
+                            Static.!MenuSelectPath.!Recent)
+            if (path == '') then iterate /* canceled */ 
+            Static.!MenuSelectPath.!Recent = path
+            call SaySay 'Please wait...'
+            say
+            patternPath = translate(filespec('D', searchPattern) || filespec('P', searchPattern))
+            patternName = filespec('N', searchPattern)
+            call SysFileTree FixDirNoSlash(path)'\'patternName, 'found', 'FSO'
+            found2.0 = 0
+            if (found.0 > 0) then do
+                do i = 1 to found.0
+                    dir = filespec('D', found.i) || filespec('P', found.i)
+                    /* check that the found path ends with the pattern path */
+                    if (translate(right(dir, length(patternPath))) \== patternPath) then
+                        iterate
+                    dir = left(dir, length(dir) - length(patternPath))
+                    /* check path validity  */
+                    interpret 'dir = 'checkPath'("'dir'")'
+                    if (dir \== '') then
+                        call SysStemInsert 'found2', 1, FixDir(dir)
+                end
+            end
+            if (found2.0 > 0) then do
+                call SysStemCopy 'found2', stem
+                /* SysStemCopy is bogus and doesn't copy the count field... */
+                call value stem'.0', found2.0
+                call value stem'.!choice', ''
+                call value stem'.!changed', 1
+                iterate
+            end
+        end
+        else do
+            path = value(stem'.'choice)
+            /* check path validity and tell the version check will be done next */
+            interpret 'ok = 'checkPath'("'path'", 1)'
+            if (ok) then do
+                if (value(stem'.!choice') \== choice) then
+                    call value stem'.!changed', 1
+                interpret 'ok = 'checkVer'("'path'")'
+                if (ok) then do
+                    call value stem'.!choice', choice
+                    return path
+                end
+                call value stem'.!choice', ''
+                iterate
+            end
+        end
+
+        call SayErr Replace(errPath, '%1', path)
         say
-        patternPath = translate(filespec('D', searchPattern) || filespec('P', searchPattern))
-        patternName = filespec('N', searchPattern)
-        call SysFileTree FixDirNoSlash(path)'\'patternName, 'found', 'FSO'
-        found2.0 = 0
-        if (found.0 > 0) then do
-            do i = 1 to found.0
-                dir = filespec('D', found.i) || filespec('P', found.i)
-                /* check that the found path ends with the pattern path */
-                if (translate(right(dir, length(patternPath))) \== patternPath) then
-                    iterate
-                dir = left(dir, length(dir) - length(patternPath))
-                /* check path validity  */
-                interpret 'ok = 'checkPath'("'dir'")'
-                if (ok) then
-                    call SysStemInsert 'found2', 1, FixDir(dir)
-            end
-        end
-        if (found2.0 > 0) then do
-            call SysStemCopy 'found2', stem
-            call value stem'.!choice', ''
-            call value stem'.!changed', 1
-            return
-        end
-    end
-    else do
-        path = value(stem'.'choice)
-        /* check path validity and tell the version check will be done next*/
-        interpret 'ok = 'checkPath'("'path'", 1)'
-        if (ok) then do
-            if (value(stem'.!choice') \== choice) then
-                call value stem'.!changed', 1
-            interpret 'ok = 'checkVer'("'path'")'
-            if (ok) then do
-                call value stem, path
-                call value stem'.!choice', choice
-                return
-            end
-            return
-        end
-    end
-
-    call SayErr Replace(errPath, '%1', path)
-    say
-
-    return
+        call value stem'.!choice', ''
+
+    end
 
 /**

trunk/src/kernel/qt_kernel.pri

@@ -281 +281 @@
 }
 
-#@@TODO(dmik): headers and sources below are substracted until implemented
+## @todo (r=dmik) commented out until there is a GCC compatible FT2 support lib
+#        when uncommented, make sure the static build of Qt library works well
+#        (mkspecs\os2-g++\qmake.conf also needs to be altered)
+#os2 {
+#       pm_ft2lib {
+#        INCLUDEPATH += $$pm_ft2lib.include
+#               LIBS += $$pm_ft2lib.lib\ft2lib.lib
+#       }
+#       else:DEFINES += QT_PM_NO_FT2LIB
+#}
+
+## @todo (r=dmik): headers and sources below are substracted until implemented
 os2 {
         HEADERS -= \