Changeset 3720

Timestamp:

Nov 13, 2019, 11:12:06 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Improved Etpm error messages.
• Made defc Etpm work again.

File:

• trunk/src/netlabs/macros/recompile.e (modified) (4 diffs)

trunk/src/netlabs/macros/recompile.e ¶

@@ -179 +179 @@
 ; Doesn't respect options from the commandline, like /v or /e <logfile>.
 defc Et, Etpm
-   rc = Etpm( arg( 1), '')
+   rc = Etpm( arg( 1), EtpmErrorMsg)  -- EtpmErrorMsg is not used here
 
 defproc Etpm( EtpmArgs, var EtpmErrorMsg)
@@ -249 +249 @@
       deltalen = length( Os2Cmd) - 224
       if deltalen > 0 then
-         sayerror 'Command: 'Os2Cmd
-         sayerror 'Error: command is 'deltalen' chars too long. Shorten filename or use an OS/2 or EPM shell window.'
+         'SayError Command: 'Os2Cmd
+         EtpmErrorMsg = 'Error: command is 'deltalen' chars too long. Shorten filename or use an OS/2 or EPM shell window.'
+         'SayError' EtpmErrorMsg
          rc = -263  -- sayerror( 'Invalid argument')
          leave
@@ -262 +263 @@
       if rc = 0 then
          refresh
-         sayerror COMP_COMPLETED__MSG': 'BaseName
+         EtpmErrorMsg = COMP_COMPLETED__MSG': 'BaseName
+
       elseif rc = -2 then
-         sayerror CANT_FIND_PROG__MSG EtpmCmd
-         stop
+         EtpmErrorMsg = CANT_FIND_PROG__MSG EtpmCmd
       elseif rc = 41 then
-         sayerror 'ETPM.EXE:' CANT_OPEN_TEMP__MSG '"'TempFile'"'
-         stop
+         EtpmErrorMsg = 'ETPM.EXE:' CANT_OPEN_TEMP__MSG '"'TempFile'"'
       elseif Exist( TempFile) then
          EtpmErrorMsg = Ec_Position_On_Error( TempFile)
-         'SayError' EtpmErrorMsg
          rc = etpmrc
       else
-         sayerror 'ETPM.EXE returned rc = 'etpmrc' for "'Os2Cmd'"'
+         EtpmErrorMsg = 'ETPM.EXE returned rc = 'etpmrc' for "'Os2Cmd'"'
          rc = etpmrc
+      endif
+      if EtpmErrorMsg <> '' then
+         'SayError' EtpmErrorMsg
       endif
 ;      call erasetemp( TempFile)
@@ -310 +312 @@
       parse value textline( .last - 1) with 'line= ' Line
       parse value textline( .last - 2) with 'filename=' Filename
+      Col      = strip( Col)
+      Line     = strip( Line)
+      Filename = strip( Filename)
+      EtpmErrorMsg = EtpmErrorMsg' on ('Line','Col') in 'Filename
       'xcom q'
       'e 'Filename               -- not xcom here, respect user's window style