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

diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp
index 57a46d9..e024a3c 100644
--- a/src/generic/Dsw/Mod/MakeMain.cp
+++ b/src/generic/Dsw/Mod/MakeMain.cp
@@ -3,6 +3,11 @@ MODULE DswMakeMain;
   IMPORT Kernel, Files, Log, Strings, DswOpts, DswProcs, DswDocuments, DevCPM, DevCPT, DevCPR, DevCPS;
 
   CONST
+    version = "0.3.0";
+
+    modDir = "Mod";
+    sysDir = "System";
+
     maxImps = 127;
     maxJobs = maxImps;
 
@@ -30,7 +35,7 @@ MODULE DswMakeMain;
     anymach = 0; cmach = 1; mach386 = 10; mach68k = 20;
 
     (* operation system types *)
-    anyos = 0; linux = 1; freebsd = 2; openbsd = 3; win32 = 4;
+    anyos = 0; linux = 1; freebsd = 2; openbsd = 3; win32 = 4; cygwin = 5; darwin = 6;
 
     (* compiler types *)
     anycp = 0; cpnative = 1; cpfront = 2;
@@ -55,9 +60,9 @@ MODULE DswMakeMain;
 
     Module = POINTER TO RECORD
       name: DevCPT.Name;
-      path: Files.Name;
-      selectors: Selector; (* with head, list of selectors for this module *)
+      odc: Files.Name;
       depth: INTEGER; (* 0: leaf, MAX: root *)
+      dir: DevCPM.Directory;
       mno: INTEGER;
       imp: ARRAY maxImps OF Module;
       flags: SET;
@@ -65,16 +70,60 @@ MODULE DswMakeMain;
     END;
 
   VAR
-    err: INTEGER;
+    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;
+
+  PROCEDURE Error (e: INTEGER; IN p0, p1: ARRAY OF CHAR; i2: INTEGER);
+    VAR msg, p2: ARRAY 128 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)
+  END Error;
 
   (* --------- options --------- *)
 
@@ -88,54 +137,30 @@ MODULE DswMakeMain;
     RETURN i
   END IdentLen;
 
-  PROCEDURE Define (n: ARRAY OF CHAR);
+  PROCEDURE Define (n: ARRAY OF CHAR; overwrite: BOOLEAN);
     VAR i: INTEGER; v: BOOLEAN; s: Selector;
   BEGIN
     i := IdentLen(n);
     IF i # 0 THEN
       IF ~((n[i] = 0X) OR (((n[i] = "+") OR (n[i] = "-")) & (n[i + 1] = 0X))) THEN
-        Log.String("option -D expect + or - after identifier"); Log.Ln; INC(err)
+        Error(0, "", "", 0)
       END;
       v := n[i] # "-"; n[i] := 0X; s := def;
       WHILE (s.next # NIL) & (s.next.name$ # n$) DO s := s.next END;
       IF s.next = NIL THEN
         NEW(s.next);
         Strings.StringToUtf8(n, s.next.name, i);
-        ASSERT(i = 0)
-      END;
-      s.next.value := v
+        ASSERT(i = 0);
+        s.next.value := v
+      ELSIF overwrite THEN
+        s.next.value := v
+      END
     ELSE
-      Log.String("option -D expect identifier"); Log.Ln; INC(err)
+      Error(1, "", "", 0)
     END
   END Define;
 
-  PROCEDURE Undefine (IN n: ARRAY OF CHAR);
-    VAR i: INTEGER; s: Selector;
-  BEGIN
-    i := IdentLen(n);
-    IF (i # 0) & (n[i] = 0X) THEN
-      s := def;
-      WHILE (s.next # NIL) & (s.next.name$ # n$) DO s := s.next END;
-      IF s.next # NIL THEN s.next := s.next.next END
-    ELSE
-      Log.String("option -U expect identifier"); Log.Ln; INC(err)
-    END
-  END Undefine;
-
-  PROCEDURE CopySelectorList (base: Selector): Selector;
-    VAR s, t, x: Selector;
-  BEGIN
-    ASSERT(base # NIL, 20);
-    s := base; NEW(t); x := t;
-    WHILE s # NIL DO
-      x^ := s^;
-      IF s.next # NIL THEN NEW(x.next); x := x.next END;
-      s := s.next
-    END;
-    RETURN t
-  END CopySelectorList;
-
-  PROCEDURE AddModule (IN n: ARRAY OF CHAR; selectors: Selector);
+  PROCEDURE AddModule (IN n: ARRAY OF CHAR; selectors: Selector; dir: DevCPM.Directory);
     VAR i, res: INTEGER; m: Module;
   BEGIN
     i := IdentLen(n);
@@ -146,12 +171,12 @@ MODULE DswMakeMain;
         NEW(m);
         Strings.StringToUtf8(n, m.name, res);
         ASSERT(res = 0);
-        m.selectors := CopySelectorList(selectors);
+        m.dir := dir;
         modList[i] := m;
         INC(mno)
       END
     ELSE
-      Log.String("module name must be identifier"); Log.Ln; INC(err)
+      Error(3, "", "", 0)
     END
   END AddModule;
 
@@ -160,7 +185,7 @@ MODULE DswMakeMain;
   BEGIN
     Strings.StringToInt(s, x, res);
     IF res # 0 THEN
-      Log.String("expected integer"); Log.Ln; INC(err);
+      Error(4, s, "", 0);
       x := def
     END;
     RETURN x
@@ -220,7 +245,7 @@ MODULE DswMakeMain;
           AddChar(ch); ch := s[i]; INC(i)
         END;
         IF ch # 0X THEN ch := s[i]; INC(i)
-        ELSE Log.String("unterminated string"); Log.Ln; INC(err)
+        ELSE Error(5, "", "", 0)
         END
       | " ":
         REPEAT ch := s[i]; INC(i) UNTIL ch # " ";
@@ -249,24 +274,33 @@ MODULE DswMakeMain;
     Log.String("      dev2     Dev2 based ELF/PE linker"); Log.Ln;
 (*
     Log.String("  -Fp path     Add path with project"); Log.Ln;
-    Log.String("  -Fx path     Add postfix for project directories"); 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("  -a           Enable automatic dependency resolution"); 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('  -U ident     Remove preprocessor selector'); Log.Ln;
-    Log.String("  -h           Print help"); Log.Ln;
-    Log.String("  -v           Print version"); 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;
+    Kernel.Quit(0)
+  END Version;
+
   PROCEDURE ParseTargetOpts;
     VAR s: DswOpts.String;
   BEGIN
@@ -277,31 +311,36 @@ MODULE DswMakeMain;
       IF s$ = "none" THEN processor := anymach
       ELSIF s$ = "486" THEN processor := mach386
       ELSIF s$ = "68k" THEN processor := mach68k
-      ELSE Log.String("unknwon processor "); Log.String(s); Log.Ln; INC(err)
+      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
-      ELSE Log.String("unknwon os "); Log.String(s); Log.Ln; INC(err)
+      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 Log.String("unknwon compiler "); Log.String(s); Log.Ln; INC(err)
+      ELSE Error(8, s, "", 0)
       END
     | "i":
       s := DswOpts.str;
       Strings.ToLower(s, s);
       IF s$ = "dev2" THEN linker := dev2
-      ELSE Log.String("unknwon linker "); Log.String(s); Log.Ln; INC(err)
+      ELSE Error(9, s, "", 0)
       END
-    | ":": Log.String("missing argument for option -T"); Log.String(DswOpts.str); Log.Ln; INC(err)
-    | "?": Log.String("unknown option -T"); Log.String(DswOpts.str); Log.Ln; INC(err)
-    | 0X: Log.String("unknown option -T"); Log.Ln; INC(err)
+    | ":": Error(10, "-T" + DswOpts.str, "", 0)
+    | "?": Error(11, "-T" + DswOpts.str, "", 0)
+    | 0X: Error(11, "-T", "", 0)
     END
   END ParseTargetOpts;
 
@@ -310,9 +349,9 @@ MODULE DswMakeMain;
     CASE DswOpts.GetOpt("g:i:") OF
     | "g": cpcArgs := ToStringList(DswOpts.str);
     | "i": cplArgs := ToStringList(DswOpts.str);
-    | ":": Log.String("missing argument for option -C"); Log.String(DswOpts.str); Log.Ln; INC(err)
-    | "?": Log.String("unknown option -C"); Log.String(DswOpts.str); Log.Ln; INC(err)
-    | 0X: Log.String("unknown option -C"); Log.Ln; INC(err)
+    | ":": Error(10, "-C" + DswOpts.str, "", 0)
+    | "?": Error(11, "-C" + DswOpts.str, "", 0)
+    | 0X: Error(11, "-C", "", 0)
     END
   END ParseCommandOpts;
 
@@ -321,69 +360,128 @@ MODULE DswMakeMain;
     CASE DswOpts.GetOpt("g:i:") OF
     | "g": cpcExe := DswOpts.str;
     | "i": cplExe := DswOpts.str;
-    | ":": Log.String("missing argument for option -X"); Log.String(DswOpts.str); Log.Ln; INC(err)
-    | "?": Log.String("unknown option -X"); Log.String(DswOpts.str); Log.Ln; INC(err)
-    | 0X: Log.String("unknown option -X"); Log.Ln; INC(err)
+    | ":": 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;
+
   PROCEDURE ParseArgs;
   BEGIN
     exe := NIL; auto := FALSE; jobs := 1; def.next := NIL; mno := 0; rno := 0;
     processor := anymach; os := anyos; compiler := anycp;
     LOOP
-      CASE DswOpts.GetOpt("ao:j:D:U:TCXh") OF
+      CASE DswOpts.GetOpt("ao:j:D:TCXIFhV") OF
       | "a": auto := TRUE
       | "o": exe := DswOpts.str
       | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
       | "h": Help
-      | "D": Define(DswOpts.str)
-      | "U": Undefine(DswOpts.str)
+      | "V": Version
+      | "D": Define(DswOpts.str, TRUE)
       | "T": ParseTargetOpts
       | "C": ParseCommandOpts
       | "X": ParseExternalOpts
-      | ":": Log.String("missing argument for option -"); Log.String(DswOpts.str); Log.Ln; INC(err)
-      | "?": Log.String("unknown option -"); Log.String(DswOpts.str); Log.Ln; INC(err)
-      | "$": AddModule(DswOpts.str, def)
+      | "I": ParseInfoOpts
+      | "F": ParseFileOpts
+      | ":": Error(10, "-" + DswOpts.str, "", 0)
+      | "?": Error(11, "-" + DswOpts.str, "", 0)
+      | "$": AddModule(DswOpts.str, def, dirList)
       | 0X: 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)
+      END
+    END Default;
+
   BEGIN
     IF compiler = anycp THEN
-      Log.String("compiler not selected"); Log.Ln; INC(err)
+      Error(12, "", "", 0)
     ELSIF compiler = cpnative THEN
       IF processor = anymach THEN
-        Log.String("processor not selected"); Log.Ln; INC(err)
+        Error(13, "", "", 0)
       ELSIF processor # mach386 THEN
-        Log.String("processor not supported by native compiler"); Log.Ln; INC(err)
+        Error(14, "", "", 0)
       END
     END;
     IF (compiler = cpfront) & (linker # anyint) THEN
-      Log.String("internal linker not required for cpfront"); Log.Ln; INC(err)
+      Error(15, "", "", 0)
     END;
     IF (compiler = cpfront) & (exe # NIL) THEN
-      Log.String("cpfront can't out executable file"); Log.Ln; INC(err)
+      Error(16, "", "", 0)
     END;
     IF (exe # NIL) & (compiler = cpnative) & (linker = anyint) THEN
-      Log.String("linker not selected"); Log.Ln; INC(err)
+      Error(17, "", "", 0)
     END;
     IF (linker = dev2) & (os = anyos) THEN
-      Log.String("os not selected"); Log.Ln; INC(err)
+      Error(18, "", "", 0)
     END;
     IF (exe # NIL) & (exe^ = "") THEN
-      Log.String("output file name can't be empty"); Log.Ln; INC(err)
+      Error(19, "", "", 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
     END;
-    IF cpcExe = NIL THEN
-      IF compiler = cpnative THEN cpcExe := NewStr("cpc486")
-      ELSIF compiler = cpfront THEN cpcExe := NewStr("cpfront")
+    IF (cplExe = NIL) & (linker # anyint) THEN
+      cplExe := DswProcs.dir.GetPath("cpl486");
+      IF cplExe = NIL THEN
+        Error(26, "", "", 0)
       END
     END;
-    IF cplExe = NIL THEN
-      IF linker = dev2 THEN cplExe := NewStr("cpl486") END
-    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);
   END CheckParams;
 
   (* --------- loader --------- *)
@@ -405,7 +503,10 @@ MODULE DswMakeMain;
         j := 0; (* find module in global list *)
         WHILE (j < mno) & (modList[j].name$ # name$) DO INC(j) END;
         IF j >= mno THEN
-          NEW(imp); imp.name := name$; imp.selectors := CopySelectorList(m.selectors);
+          IF ~auto THEN
+            Log.String("module " + name + " required before " + m.name); Log.Ln; INC(werr)
+          END;
+          NEW(imp); imp.name := name$;
           modList[mno] := imp; INC(mno)
         ELSE
           imp := modList[j]
@@ -462,6 +563,29 @@ MODULE DswMakeMain;
           END
         END;
         CheckSym(semicolon)
+      END;
+      LOOP (* preprocessor must read module fully *)
+        IF sym = end THEN
+          DevCPS.Get(sym);
+          IF sym = ident THEN
+            DevCPS.Get(sym);
+            IF sym = period THEN
+              IF DevCPS.name # SelfName THEN err(4) END;
+              EXIT
+            ELSIF sym = eof THEN
+              err(period);
+              EXIT
+            END
+          ELSIF sym = eof THEN
+            err(ident);
+            EXIT
+          END;
+        ELSIF sym = eof THEN
+          err(end);
+          EXIT
+        ELSE
+          DevCPS.Get(sym);
+        END
       END
     ELSE err(ident)
     END;
@@ -472,8 +596,8 @@ MODULE DswMakeMain;
     VAR s: Selector;
   BEGIN
     DevCPM.Init(source);
+    DevCPM.symList := m.dir;
 (*
-    DevCPM.symList := m.insym;
     DevCPM.codePath := m.outcode;
     DevCPM.symPath := m.outsym;
 *)
@@ -484,7 +608,7 @@ MODULE DswMakeMain;
     IF oberon IN m.opts THEN INCL(DevCPM.options, DevCPM.oberon) END;
 *)
     DevCPR.Init;
-    s := m.selectors.next;
+    s := def.next;
     WHILE s # NIL DO
       DevCPR.Set(s.name, s.value);
       s := s.next
@@ -498,31 +622,27 @@ MODULE DswMakeMain;
     Kernel.FastCollect
   END CheckModule;
 
-  PROCEDURE GetSource (IN modName: ARRAY OF CHAR; OUT path: Files.Name; OUT s: String);
-    CONST modDir = "Mod"; sysDir = "System";
-    VAR dir, name: Files.Name; loc: Files.Locator;
-      text: DswDocuments.Model; r: DswDocuments.Reader; i, res: INTEGER;
-
-    PROCEDURE MakePath (dir, name: Files.Name; type: Files.Type; OUT path: Files.Name);
-    BEGIN
-      ASSERT(name # "", 21);
-      IF dir = "" THEN path := modDir + "/" + name
-      ELSE path := dir + "/" + modDir + "/" + name
-      END;
-      Kernel.MakeFileName(path, type)
-    END MakePath;
+  PROCEDURE MakePath (IN dir, name: Files.Name; IN type: Files.Type; OUT path: Files.Name);
+  BEGIN
+    ASSERT(name # "", 21);
+    IF dir = "" THEN path := modDir + "/" + name
+    ELSE path := dir + "/" + modDir + "/" + name
+    END;
+    Kernel.MakeFileName(path, type)
+  END MakePath;
 
+  PROCEDURE Open (loc: Files.Locator; IN sub, name: Files.Name; OUT path: Files.Name; OUT text: DswDocuments.Model);
+    VAR res: INTEGER;
   BEGIN
-    s := NIL; path := "";
-    Kernel.SplitName(modName, dir, name);
-    loc := Files.dir.This(dir).This(modDir);
-    (* --> Kernel.MakeFileName(name, Kernel.docType); <-- *)
-    MakePath(dir, name, "cp", path);
+    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);
     IF text = NIL THEN
-      MakePath(dir, name, "odc", path);
+      MakePath(sub, name, "odc", path);
       DswDocuments.Open(loc, name + ".odc", text, res);
-      IF (text = NIL) & (dir = "") THEN
+      IF (text = NIL) & (sub = "") THEN
         MakePath(sysDir, name, "cp", path);
         loc := Files.dir.This(sysDir).This(modDir);
         DswDocuments.Open(loc, name + ".cp", text, res);
@@ -534,6 +654,23 @@ MODULE DswMakeMain;
           END
         END
       END
+    END
+  END Open;
+
+  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;
+  BEGIN
+    s := NIL; path := ""; base := list;
+    Kernel.SplitName(modName, sub, name);
+    loc := Files.dir.This(sub).This(modDir);
+    Open(loc, 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);
+      base := base.next
     END;
     IF text # NIL THEN
       NEW(s, text.Length() + 1);
@@ -562,7 +699,7 @@ MODULE DswMakeMain;
       END;
       EXCL(m.flags, trace)
     ELSE
-      Log.String("recursive import of " + m.name + " in " + parent.name); Log.Ln; INC(err)
+      Error(20, m.name$, parent.name$, 0)
     END
   END Trace;
 
@@ -585,20 +722,21 @@ MODULE DswMakeMain;
   END Sort;
 
   PROCEDURE CheckDeps;
-    VAR i, j, num: INTEGER; m: Module; s: String; ok: BOOLEAN;
+    VAR i, j, num: INTEGER; m: Module; src: String; ok: BOOLEAN;
   BEGIN
     i := 0; rno := mno;
     WHILE (err = 0) & (i < mno) DO
       m := modList[i];
-      GetSource(m.name$, m.path, s);
-      IF s # NIL THEN
-        CheckModule(m, s, ok);
+      GetSource(m.name$, m.dir, m.odc, src);
+      IF src # NIL THEN
+        CheckModule(m, src, ok);
         IF ~ok THEN INC(err) END
       ELSE
-        Log.String("unable to open module " + m.name); Log.Ln; INC(err)
+        Error(21, m.name$, "", 0)
       END;
       INC(i)
     END;
+    INC(err, werr);
     num := 0;
     FOR i := 0 TO rno - 1 DO
       Trace(modList[i], modList[i], num)
@@ -657,20 +795,38 @@ MODULE DswMakeMain;
     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;
+    VAR w: DswProcs.Process; ok: BOOLEAN; s: Selector;
   BEGIN
     ASSERT(m # NIL, 20);
-    ASSERT(m.path # "", 21);
+    ASSERT(m.odc # "", 21);
     ASSERT(m.worker = NIL, 22);
     w := DswProcs.dir.New();
     w.Program(cpcExe);
     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.path);
+    w.PutParam(m.odc);
     w.Execute(ok);
     IF ok THEN
-      Log.String("Compile " + m.name + " (" + m.path + ")"); Log.Ln;
+      Log.String("Compile " + m.name + " (" + m.odc + ")"); Log.Ln;
     ELSE
       w := NIL
     END;
@@ -732,16 +888,17 @@ MODULE DswMakeMain;
     ASSERT((exe # NIL) & (exe^ # ""), 20);
     ASSERT(processor = mach386, 21);
     ASSERT(compiler = cpnative, 22);
-    ASSERT(os IN {linux, freebsd, openbsd, win32}, 23);
     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: p.PutParam("win32")
+      | win32, cygwin: p.PutParam("win32")
+      | darwin: p.PutParam("darwin")
       END
     END;
     p.PutParam("-kernel");
@@ -765,12 +922,10 @@ MODULE DswMakeMain;
       Log.String("Link "); Log.String(exe); Log.Ln;
       res := p.Result();
       IF res # 0 THEN
-        Log.String("linker terminated with error"); Log.Int(res); Log.Ln;
-        INC(err)
+        Error(22, "", "", res)
       END
     ELSE
-      Log.String("unable to execute linker"); Log.Int(i); Log.Ln;
-      INC(err)
+      Error(23, "", "", 0)
     END
   END LinkDev2;
 
@@ -784,24 +939,60 @@ MODULE DswMakeMain;
     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
+      FOR i := 0 TO mno - 1 DO
+        IF ~(library IN lnkList[i].flags) THEN
+          Log.String(lnkList[i].name$); Log.Char(" ")
+        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(" ")
+        END
+      END;
+      Log.Ln*)
+    END
+  END PrintInfo;
+
   PROCEDURE Main;
-    VAR m: Module; s: Selector; p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER;
   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
-            Compile;
-            IF err = 0 THEN
-              Link
+            IF printCompileModList OR printLinkModList OR printCompileFileList THEN
+              PrintInfo
+            ELSE
+              Compile;
+              IF err = 0 THEN
+                Link
+              END
             END
           END
         END
-     END
-    ELSE INC(err)
+      END
+    ELSE Error(24, "", "", 0)
     END;
     IF err = 0 THEN Kernel.Quit(0)
     ELSE Kernel.Quit(1)
@@ -810,5 +1001,7 @@ MODULE DswMakeMain;
 
 BEGIN
   NEW(def);
+  ASSERT(def # NIL, 100);
+  Kernel.intTrap := FALSE;
   Kernel.Start(Main)
 END DswMakeMain.