Changeset 13

Timestamp:

Nov 17, 2005, 12:57:45 AM (20 years ago)

Author:

dmik

Message:

Result code from make is now preserved when running it through a pipe

File:

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

trunk/configure.cmd

@@ -85 +85 @@
  ******************************************************************************/
 
+call MagicCmdHook arg(1)
 call MagicLogHook arg(1)
 
@@ -687 +688 @@
             call lineout build_log
             address 'cmd',
-                'make clean 2>&1 | "'G.!ScriptFile'" --magic-log='build_log
+                '"'G.!ScriptFile'" --magic-cmd make clean 2>&1 |',
+                '"'G.!ScriptFile'" --magic-log 'build_log
         end
         else rc = 0
@@ -696 +698 @@
             call lineout build_log
             address 'cmd',
-                'make' build_target '2>&1 | "'G.!ScriptFile'" --magic-log='build_log
+                '"'G.!ScriptFile'" --magic-cmd make' build_target '2>&1 |',
+                '"'G.!ScriptFile'" --magic-log 'build_log
         end
         if (rc \== 0) then do
@@ -1244 +1247 @@
 
 /**
+ *  Magic cmd handler.
+ *  Executes the commad passed as --magic-cmd <cmd> and writes the result code
+ *  to the standard output in the form of 'RC:<rc>:CR'
+ *  (to be used by MagicLogHook).
+ */
+MagicCmdHook: procedure
+    parse arg magic' 'cmd
+    if (magic \== '--magic-cmd') then return
+    cmd = strip(cmd)
+    signal on halt name MagicCmdHalt
+    address 'cmd' cmd
+    say 'RC:'rc':CR'
+    exit 0
+
+MagicCmdHalt:
+    say 'RC:255:CR'
+    exit 255
+    
+/**
  *  Magic log handler.
  */
 MagicLogHook: procedure
-    parse arg magic'='file
+    parse arg magic' 'file
     if (magic \== '--magic-log') then return
-    file = strip(file, 'T')
+    file = strip(file)
     signal on halt name MagicLogHalt
+    rc = 0  
     do while (stream('STDIN', 'S') == 'READY')
         line = linein()
+        if (left(line, 3) == 'RC:') then do
+            if (right(line,3) == ':CR') then do
+                rc = substr(line, 4, length(line) - 6)
+                iterate
+            end
+        end
         call lineout, line
         call lineout file, line
     end
-    exit 0
+    exit rc
 
 MagicLogHalt: