cpmake: execute external scripts that execute compiler and linker

diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp
index f416a34ec325eb67fa826df5a4e8bb55602bc52d..5c84f5296973d52dd8df3146e4eee924c5bade84 100644 (file)
--- a/src/generic/Dsw/Mod/MakeMain.cp
+++ b/src/generic/Dsw/Mod/MakeMain.cp
@@ -31,26 +31,12 @@ MODULE DswMakeMain;
     (* module state flags *)
     imported = 0; trace = 1; hasObj = 2; hasSym = 3; hasErrors = 4; library = 5;
 
-    (* procesor types *)
-    anymach = 0; cmach = 1; mach386 = 10; mach68k = 20;
-
-    (* operation system types *)
-    anyos = 0; linux = 1; freebsd = 2; openbsd = 3; win32 = 4; cygwin = 5; darwin = 6;
-
-    (* compiler types *)
-    anycp = 0; cpnative = 1; cpfront = 2;
-
-    (* internal linker types *)
-    anyint = 0; dev2 = 1;
-
     debugImport = FALSE;
     debugOrder = FALSE;
     debugJobs = FALSE;
-    debugArgs = FALSE;
 
   TYPE
     String = POINTER TO ARRAY OF CHAR;
-    StringList = POINTER TO ARRAY OF String;
 
     Selector = POINTER TO RECORD
       name: DevCPT.Name;
@@ -69,60 +55,23 @@ MODULE DswMakeMain;
       worker: DswProcs.Process;
     END;
 
+  VAR (* options *)
+    auto, trap, clean: BOOLEAN;
+    exe, target, base: String;
+    jobs: INTEGER;
+
   VAR
     werr, err: INTEGER;
     mno, rno: INTEGER; (* num modules *)
     modList, lnkList, cmpList: ARRAY maxImps OF Module;
     def: Selector; (* with head, global list of selectors *)
-    processor, compiler, os, linker: INTEGER;
-    cpcExe, cplExe: String;
-    cpcArgs, cplArgs: StringList;
     dirList: DevCPM.Directory;
-    auto: BOOLEAN;
-    trap: BOOLEAN;
-    jobs: INTEGER;
-    exe: String;
-    printCompileModList: BOOLEAN;
-    printLinkModList: BOOLEAN;
-    printCompileFileList: BOOLEAN;
 
-  PROCEDURE Error (e: INTEGER; IN p0, p1: ARRAY OF CHAR; i2: INTEGER);
-    VAR msg, p2: ARRAY 128 OF CHAR;
+  PROCEDURE Error (IN str, p0, p1: ARRAY OF CHAR; i2: INTEGER);
+    VAR p2: ARRAY 32 OF CHAR;
   BEGIN
-    CASE e OF
-    | 0: msg := "option -D expect + or - after identifier"
-    | 1: msg := "option -D expect identifier"
-    | 2: msg := "option -U expect identifier" (* rm *)
-    | 3: msg := "invalid module name"
-    | 4: msg := "invalid integer value"
-    | 5: msg := "unterminated string"
-    | 6: msg := "unknown processor ^0"
-    | 7: msg := "unknown os ^0"
-    | 8: msg := "unknown compiler ^0"
-    | 9: msg := "unknown linker ^0"
-    | 10: msg := "missing argument for option ^0"
-    | 11: msg := "unknown option ^0"
-    | 12: msg := "compiler not selected (use option -g<compiler>)"
-    | 13: msg := "processor not selected (use option -m<processor>)"
-    | 14: msg := "selected processor not supported by native compiler"
-    | 15: msg := "internal linker not required for cpfront"
-    | 16: msg := "cpfront can't produce executable file"
-    | 17: msg := "linker not selected (use option -i<linker>)"
-    | 18: msg := "os not selected (use option -s<system>)"
-    | 19: msg := "specified empty file name"
-    | 20: msg := "recursive import of ^0 in ^1"
-    | 21: msg := "unable to open module ^1"
-    | 22: msg := "linker terminated with code ^2"
-    | 23: msg := "unable to execute linker"
-    | 24: msg := "trap occured"
-    | 25: msg := "compiler not installed (use option -Xg<path> to select executable)"
-    | 26: msg := "linker not installed (use option -Xi<path> to select executable)"
-    ELSE
-      Strings.IntToString(err, msg)
-    END;
     Strings.IntToString(i2, p2);
-    Log.String(Kernel.argv[0]$); Log.String(": ");
-    Log.ParamMsg(msg, p0, p1, p2); Log.Ln;
+    Log.String("cpmake: "); Log.ParamMsg(str, p0, p1, p2); Log.Ln;
     INC(err);
     IF trap THEN
       HALT(100)
@@ -147,7 +96,7 @@ MODULE DswMakeMain;
     i := IdentLen(n);
     IF i # 0 THEN
       IF ~((n[i] = 0X) OR (((n[i] = "+") OR (n[i] = "-")) & (n[i + 1] = 0X))) THEN
-        Error(0, "", "", 0)
+        Error("defines: expectd + or - after identifier (^0)", n, "", 0)
       END;
       v := n[i] # "-"; n[i] := 0X; s := def;
       WHILE (s.next # NIL) & (s.next.name$ # n$) DO s := s.next END;
@@ -159,8 +108,7 @@ MODULE DswMakeMain;
       ELSIF overwrite THEN
         s.next.value := v
       END
-    ELSE
-      Error(1, "", "", 0)
+    ELSE Error("defines: '^0' not valid identifier", n, "", 0)
     END
   END Define;
 
@@ -180,7 +128,7 @@ MODULE DswMakeMain;
         INC(mno)
       END
     ELSE
-      Error(3, "", "", 0)
+      Error("invalid module name", "", "", 0)
     END
   END AddModule;
 
@@ -189,7 +137,7 @@ MODULE DswMakeMain;
   BEGIN
     Strings.StringToInt(s, x, res);
     IF res # 0 THEN
-      Error(4, s, "", 0);
+      Error("invalid integer value", s, "", 0);
       x := def
     END;
     RETURN x
@@ -202,279 +150,74 @@ MODULE DswMakeMain;
     RETURN p
   END NewStr;
 
-  PROCEDURE ToStringList (IN s: ARRAY OF CHAR): StringList;
-    VAR i: INTEGER; ch, term: CHAR; pars: StringList;
-
-    PROCEDURE AddChar (c: CHAR);
-      VAR i, n, len: INTEGER; str: String;
-    BEGIN
-      IF pars = NIL THEN
-        NEW(pars, 1); NEW(pars[0], 2); pars[0, 0] := c
-      ELSE
-        n := LEN(pars) - 1;
-        len := LEN(pars[n]$);
-        NEW(str, len + 2);
-        FOR i := 0 TO len - 1 DO
-          str[i] := pars[n, i]
-        END;
-        str[i] := c;
-        pars[n] := str
-      END
-    END AddChar;
-
-    PROCEDURE AddLine;
-      VAR i, len: INTEGER; p: StringList;
-    BEGIN
-      IF pars = NIL THEN
-        NEW(pars, 1); i := 0;
-      ELSE
-        len := LEN(pars);
-        NEW(p, len + 1);
-        FOR i := 0 TO len - 1 DO
-          p[i] := pars[i]
-        END;
-        pars := p
-      END;
-      NEW(pars[i], 1)
-    END AddLine;
-
-  BEGIN
-    i := 0;
-    REPEAT ch := s[i]; INC(i) UNTIL ch # " ";
-    WHILE ch # 0X DO
-      CASE ch OF
-      | '"', "'":
-        term := ch; ch := s[i]; INC(i);
-        WHILE (ch # term) & (ch # 0X) DO
-          AddChar(ch); ch := s[i]; INC(i)
-        END;
-        IF ch # 0X THEN ch := s[i]; INC(i)
-        ELSE Error(5, "", "", 0)
-        END
-      | " ":
-        REPEAT ch := s[i]; INC(i) UNTIL ch # " ";
-        IF ch # 0X THEN AddLine END
-      ELSE
-        AddChar(ch); ch := s[i]; INC(i)
-      END
-    END;
-    RETURN pars
-  END ToStringList;
-
   PROCEDURE Help;
   BEGIN
     Log.String("Usage: cpmake [options] module..."); Log.Ln;
     Log.String("Options:"); Log.Ln;
-    Log.String("  -a                Enable automatic dependency resolution"); Log.Ln;
-    Log.String("  -Cg params        Pass parameters to Component Pasacal compiler directly"); Log.Ln;
-    Log.String("  -Ci params        Pass parameters to internal linker directly"); Log.Ln;
-    Log.String('  -D ident["+"|"-"] Add preprocessor selector'); Log.Ln;
-    Log.String("  -g compiler       Specify Component Pascal compiler"); Log.Ln;
-    Log.String("     cpfront        BlackBox based C code translator"); Log.Ln;
-    Log.String("     native         BlackBox based native code compiler"); Log.Ln;
-    Log.String("  -h                Print help and quit"); Log.Ln;
-    Log.String("  -i linker         Specify internal linker (native only)"); Log.Ln;
-    Log.String("     dev2           Dev2 based ELF/PE linker"); Log.Ln;
-    Log.String("  -II               Trap on user interrupt (debug)"); Log.Ln;
-    Log.String("  -IT               Trap on first error (debug)"); Log.Ln;
-    Log.String("  -IC               Print module list for compilation and quit"); Log.Ln;
-    Log.String("  -IL               Print module list for linking and quit"); Log.Ln;
-    Log.String("  -Ic               Print file list for compilation and quit"); Log.Ln;
-    Log.String("  -j num            Specifies the number of jobs to run simultaneously"); Log.Ln;
-    Log.String("  -m cpu            Generate code for specified processor"); Log.Ln;
-    Log.String("     none           Unknown processor (cpfront only)"); Log.Ln;
-    Log.String("     486            Intel 486+"); Log.Ln;
-    Log.String("  -o name           Generate executable file (native only)"); Log.Ln;
-    Log.String("  -s os             Generate code for specified operation system"); Log.Ln;
-    Log.String("     none           Unknown operation system"); Log.Ln;
-    Log.String("     freebsd        FreeBSD"); Log.Ln;
-    Log.String("     linux          Linux"); Log.Ln;
-    Log.String("     openbsd        OpenBSD"); Log.Ln;
-    Log.String("     win32          Windows"); Log.Ln;
-    Log.String("  -V                Print version and quit"); Log.Ln;
-    Log.String("  -Xp path          Use executable file for Component Pascal compiler"); Log.Ln;
-    Log.String("  -Xi path          Use executable file for internal linker (native only)"); Log.Ln;
-    Kernel.Quit(1)
-  END Help;
-
-  PROCEDURE Version;
-  BEGIN
-    Log.String(version); Log.Ln;
+    Log.String("  -a          Enable automatic dependency resolution"); Log.Ln;
+    Log.String("  -c          Remove all generated files"); Log.Ln;
+    Log.String("  -t target   Specify target rules"); Log.Ln;
+    Log.String("  -o file     Generate object file"); Log.Ln;
+    Log.String("  -j num      Specifies the number of jobs to run simultaneously"); Log.Ln;
+    Log.String("  -f path     Specifies path to directory with targets"); Log.Ln;
+    Log.String("  -h          Print help"); Log.Ln;
+    Log.String("  -v          Print version"); Log.Ln;
     Kernel.Quit(0)
-  END Version;
-
-  PROCEDURE ParseCommandOpts;
-  BEGIN
-    CASE DswOpts.GetOpt("g:i:") OF
-    | "g": cpcArgs := ToStringList(DswOpts.str);
-    | "i": cplArgs := ToStringList(DswOpts.str);
-    | ":": Error(10, "-C" + DswOpts.str, "", 0)
-    | "?": Error(11, "-C" + DswOpts.str, "", 0)
-    | 0X: Error(11, "-C", "", 0)
-    END
-  END ParseCommandOpts;
-
-  PROCEDURE ParseExternalOpts;
-  BEGIN
-    CASE DswOpts.GetOpt("g:i:") OF
-    | "g": cpcExe := DswOpts.str;
-    | "i": cplExe := DswOpts.str;
-    | ":": Error(10, "-X" + DswOpts.str, "", 0)
-    | "?": Error(11, "-X" + DswOpts.str, "", 0)
-    | 0X: Error(11, "-X", "", 0)
-    END
-  END ParseExternalOpts;
-
-  PROCEDURE ParseInfoOpts;
-  BEGIN
-    CASE DswOpts.GetOpt("CLcIT") OF
-    | "T": trap := TRUE
-    | "I": Kernel.intTrap := TRUE
-    | "C": printCompileModList := TRUE
-    | "L": printLinkModList := TRUE
-    | "c": printCompileFileList := TRUE
-    | ":": Error(10, "-I" + DswOpts.str, "", 0)
-    | "?": Error(11, "-I" + DswOpts.str, "", 0)
-    | 0X: Error(11, "-I", "", 0)
-    END
-  END ParseInfoOpts;
-
-  PROCEDURE ParseFileOpts;
-    VAR d: DevCPM.Directory;
-  BEGIN
-    CASE DswOpts.GetOpt("p:") OF
-    | "p": NEW(d); d.path := DswOpts.str$; d.legacy := TRUE; d.next := dirList; dirList := d
-    | ":": Error(10, "-F" + DswOpts.str, "", 0)
-    | "?": Error(11, "-F" + DswOpts.str, "", 0)
-    | 0X: Error(11, "-F", "", 0)
-    END
-  END ParseFileOpts;
+  END Help;
 
   PROCEDURE ParseArgs;
-    VAR s: String;
   BEGIN
     exe := NIL; auto := FALSE; jobs := 1; def.next := NIL; mno := 0; rno := 0;
-    processor := anymach; os := anyos; compiler := anycp;
+    target := NewStr("default"); base := NewStr("cprules");
     LOOP
-      CASE DswOpts.GetOpt("ao:j:D:m:s:g:i:TCXIFhV") OF
+      CASE DswOpts.GetOpt("acdgo:t:j:f:") OF
       | "a": auto := TRUE
-      | "o": exe := DswOpts.str
-      | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
-      | "m":
-        s := DswOpts.str;
-        Strings.ToLower(s, s);
-        IF s$ = "none" THEN processor := anymach
-        ELSIF s$ = "486" THEN processor := mach386
-        ELSIF s$ = "68k" THEN processor := mach68k
-        ELSE Error(6, s, "", 0)
-        END
-      | "s":
-        s := DswOpts.str;
-        Strings.ToLower(s, s);
-        IF s$ = "none" THEN os := anyos
-        ELSIF s$ = "linux" THEN os := linux
-        ELSIF s$ = "freebsd" THEN os := freebsd
-        ELSIF s$ = "openbsd" THEN os := openbsd
-        ELSIF s$ = "win32" THEN os := win32
-        ELSIF s$ = "cygwin" THEN os := cygwin
-        ELSIF s$ = "darwin" THEN os := darwin
-        ELSE Error(7, s, "", 0)
-        END
-      | "g":
-        s := DswOpts.str;
-        Strings.ToLower(s, s);
-        IF s$ = "native" THEN compiler := cpnative
-        ELSIF s$ = "cpfront" THEN compiler := cpfront
-        ELSE Error(8, s, "", 0)
-        END
-      | "i":
-        s := DswOpts.str;
-        Strings.ToLower(s, s);
-        IF s$ = "dev2" THEN linker := dev2
-        ELSE Error(9, s, "", 0)
-        END
+      | "c": clean := TRUE
+      | "d": trap := TRUE
+      | "f": base := DswOpts.str
       | "h": Help
-      | "V": Version
-      | "D": Define(DswOpts.str, TRUE)
-      | "C": ParseCommandOpts
-      | "X": ParseExternalOpts
-      | "I": ParseInfoOpts
-      | "F": ParseFileOpts
-      | ":": Error(10, "-" + DswOpts.str, "", 0)
-      | "?": Error(11, "-" + DswOpts.str, "", 0)
+      | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
+      | "o": exe := DswOpts.str
+      | "t": target := DswOpts.str
+      | "v": Log.String(version); Log.Ln; Kernel.Quit(0)
+      | ":": Error("missing argument for option -^0", DswOpts.str, "", 0)
+      | "?": Error("unknown option -^0", DswOpts.str, "", 0)
       | "$": AddModule(DswOpts.str, def, dirList)
-      | 0X: EXIT
+      | 00X: EXIT
       END
-    END;
+    END
   END ParseArgs;
 
-  PROCEDURE CheckParams;
-
-    PROCEDURE Default (IN name: ARRAY OF CHAR; value: BOOLEAN);
-    BEGIN
-      IF value = TRUE THEN
-        Define(name + "+", FALSE)
-      ELSE
-        Define(name + "-", FALSE)
+  PROCEDURE ReadDefines;
+    VAR loc: Files.Locator; name: Files.Name; m: DswDocuments.Model; r: DswDocuments.Reader; i, res: INTEGER;
+  BEGIN
+    loc := Files.dir.This(base).This(target);
+    DswDocuments.Open(loc, "defines", m, res);
+    IF res = 0 THEN
+      r := m.NewReader(NIL);
+      r.SetPos(0);
+      r.Read;
+      WHILE ~r.eot DO
+        i := 0;
+        WHILE ~r.eot & (r.char <= 20X) DO r.Read END;
+        WHILE ~r.eot & (r.char > 20X) DO name[i] := r.char; r.Read; INC(i) END;
+        IF i # 0 THEN name[i] := 0X; Define(name, FALSE) END
       END
-    END Default;
+    END
+  END ReadDefines;
 
+  PROCEDURE CheckParams;
   BEGIN
-    IF compiler = anycp THEN
-      Error(12, "", "", 0)
-    ELSIF compiler = cpnative THEN
-      IF processor = anymach THEN
-        Error(13, "", "", 0)
-      ELSIF processor # mach386 THEN
-        Error(14, "", "", 0)
-      END
-    END;
-    IF (compiler = cpfront) & (linker # anyint) THEN
-      Error(15, "", "", 0)
-    END;
-    IF (compiler = cpfront) & (exe # NIL) THEN
-      Error(16, "", "", 0)
-    END;
-    IF (exe # NIL) & (compiler = cpnative) & (linker = anyint) THEN
-      Error(17, "", "", 0)
-    END;
-    IF (linker = dev2) & (os = anyos) THEN
-      Error(18, "", "", 0)
-    END;
     IF (exe # NIL) & (exe^ = "") THEN
-      Error(19, "", "", 0)
+      Error("specified empty file name for exe", "", "", 0)
     END;
-    IF (cpcExe = NIL) & (compiler # anycp) THEN
-      IF compiler = cpnative THEN cpcExe := DswProcs.dir.GetPath("cpc486")
-      ELSIF compiler = cpfront THEN cpcExe := DswProcs.dir.GetPath("cpfront")
-      END;
-      IF cpcExe = NIL THEN
-        Error(25, "", "", 0)
-      END
+    IF target^ = "" THEN
+      Error("specified empty rule", "", "", 0)
     END;
-    IF (cplExe = NIL) & (linker # anyint) THEN
-      cplExe := DswProcs.dir.GetPath("cpl486");
-      IF cplExe = NIL THEN
-        Error(26, "", "", 0)
-      END
+    IF base^ = "" THEN
+      Error("specified empty path to cpmake rules", "", "", 0)
     END;
-    (* cpompiler *)
-    Default("NATIVE",  compiler = cpnative);
-    Default("CPFRONT", compiler = cpfront);
-    (* processor *)
-    Default("I486", processor = mach386);
-    Default("I386", processor = mach386);
-    Default("M68K", processor = mach68k);
-    (* operating system *)
-    Default("LINUX", os = linux);
-    Default("FREEBSD", os = freebsd);
-    Default("OPENBSD", os = openbsd);
-    Default("DARWIN", os = darwin);
-    Default("WIN32", os = win32);
-    Default("CYGWIN", os = cygwin);
-    Default("POSIX", os IN {linux, freebsd, openbsd, darwin, cygwin});
-    (* linker *)
-    Default("DEV2", linker = dev2);
+    ReadDefines
   END CheckParams;
 
   (* --------- loader --------- *)
@@ -690,7 +433,7 @@ MODULE DswMakeMain;
       END;
       EXCL(m.flags, trace)
     ELSE
-      Error(20, m.name$, parent.name$, 0)
+      Error("recursive import of ^0 in ^1", m.name$, parent.name$, 0)
     END
   END Trace;
 
@@ -723,7 +466,7 @@ MODULE DswMakeMain;
         CheckModule(m, src, ok);
         IF ~ok THEN INC(err) END
       ELSE
-        Error(21, m.name$, "", 0)
+        Error("unable to open module ^1", m.name$, "", 0)
       END;
       INC(i)
     END;
@@ -769,66 +512,20 @@ MODULE DswMakeMain;
     RETURN ready
   END Ready;
 
-  PROCEDURE PutParams (w: DswProcs.Process; p: StringList);
-    VAR i: INTEGER;
-  BEGIN
-    ASSERT(w # NIL, 20);
-    IF debugArgs THEN Log.String("PutParams") END;
-    IF p # NIL THEN
-      IF debugArgs THEN Log.String(":[" + p[0]) END;
-      w.PutParam(p[0]);
-      FOR i := 1 TO LEN(p) - 1 DO
-        IF debugArgs THEN Log.String("|" + p[i]) END;
-        w.PutParam(p[i])
-      END;
-      IF debugArgs THEN Log.Char("]") END
-    END;
-    IF debugArgs THEN Log.Ln END
-  END PutParams;
-
-  PROCEDURE PutPathList (w: DswProcs.Process; IN par: ARRAY OF CHAR; base: DevCPM.Directory);
-  BEGIN
-    IF base # NIL THEN
-      PutPathList(w, par, base.next); (* in revese order *)
-      w.PutParam(par);
-      w.PutParam(base.path);
-    END
-  END PutPathList;
-
-  PROCEDURE ExecuteCompiler (m: Module): DswProcs.Process;
-    VAR w: DswProcs.Process; ok: BOOLEAN; s: Selector;
+  PROCEDURE PrepareCompiler (m: Module): DswProcs.Process;
+    VAR p: DswProcs.Process; s: Selector;
   BEGIN
     ASSERT(m # NIL, 20);
     ASSERT(m.odc # "", 21);
     ASSERT(m.worker = NIL, 22);
-    w := DswProcs.dir.New();
-    w.Program(cpcExe);
-    IF trap THEN
-      w.PutParam("-trap")
-    END;
-    w.PutParam("-legacy");
-    PutPathList(w, "-legacysymdir", m.dir);
-    s := def.next;
-    WHILE s # NIL DO
-      IF s.value = TRUE THEN w.PutParam("-define+")
-      ELSE w.PutParam("-define-")
-      END;
-      w.PutParam(s.name$);
-      s := s.next
-    END;
-    PutParams(w, cpcArgs);
-    w.PutParam(m.odc);
-    w.Execute(ok);
-    IF ok THEN
-      Log.String("Compile " + m.name + " (" + m.odc + ")"); Log.Ln;
-    ELSE
-      w := NIL
-    END;
-    RETURN w
-  END ExecuteCompiler;
+    p := DswProcs.dir.New();
+    p.Program(base + "/" + target + "/" + "build");
+    p.PutParam(m.odc);
+    RETURN p
+  END PrepareCompiler;
 
   PROCEDURE Compile;
-    VAR i, j, num: INTEGER; ok: BOOLEAN; m: Module; w: DswProcs.Process;
+    VAR i, j, num, res: INTEGER; ok: BOOLEAN; m: Module; w: DswProcs.Process;
   BEGIN
     IF mno = 0 THEN RETURN END;
     num := 0; j := 0;
@@ -837,9 +534,10 @@ MODULE DswMakeMain;
       WHILE (err = 0) & (i < mno) & (j < jobs) DO
         m := cmpList[i];
         IF Ready(m) THEN
-          w := ExecuteCompiler(m);
+          w := PrepareCompiler(m);
           IF debugJobs THEN Log.String("Start job " + m.name) END;
-          IF w # NIL THEN
+          w.Execute(ok);
+          IF ok THEN
             IF debugJobs THEN Log.String(" ok") END;
             m.worker := w;
             INC(j)
@@ -858,8 +556,9 @@ MODULE DswMakeMain;
           m := cmpList[i];
           w := m.worker;
           IF (w # NIL) & w.IsTerminated() THEN
-            IF debugJobs THEN Log.String("Stop job " + m.name); Log.Int(w.Result()); Log.Ln END;
-            IF w.Result() = 0 THEN
+            res := w.Result();
+            IF debugJobs THEN Log.String("Stop job " + m.name); Log.Int(res); Log.Ln END;
+            IF res = 0 THEN
               INCL(m.flags, hasObj);
               INCL(m.flags, hasSym);
               INC(num)
@@ -876,113 +575,59 @@ MODULE DswMakeMain;
     END
   END Compile;
 
-  PROCEDURE LinkDev2;
-    VAR p: DswProcs.Process; i, res: INTEGER; ok: BOOLEAN;
-  BEGIN
-    ASSERT((exe # NIL) & (exe^ # ""), 20);
-    ASSERT(processor = mach386, 21);
-    ASSERT(compiler = cpnative, 22);
-    p := DswProcs.dir.New();
-    p.Program(cplExe);
-    IF trap THEN
-      p.PutParam("-trap")
-    END;
-    PutPathList(p, "-legacycodedir", dirList);
-    IF os # anyos THEN
-      p.PutParam("-os");
-      CASE os OF
-      | linux: p.PutParam("linux")
-      | freebsd: p.PutParam("freebsd")
-      | openbsd: p.PutParam("openbsd")
-      | win32, cygwin: p.PutParam("win32")
-      | darwin: p.PutParam("darwin")
-      END
-    END;
-    p.PutParam("-kernel");
-    p.PutParam("Kernel");
-    p.PutParam("-main");
-    p.PutParam("Kernel");
-    p.PutParam("-legacycodedir");
-    p.PutParam(".");
-    p.PutParam("-o");
-    p.PutParam(exe);
-    PutParams(p, cplArgs);
-    i := 0;
-    WHILE i < mno DO
-      IF ~(library IN lnkList[i].flags) THEN
-        p.PutParam(lnkList[i].name$)
-      END;
-      INC(i)
-    END;
-    p.Execute(ok);
-    IF ok THEN
-      Log.String("Link "); Log.String(exe); Log.Ln;
-      res := p.Result();
-      IF res # 0 THEN
-        Error(22, "", "", res)
-      END
-    ELSE
-      Error(23, "", "", 0)
-    END
-  END LinkDev2;
-
   PROCEDURE Link;
+    VAR p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER;
   BEGIN
     IF exe # NIL THEN
-      CASE linker OF
-      | anyint: (* do not link *)
-      | dev2: LinkDev2
-      END
-    END
-  END Link;
-
-  PROCEDURE PrintInfo;
-    VAR i: INTEGER;
-  BEGIN
-    IF printCompileModList THEN
-      FOR i := 0 TO mno - 1 DO
-        Log.String(cmpList[i].name$); Log.Char(" ")
-      END;
-      Log.Ln
-    ELSIF printLinkModList THEN
+      p := DswProcs.dir.New();
+      p.Program(base + "/" + target + "/" + "link");
+      p.PutParam(exe$);
       FOR i := 0 TO mno - 1 DO
         IF ~(library IN lnkList[i].flags) THEN
-          Log.String(lnkList[i].name$); Log.Char(" ")
+          p.PutParam(lnkList[i].name$)
         END
       END;
-      Log.Ln
-    ELSIF printCompileFileList THEN
-      FOR i := 0 TO mno - 1 DO
-        Log.String(cmpList[i].odc); Log.Char(" ")
-      END;
-      Log.Ln
-  (*
-    ELSIF printLinkFileList THEN
-      FOR i := 0 TO mno - 1 DO
-        IF ~(library IN lnkList[i].flags) THEN
-          Log.String(lnkList[i].ocf); Log.Char(" ")
+      p.Execute(ok);
+      IF ok THEN
+        p.Wait;
+        res := p.Result();
+        IF res # 0 THEN
+          Error("link failed with code ^2", "", "", res)
         END
-      END;
-      Log.Ln
-  *)
+      ELSE Error("link failed: unable to execute script", "", "", 0)
+      END
     END
-  END PrintInfo;
+  END Link;
+
+  PROCEDURE Cleanup;
+    VAR p: DswProcs.Process; ok: BOOLEAN; res: INTEGER;
+  BEGIN
+    IF clean THEN
+      p := DswProcs.dir.New();
+      p.Program(base + "/" + target + "/" + "clean");
+      p.Execute(ok);
+      IF ok THEN
+        p.Wait;
+        res := p.Result();
+        IF res # 0 THEN
+          Error("cleanup failed with code ^2", "", "", res)
+        END
+      ELSE Error("cleanup failed: unable to execute script", "", "", 0)
+      END
+    END
+  END Cleanup;
 
   PROCEDURE Main;
   BEGIN
     IF Kernel.trapCount = 0 THEN
       ParseArgs;
       IF err = 0 THEN
-        IF printCompileModList OR printLinkModList OR printCompileFileList THEN
-          auto := TRUE
-        END;
         CheckParams;
         IF err = 0 THEN
           CheckDeps;
           IF err = 0 THEN
-            IF printCompileModList OR printLinkModList OR printCompileFileList THEN
-              PrintInfo
-            ELSE
+            Cleanup;
+            IF err = 0 THEN
               Compile;
               IF err = 0 THEN
                 Link
@@ -991,7 +636,7 @@ MODULE DswMakeMain;
           END
         END
       END
-    ELSE Error(24, "", "", 0)
+    ELSE Error("trap occured", "", "", 0)
     END;
     IF err = 0 THEN Kernel.Quit(0)
     ELSE Kernel.Quit(1)