X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=src%2Fgeneric%2FDsw%2FMod%2FMakeMain.cp;h=ad0ead7eb2d123284edf9388fa1e50b62c15026d;hp=e024a3c913d0944e511175121e9b210f793d901a;hb=HEAD;hpb=d04c6367a927c536552ae595c92cc15347d3a65f

diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp
index e024a3c..ad0ead7 100644
--- a/src/generic/Dsw/Mod/MakeMain.cp
+++ b/src/generic/Dsw/Mod/MakeMain.cp
@@ -3,7 +3,7 @@ MODULE DswMakeMain;
   IMPORT Kernel, Files, Log, Strings, DswOpts, DswProcs, DswDocuments, DevCPM, DevCPT, DevCPR, DevCPS;
 
   CONST
-    version = "0.3.0";
+    version = "0.3";
 
     modDir = "Mod";
     sysDir = "System";
@@ -29,28 +29,17 @@ MODULE DswMakeMain;
     module = 75; eof = 76;
 
     (* 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;
+    imported = 0; trace = 1; hasObj = 2; hasSym = 3; hasErrors = 4;
+    library = 5; force = 6;
 
     debugImport = FALSE;
     debugOrder = FALSE;
     debugJobs = FALSE;
-    debugArgs = FALSE;
 
   TYPE
+    Name = ARRAY 256 OF CHAR;
+
     String = POINTER TO ARRAY OF CHAR;
-    StringList = POINTER TO ARRAY OF String;
 
     Selector = POINTER TO RECORD
       name: DevCPT.Name;
@@ -60,6 +49,7 @@ MODULE DswMakeMain;
 
     Module = POINTER TO RECORD
       name: DevCPT.Name;
+      library: DevCPT.Name;
       odc: Files.Name;
       depth: INTEGER; (* 0: leaf, MAX: root *)
       dir: DevCPM.Directory;
@@ -69,60 +59,34 @@ MODULE DswMakeMain;
       worker: DswProcs.Process;
     END;
 
+    Library = POINTER TO RECORD
+      name: Name;
+      library: Name;
+      next: Library;
+    END;
+
+  VAR (* options *)
+    auto, trap, clean, symonly, nocode1, nocode2: 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;
-    jobs: INTEGER;
-    exe: String;
-    printCompileModList: BOOLEAN;
-    printLinkModList: BOOLEAN;
-    printCompileFileList: BOOLEAN;
+    libList: Library;
 
-  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"
-    | 3: msg := "module name must be identifier"
-    | 4: msg := "expected integer" (* p0 = in str *)
-    | 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"
-    | 13: msg := "processor not selected"
-    | 14: msg := "processor not supported by native compiler"
-    | 15: msg := "internal linker not required for cpfront"
-    | 16: msg := "cpfront can't out executable file"
-    | 17: msg := "linker not selected"
-    | 18: msg := "os not selected"
-    | 19: msg := "output file name can't be empty"
-    | 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"
-    | 26: msg := "linker not installed"
-    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;
-    INC(err)
+    Log.String("cpmake: "); Log.ParamMsg(str, p0, p1, p2); Log.Ln;
+    INC(err);
+    IF trap THEN
+      HALT(100)
+    END
   END Error;
 
   (* --------- options --------- *)
@@ -143,7 +107,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("expectd + or - after selector 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;
@@ -155,11 +119,15 @@ MODULE DswMakeMain;
       ELSIF overwrite THEN
         s.next.value := v
       END
-    ELSE
-      Error(1, "", "", 0)
+    ELSE Error("selector '^0' have invalid identifier", n, "", 0)
     END
   END Define;
 
+  PROCEDURE DefineNew (IN n: ARRAY OF CHAR);
+  BEGIN
+    Define(n, FALSE);
+  END DefineNew;
+
   PROCEDURE AddModule (IN n: ARRAY OF CHAR; selectors: Selector; dir: DevCPM.Directory);
     VAR i, res: INTEGER; m: Module;
   BEGIN
@@ -176,16 +144,59 @@ MODULE DswMakeMain;
         INC(mno)
       END
     ELSE
-      Error(3, "", "", 0)
+      Error("invalid module name", "", "", 0)
     END
   END AddModule;
 
+  PROCEDURE AddLibrary (IN key, val: ARRAY OF CHAR);
+    VAR x: Library;
+  BEGIN
+    x := libList;
+    WHILE (x # NIL) & (x.name$ # key$) DO x := x.next END;
+    IF x # NIL THEN x.library := val$
+    ELSE NEW(x); x.name := key$; x.library := val$; x.next := libList; libList := x
+    END
+  END AddLibrary;
+
+  PROCEDURE AddLib (IN s: ARRAY OF CHAR);
+    VAR key, val: Name; i, j: INTEGER;
+  BEGIN
+    i := 0; j := 0;
+    WHILE (s[i] # 0X) & (s[i] # "=") DO
+      key[j] := s[i];
+      INC(j);
+      INC(i)
+    END;
+    key[j] := 0X;
+    j := 0;
+    IF s[i] = "=" THEN
+      INC(i);
+      WHILE s[i] # 0X DO
+        val[j] := s[i];
+        INC(j);
+        INC(i)
+      END
+    END;
+    val[j] := 0X;
+    IF key # "" THEN AddLibrary(key, val)
+    ELSE Error("empty library key", "", "", 0)
+    END
+  END AddLib;
+
+  PROCEDURE FindLib (IN key: ARRAY OF CHAR): Library;
+    VAR x: Library;
+  BEGIN
+    x := libList;
+    WHILE (x # NIL) & (x.name$ # key$) DO x := x.next END;
+    RETURN x
+  END FindLib;
+
   PROCEDURE StrToInt (IN s: ARRAY OF CHAR; def: INTEGER): INTEGER;
     VAR x, res: INTEGER;
   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
@@ -198,290 +209,90 @@ 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("  -Tm 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("  -Ts os       Generate code for specified operation system"); Log.Ln;
-    Log.String("      none     Unknown operation system"); Log.Ln;
-    Log.String("      linux    Linux"); Log.Ln;
-    Log.String("  -Tg compiler Specify Component Pascal compiler"); Log.Ln;
-    Log.String("      native   BlackBox based native code compiler"); Log.Ln;
-    Log.String("      cpfront  BlackBox based C code translator"); Log.Ln;
-    Log.String("  -Ti linker   Specify internal linker (native only)"); Log.Ln;
-    Log.String("      dev2     Dev2 based ELF/PE linker"); Log.Ln;
-(*
-    Log.String("  -Fp path     Add path with project"); 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;
-    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("  -II          Trap on user interrupt"); 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("  -Il          Print file list for linking and quit"); Log.Ln;
-*)
-    Log.String("  -a           Enable automatic dependency resolution"); Log.Ln;
-    Log.String("  -o name      Generate executable file"); Log.Ln;
-    Log.String("  -j num       Specifies the number of jobs to run simultaneously"); Log.Ln;
-    Log.String('  -D ident["+"|"-"] Add preprocessor selector'); Log.Ln;
-    Log.String("  -h           Print help and quit"); Log.Ln;
-    Log.String("  -V           Print version and quit"); 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("  -b          Do not compile modules"); Log.Ln;
+    Log.String("  -x          Do not link objects"); Log.Ln;
+    Log.String("  -c          Remove all generated files"); Log.Ln;
+    Log.String("  -s          Generate symbol files only"); Log.Ln;
+    Log.String("  -d selector Add selector"); Log.Ln;
+    Log.String("  -r lib[=s]  Replace library name on link stage"); 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 ParseTargetOpts;
-    VAR s: DswOpts.String;
-  BEGIN
-    CASE DswOpts.GetOpt("m:s:g:i:") OF
-    | "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
-    | ":": Error(10, "-T" + DswOpts.str, "", 0)
-    | "?": Error(11, "-T" + DswOpts.str, "", 0)
-    | 0X: Error(11, "-T", "", 0)
-    END
-  END ParseTargetOpts;
-
-  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("CLcI") OF
-    | "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;
   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:TCXIFhV") OF
+      CASE DswOpts.GetOpt("acbxd:sgGo:t:j:f:r:h") OF
       | "a": auto := TRUE
-      | "o": exe := DswOpts.str
-      | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
+      | "b": nocode1 := TRUE
+      | "x": nocode2 := TRUE
+      | "c": clean := TRUE
+      | "g": trap := TRUE
+      | "G": Kernel.intTrap := TRUE
+      | "s": symonly := TRUE
+      | "f": base := DswOpts.str
+      | "d": Define(DswOpts.str, TRUE)
+      | "r": AddLib(DswOpts.str)
       | "h": Help
-      | "V": Version
-      | "D": Define(DswOpts.str, TRUE)
-      | "T": ParseTargetOpts
-      | "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 ReadLines (loc: Files.Locator; IN name: Files.Name; p: PROCEDURE (IN s: ARRAY OF CHAR));
+    VAR s: Name; m: DswDocuments.Model; r: DswDocuments.Reader; i, res: INTEGER;
+  BEGIN
+    ASSERT(loc # NIL, 20);
+    ASSERT(name # "", 21);
+    ASSERT(p # NIL, 22);
+    DswDocuments.Open(loc, name, 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 s[i] := r.char; r.Read; INC(i) END;
+        IF i # 0 THEN s[i] := 0X; p(s) END
       END
-    END Default;
+    END
+  END ReadLines;
 
+  PROCEDURE CheckParams;
+    VAR loc: Files.Locator;
   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);
+    loc := Files.dir.This(base).This(target);
+    ReadLines(loc, "defines", DefineNew);
+    ReadLines(loc, "libs", AddLib)
   END CheckParams;
 
   (* --------- loader --------- *)
@@ -541,7 +352,7 @@ MODULE DswMakeMain;
         IF sym = eql THEN DevCPS.Get(sym)
         ELSE INCL(DevCPM.options, DevCPM.noCode)
         END;
-        IF sym = string THEN INCL(m.flags, library); DevCPS.Get(sym)
+        IF sym = string THEN INCL(m.flags, library); m.library := DevCPS.str$; DevCPS.Get(sym)
         ELSE err(string)
         END;
         CheckSym(rbrak)
@@ -597,16 +408,14 @@ MODULE DswMakeMain;
   BEGIN
     DevCPM.Init(source);
     DevCPM.symList := m.dir;
-(*
-    DevCPM.codePath := m.outcode;
-    DevCPM.symPath := m.outsym;
-*)
+    (*DevCPM.codePath := m.outcode;*)
+    (*DevCPM.symPath := m.outsym;*)
     DevCPM.name := m.name$;
-(*
-    IF m.found THEN INCL(DevCPM.options, DevCPM.comAware) END;
-    IF errorTrap IN m.opts THEN INCL(DevCPM.options, DevCPM.trap) END;
-    IF oberon IN m.opts THEN INCL(DevCPM.options, DevCPM.oberon) END;
-*)
+    INCL(DevCPM.options, DevCPM.comAware);
+    IF trap THEN
+      INCL(DevCPM.options, DevCPM.trap)
+    END;
+    (*IF oberon IN m.opts THEN INCL(DevCPM.options, DevCPM.oberon) END;*)
     DevCPR.Init;
     s := def.next;
     WHILE s # NIL DO
@@ -616,39 +425,44 @@ MODULE DswMakeMain;
     ParseModule(m);
     DevCPR.Check;
     ok := DevCPM.noerr;
+    IF DevCPR.used THEN INCL(m.flags, force) END;
     DevCPR.Close;
     DevCPM.InsertMarks;
     DevCPM.Close;
     Kernel.FastCollect
   END CheckModule;
 
-  PROCEDURE MakePath (IN dir, name: Files.Name; IN type: Files.Type; OUT path: Files.Name);
+  PROCEDURE GetModText (IN base, sub, name: Files.Name; OUT path: Files.Name; OUT text: DswDocuments.Model);
+    VAR res: INTEGER; loc: Files.Locator;
   BEGIN
     ASSERT(name # "", 21);
-    IF dir = "" THEN path := modDir + "/" + name
-    ELSE path := dir + "/" + modDir + "/" + name
+    IF sub = "" THEN
+      loc := Files.dir.This(base);
+      IF base = "" THEN path := name
+      ELSE path := base + "/" + name
+      END
+    ELSE
+      loc := Files.dir.This(base).This(sub).This(modDir);
+      IF base = "" THEN path := sub + "/" + modDir + "/" + name
+      ELSE path := base + "/" + sub + "/" + modDir + "/" + name
+      END
     END;
-    Kernel.MakeFileName(path, type)
-  END MakePath;
+    DswDocuments.Open(loc, name, text, res)
+  END GetModText;
 
-  PROCEDURE Open (loc: Files.Locator; IN sub, name: Files.Name; OUT path: Files.Name; OUT text: DswDocuments.Model);
-    VAR res: INTEGER;
+  PROCEDURE Open (IN base, sub, name: Files.Name; OUT path: Files.Name; OUT text: DswDocuments.Model);
+    VAR cp, odc: Files.Name;
   BEGIN
-    ASSERT(loc # NIL, 20);
-    ASSERT(name # "", 21);
-    (* !!! use Kernel.MakeFileName instead ".ext" concat !!! *)
-    MakePath(sub, name, "cp", path);
-    DswDocuments.Open(loc, name + ".cp", text, res);
+    ASSERT(name # "", 20);
+    Files.dir.GetFileName(name, "cp", cp); (* !!! *)
+    GetModText(base, sub, cp, path, text);
     IF text = NIL THEN
-      MakePath(sub, name, "odc", path);
-      DswDocuments.Open(loc, name + ".odc", text, res);
+      Files.dir.GetFileName(name, "odc", odc); (* !!! *)
+      GetModText(base, sub, odc, path, text);
       IF (text = NIL) & (sub = "") THEN
-        MakePath(sysDir, name, "cp", path);
-        loc := Files.dir.This(sysDir).This(modDir);
-        DswDocuments.Open(loc, name + ".cp", text, res);
+        GetModText(base, sysDir, cp, path, text);
         IF text = NIL THEN
-          MakePath(sysDir, name, "odc", path);
-          DswDocuments.Open(loc, name + ".odc", text, res);
+          GetModText(base, sysDir, odc, path, text);
           IF text = NIL THEN
             path := ""
           END
@@ -659,17 +473,18 @@ MODULE DswMakeMain;
 
   PROCEDURE GetSource (IN modName: ARRAY OF CHAR; list: DevCPM.Directory; OUT path: Files.Name; OUT s: String);
     VAR
-      sub, name: Files.Name; loc: Files.Locator; base: DevCPM.Directory; 
-      text: DswDocuments.Model; r: DswDocuments.Reader; i, res: INTEGER;
+      sub, name: Files.Name;
+      base: DevCPM.Directory;
+      text: DswDocuments.Model;
+      r: DswDocuments.Reader;
+      i, res: INTEGER;
   BEGIN
     s := NIL; path := ""; base := list;
     Kernel.SplitName(modName, sub, name);
-    loc := Files.dir.This(sub).This(modDir);
-    Open(loc, sub, name, path, text);
+    Open("", sub, name, path, text);
     WHILE (text = NIL) & (base # NIL) DO
       ASSERT(base.legacy, 100);
-      loc := Files.dir.This(base.path).This(sub).This(modDir);
-      Open(loc, sub, name, path, text);
+      Open(base.path, sub, name, path, text);
       base := base.next
     END;
     IF text # NIL THEN
@@ -699,7 +514,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;
 
@@ -732,7 +547,7 @@ MODULE DswMakeMain;
         CheckModule(m, src, ok);
         IF ~ok THEN INC(err) END
       ELSE
-        Error(21, m.name$, "", 0)
+        Error("unable to open module ^0", m.name$, "", 0)
       END;
       INC(i)
     END;
@@ -778,63 +593,64 @@ MODULE DswMakeMain;
     RETURN ready
   END Ready;
 
-  PROCEDURE PutParams (w: DswProcs.Process; p: StringList);
-    VAR i: INTEGER;
+  PROCEDURE PrepareCompilerDeps (m: Module; p: DswProcs.Process; root, libsOnly: BOOLEAN);
+    VAR i: INTEGER; s: ARRAY 3 OF CHAR; lib: Library;
   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])
+    IF ~(trace IN m.flags) THEN
+      INCL(m.flags, trace);
+      FOR i := 0 TO m.mno - 1 DO
+        PrepareCompilerDeps(m.imp[i], p, FALSE, libsOnly)
       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);
+      IF ~libsOnly OR (library IN m.flags) THEN
+        IF library IN m.flags THEN s := "-l" ELSE s := "-m" END;
+        IF root THEN s[1] := CAP(s[1]) END;
+        IF library IN m.flags THEN
+          lib := FindLib(m.library$);
+          IF lib # NIL THEN
+            IF lib.library$ # "" THEN
+              p.PutParam(s);
+              p.PutParam(lib.library$)
+            END
+          ELSE
+            p.PutParam(s);
+            p.PutParam(m.library$)
+          END
+        ELSE
+          p.PutParam(s);
+          p.PutParam(m.name$)
+        END
+      END;
+      EXCL(m.flags, trace)
     END
-  END PutPathList;
+  END PrepareCompilerDeps;
 
-  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; i: INTEGER;
   BEGIN
     ASSERT(m # NIL, 20);
     ASSERT(m.odc # "", 21);
     ASSERT(m.worker = NIL, 22);
-    w := DswProcs.dir.New();
-    w.Program(cpcExe);
-    w.PutParam("-legacy");
-    PutPathList(w, "-legacysymdir", m.dir);
+    p := DswProcs.dir.New();
+    p.Program(base + "/" + target + "/" + "build");
+    p.PutParam(m.odc);
+    IF nocode1 THEN p.PutParam("-b") END;
+    IF nocode2 THEN p.PutParam("-x") END;
+    IF force IN m.flags THEN p.PutParam("-f") END;
+    IF symonly OR (library IN m.flags) THEN p.PutParam("-s") END;
     s := def.next;
     WHILE s # NIL DO
-      IF s.value = TRUE THEN w.PutParam("-define+")
-      ELSE w.PutParam("-define-")
-      END;
-      w.PutParam(s.name$);
+      IF s.value THEN p.PutParam("-D") ELSE p.PutParam("-d") END;
+      p.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
+    FOR i := 0 TO m.mno - 1 DO
+      PrepareCompilerDeps(m.imp[i], p, TRUE, FALSE);
     END;
-    RETURN w
-  END ExecuteCompiler;
+    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;
@@ -843,9 +659,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)
@@ -864,8 +681,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)
@@ -882,108 +700,64 @@ 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);
-    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
+    IF ~symonly & (exe # NIL) 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(" ")
+        IF library IN lnkList[i].flags THEN
+          PrepareCompilerDeps(lnkList[i], p, FALSE, TRUE)
         END
       END;
-      Log.Ln*)
+      p.Execute(ok);
+      IF ok THEN
+        p.Wait;
+        res := p.Result();
+        IF res # 0 THEN
+          Error("link failed with code ^2", "", "", res)
+        END
+      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
@@ -992,11 +766,11 @@ 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)
-    END;
+    END
   END Main;
 
 BEGIN