index 57a46d910d2845167cb7a58a763c4b0f53b360ad..7d98bdf84b7e7105d35dfc0253a9df0e355e5f42 100644 (file)
IMPORT Kernel, Files, Log, Strings, DswOpts, DswProcs, DswDocuments, DevCPM, DevCPT, DevCPR, DevCPS;
CONST
IMPORT Kernel, Files, Log, Strings, DswOpts, DswProcs, DswDocuments, DevCPM, DevCPT, DevCPR, DevCPS;
CONST
+ version = "0.3";
+
+ modDir = "Mod";
+ sysDir = "System";
+
maxImps = 127;
maxJobs = maxImps;
maxImps = 127;
maxJobs = maxImps;
module = 75; eof = 76;
(* module state flags *)
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;
-
- (* 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;
debugImport = FALSE;
debugOrder = FALSE;
debugJobs = FALSE;
- debugArgs = FALSE;
TYPE
String = POINTER TO ARRAY OF CHAR;
TYPE
String = POINTER TO ARRAY OF CHAR;
- StringList = POINTER TO ARRAY OF String;
Selector = POINTER TO RECORD
name: DevCPT.Name;
Selector = POINTER TO RECORD
name: DevCPT.Name;
Module = POINTER TO RECORD
name: DevCPT.Name;
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 *)
depth: INTEGER; (* 0: leaf, MAX: root *)
+ dir: DevCPM.Directory;
mno: INTEGER;
imp: ARRAY maxImps OF Module;
flags: SET;
worker: DswProcs.Process;
END;
mno: INTEGER;
imp: ARRAY maxImps OF Module;
flags: SET;
worker: DswProcs.Process;
END;
+ VAR (* options *)
+ auto, trap, clean, symonly: BOOLEAN;
+ exe, target, base: String;
+ jobs: INTEGER;
+
VAR
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 *)
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;
- auto: BOOLEAN;
- jobs: INTEGER;
- exe: String;
+ dirList: DevCPM.Directory;
+
+ PROCEDURE Error (IN str, p0, p1: ARRAY OF CHAR; i2: INTEGER);
+ VAR p2: ARRAY 32 OF CHAR;
+ BEGIN
+ Strings.IntToString(i2, p2);
+ Log.String("cpmake: "); Log.ParamMsg(str, p0, p1, p2); Log.Ln;
+ INC(err);
+ IF trap THEN
+ HALT(100)
+ END
+ END Error;
(* --------- options --------- *)
(* --------- options --------- *)
RETURN i
END IdentLen;
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
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("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;
IF s.next = NIL THEN
NEW(s.next);
Strings.StringToUtf8(n, s.next.name, i);
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
- ELSE
- Log.String("option -D expect identifier"); Log.Ln; INC(err)
+ ASSERT(i = 0);
+ s.next.value := v
+ ELSIF overwrite THEN
+ s.next.value := v
+ END
+ ELSE Error("defines: '^0' not valid identifier", n, "", 0)
END
END Define;
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);
VAR i, res: INTEGER; m: Module;
BEGIN
i := IdentLen(n);
NEW(m);
Strings.StringToUtf8(n, m.name, res);
ASSERT(res = 0);
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
modList[i] := m;
INC(mno)
END
ELSE
- Log.String("module name must be identifier"); Log.Ln; INC(err)
+ Error("invalid module name", "", "", 0)
END
END AddModule;
END
END AddModule;
BEGIN
Strings.StringToInt(s, x, res);
IF res # 0 THEN
BEGIN
Strings.StringToInt(s, x, res);
IF res # 0 THEN
- Log.String("expected integer"); Log.Ln; INC(err);
+ Error("invalid integer value", s, "", 0);
x := def
END;
RETURN x
x := def
END;
RETURN x
RETURN p
END NewStr;
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 Log.String("unterminated string"); Log.Ln; INC(err)
- 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;
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(" -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(" -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;
- Kernel.Quit(1)
+ Log.String(" -a Enable automatic dependency resolution"); Log.Ln;
+ Log.String(" -c Remove all generated files"); Log.Ln;
+ Log.String(" -s Generate symbol files only"); 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 Help;
END Help;
- 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 Log.String("unknwon processor "); Log.String(s); Log.Ln; INC(err)
- 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)
- 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)
- 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)
- 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)
- END
- END ParseTargetOpts;
-
- PROCEDURE ParseCommandOpts;
- BEGIN
- 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)
- END
- END ParseCommandOpts;
-
- PROCEDURE ParseExternalOpts;
- BEGIN
- 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)
- END
- END ParseExternalOpts;
-
PROCEDURE ParseArgs;
BEGIN
exe := NIL; auto := FALSE; jobs := 1; def.next := NIL; mno := 0; rno := 0;
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
LOOP
- CASE DswOpts.GetOpt("ao:j:D:U:TCXh") OF
+ CASE DswOpts.GetOpt("acdsgo:t:j:f:") OF
| "a": auto := TRUE
| "a": auto := TRUE
- | "o": exe := DswOpts.str
- | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
+ | "c": clean := TRUE
+ | "d": trap := TRUE
+ | "s": symonly := TRUE
+ | "f": base := DswOpts.str
| "h": Help
| "h": Help
- | "D": Define(DswOpts.str)
- | "U": Undefine(DswOpts.str)
- | "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)
- | 0X: EXIT
+ | "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)
+ | 00X: EXIT
END
END
END ParseArgs;
END
END
END ParseArgs;
- PROCEDURE CheckParams;
+ PROCEDURE ReadDefines;
+ VAR loc: Files.Locator; name: Files.Name; m: DswDocuments.Model; r: DswDocuments.Reader; i, res: INTEGER;
BEGIN
BEGIN
- IF compiler = anycp THEN
- Log.String("compiler not selected"); Log.Ln; INC(err)
- ELSIF compiler = cpnative THEN
- IF processor = anymach THEN
- Log.String("processor not selected"); Log.Ln; INC(err)
- ELSIF processor # mach386 THEN
- Log.String("processor not supported by native compiler"); Log.Ln; INC(err)
+ 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
- END;
- IF (compiler = cpfront) & (linker # anyint) THEN
- Log.String("internal linker not required for cpfront"); Log.Ln; INC(err)
- END;
- IF (compiler = cpfront) & (exe # NIL) THEN
- Log.String("cpfront can't out executable file"); Log.Ln; INC(err)
- END;
- IF (exe # NIL) & (compiler = cpnative) & (linker = anyint) THEN
- Log.String("linker not selected"); Log.Ln; INC(err)
- END;
- IF (linker = dev2) & (os = anyos) THEN
- Log.String("os not selected"); Log.Ln; INC(err)
- END;
+ END
+ END ReadDefines;
+
+ PROCEDURE CheckParams;
+ BEGIN
IF (exe # NIL) & (exe^ = "") THEN
IF (exe # NIL) & (exe^ = "") THEN
- Log.String("output file name can't be empty"); Log.Ln; INC(err)
+ Error("specified empty file name for exe", "", "", 0)
END;
END;
- IF cpcExe = NIL THEN
- IF compiler = cpnative THEN cpcExe := NewStr("cpc486")
- ELSIF compiler = cpfront THEN cpcExe := NewStr("cpfront")
- END
+ IF target^ = "" THEN
+ Error("specified empty rule", "", "", 0)
END;
END;
- IF cplExe = NIL THEN
- IF linker = dev2 THEN cplExe := NewStr("cpl486") END
- END
+ IF base^ = "" THEN
+ Error("specified empty path to cpmake rules", "", "", 0)
+ END;
+ ReadDefines
END CheckParams;
(* --------- loader --------- *)
END CheckParams;
(* --------- loader --------- *)
j := 0; (* find module in global list *)
WHILE (j < mno) & (modList[j].name$ # name$) DO INC(j) END;
IF j >= mno THEN
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]
modList[mno] := imp; INC(mno)
ELSE
imp := modList[j]
END
END;
CheckSym(semicolon)
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;
END
ELSE err(ident)
END;
VAR s: Selector;
BEGIN
DevCPM.Init(source);
VAR s: Selector;
BEGIN
DevCPM.Init(source);
-(*
- DevCPM.symList := m.insym;
- DevCPM.codePath := m.outcode;
- DevCPM.symPath := m.outsym;
-*)
+ DevCPM.symList := m.dir;
+ (*DevCPM.codePath := m.outcode;*)
+ (*DevCPM.symPath := m.outsym;*)
DevCPM.name := m.name$;
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;
DevCPR.Init;
- s := m.selectors.next;
+ s := def.next;
WHILE s # NIL DO
DevCPR.Set(s.name, s.value);
s := s.next
WHILE s # NIL DO
DevCPR.Set(s.name, s.value);
s := s.next
ParseModule(m);
DevCPR.Check;
ok := DevCPM.noerr;
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;
DevCPR.Close;
DevCPM.InsertMarks;
DevCPM.Close;
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
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
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);
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);
MakePath(sysDir, name, "cp", path);
loc := Files.dir.This(sysDir).This(modDir);
DswDocuments.Open(loc, name + ".cp", text, res);
END
END
END
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);
END;
IF text # NIL THEN
NEW(s, text.Length() + 1);
END;
EXCL(m.flags, trace)
ELSE
END;
EXCL(m.flags, trace)
ELSE
- Log.String("recursive import of " + m.name + " in " + parent.name); Log.Ln; INC(err)
+ Error("recursive import of ^0 in ^1", m.name$, parent.name$, 0)
END
END Trace;
END
END Trace;
END Sort;
PROCEDURE CheckDeps;
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];
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
IF ~ok THEN INC(err) END
ELSE
- Log.String("unable to open module " + m.name); Log.Ln; INC(err)
+ Error("unable to open module ^1", m.name$, "", 0)
END;
INC(i)
END;
END;
INC(i)
END;
+ INC(err, werr);
num := 0;
FOR i := 0 TO rno - 1 DO
Trace(modList[i], modList[i], num)
num := 0;
FOR i := 0 TO rno - 1 DO
Trace(modList[i], modList[i], num)
RETURN ready
END Ready;
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 ExecuteCompiler (m: Module): DswProcs.Process;
- VAR w: DswProcs.Process; ok: BOOLEAN;
+ PROCEDURE PrepareCompiler (m: Module): DswProcs.Process;
+ VAR p: DswProcs.Process; s: Selector;
BEGIN
ASSERT(m # NIL, 20);
BEGIN
ASSERT(m # NIL, 20);
- ASSERT(m.path # "", 21);
+ ASSERT(m.odc # "", 21);
ASSERT(m.worker = NIL, 22);
ASSERT(m.worker = NIL, 22);
- w := DswProcs.dir.New();
- w.Program(cpcExe);
- w.PutParam("-legacy");
- PutParams(w, cpcArgs);
- w.PutParam(m.path);
- w.Execute(ok);
- IF ok THEN
- Log.String("Compile " + m.name + " (" + m.path + ")"); Log.Ln;
- ELSE
- w := NIL
+ p := DswProcs.dir.New();
+ p.Program(base + "/" + target + "/" + "build");
+ p.PutParam(m.odc);
+ 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 THEN p.PutParam("-D") ELSE p.PutParam("-d") END;
+ p.PutParam(s.name$);
+ s := s.next
END;
END;
- RETURN w
- END ExecuteCompiler;
+ RETURN p
+ END PrepareCompiler;
PROCEDURE Compile;
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;
BEGIN
IF mno = 0 THEN RETURN END;
num := 0; j := 0;
WHILE (err = 0) & (i < mno) & (j < jobs) DO
m := cmpList[i];
IF Ready(m) THEN
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 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)
IF debugJobs THEN Log.String(" ok") END;
m.worker := w;
INC(j)
m := cmpList[i];
w := m.worker;
IF (w # NIL) & w.IsTerminated() THEN
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)
INCL(m.flags, hasObj);
INCL(m.flags, hasSym);
INC(num)
END
END Compile;
END
END Compile;
- PROCEDURE LinkDev2;
- VAR p: DswProcs.Process; i, res: INTEGER; ok: BOOLEAN;
+ PROCEDURE Link;
+ VAR p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER;
BEGIN
BEGIN
- 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);
- 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")
- 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$)
+ 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
+ p.PutParam(lnkList[i].name$)
+ END
END;
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
- Log.String("linker terminated with error"); Log.Int(res); Log.Ln;
- INC(err)
+ 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
- ELSE
- Log.String("unable to execute linker"); Log.Int(i); Log.Ln;
- INC(err)
END
END
- END LinkDev2;
+ END Link;
- PROCEDURE Link;
+ PROCEDURE Cleanup;
+ VAR p: DswProcs.Process; ok: BOOLEAN; res: INTEGER;
BEGIN
BEGIN
- IF exe # NIL THEN
- CASE linker OF
- | anyint: (* do not link *)
- | dev2: LinkDev2
+ 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
END
- END Link;
+ END Cleanup;
PROCEDURE Main;
PROCEDURE Main;
- VAR m: Module; s: Selector; p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER;
BEGIN
IF Kernel.trapCount = 0 THEN
ParseArgs;
BEGIN
IF Kernel.trapCount = 0 THEN
ParseArgs;
IF err = 0 THEN
CheckDeps;
IF err = 0 THEN
IF err = 0 THEN
CheckDeps;
IF err = 0 THEN
- Compile;
+ Cleanup;
IF err = 0 THEN
IF err = 0 THEN
- Link
+ Compile;
+ IF err = 0 THEN
+ Link
+ END
END
END
END
END
END
END
- END
- ELSE INC(err)
+ END
+ ELSE Error("trap occured", "", "", 0)
END;
IF err = 0 THEN Kernel.Quit(0)
ELSE Kernel.Quit(1)
END;
IF err = 0 THEN Kernel.Quit(0)
ELSE Kernel.Quit(1)
- END;
+ END
END Main;
BEGIN
NEW(def);
END Main;
BEGIN
NEW(def);
+ ASSERT(def # NIL, 100);
+ Kernel.intTrap := FALSE;
Kernel.Start(Main)
END DswMakeMain.
Kernel.Start(Main)
END DswMakeMain.