X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=src%2Fgeneric%2FDsw%2FMod%2FMakeMain.cp;h=ad0ead7eb2d123284edf9388fa1e50b62c15026d;hp=98d76c5f86e80a116ccb0a82eea489d28d909210;hb=HEAD;hpb=d41744a4034d3aad10298c8ff915778cda31fa27 diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp index 98d76c5..ad0ead7 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"; + + modDir = "Mod"; + sysDir = "System"; + maxImps = 127; maxJobs = maxImps; @@ -24,12 +29,16 @@ MODULE DswMakeMain; module = 75; eof = 76; (* module state flags *) - imported = 0; trace = 1; hasObj = 2; hasSym = 3; hasErrors = 4; library = 5; + imported = 0; trace = 1; hasObj = 2; hasSym = 3; hasErrors = 4; + library = 5; force = 6; debugImport = FALSE; + debugOrder = FALSE; debugJobs = FALSE; TYPE + Name = ARRAY 256 OF CHAR; + String = POINTER TO ARRAY OF CHAR; Selector = POINTER TO RECORD @@ -40,22 +49,47 @@ MODULE DswMakeMain; Module = POINTER TO RECORD name: DevCPT.Name; - path: Files.Name; - selectors: Selector; (* with head, list of selectors for this module *) - mno, depth: INTEGER; + library: DevCPT.Name; + odc: Files.Name; + depth: INTEGER; (* 0: leaf, MAX: root *) + dir: DevCPM.Directory; + mno: INTEGER; imp: ARRAY maxImps OF Module; flags: SET; 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 - 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 *) - auto: INTEGER; - jobs: INTEGER; - exe: String; + dirList: DevCPM.Directory; + libList: Library; + + 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 --------- *) PROCEDURE IdentLen (IN s: ARRAY OF CHAR): INTEGER; VAR i: INTEGER; @@ -67,54 +101,34 @@ 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("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; 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("selector '^0' have invalid identifier", n, "", 0) END END Define; - PROCEDURE Undefine (IN n: ARRAY OF CHAR); - VAR i: INTEGER; s: Selector; + PROCEDURE DefineNew (IN n: ARRAY OF CHAR); 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; + Define(n, FALSE); + END DefineNew; - 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); @@ -125,45 +139,164 @@ 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("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 - Log.String("expected integer"); Log.Ln; INC(err); + Error("invalid integer value", s, "", 0); x := def END; RETURN x END StrToInt; + PROCEDURE NewStr (IN s: ARRAY OF CHAR): String; + VAR p: String; + BEGIN + NEW(p, LEN(s$) + 1); p^ := s$; + RETURN p + END NewStr; + + 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(" -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 Help; + PROCEDURE ParseArgs; - VAR res: INTEGER; BEGIN - jobs := 1; + exe := NIL; auto := FALSE; jobs := 1; def.next := NIL; mno := 0; rno := 0; + target := NewStr("default"); base := NewStr("cprules"); LOOP - CASE DswOpts.GetOpt("ao:j:D:U:") OF - | "a": INC(auto) + CASE DswOpts.GetOpt("acbxd:sgGo:t:j:f:r:h") OF + | "a": auto := TRUE + | "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 + | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs) | "o": exe := DswOpts.str - | "j": IF DswOpts.str = NIL THEN jobs := maxJobs ELSE jobs := MIN(MAX(StrToInt(DswOpts.str, 0), 1), maxJobs) END - | "D": Define(DswOpts.str) - | "U": Undefine(DswOpts.str) - | ":": 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 + | "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; + 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 + END ReadLines; + + PROCEDURE CheckParams; + VAR loc: Files.Locator; + BEGIN + IF (exe # NIL) & (exe^ = "") THEN + Error("specified empty file name for exe", "", "", 0) + END; + IF target^ = "" THEN + Error("specified empty rule", "", "", 0) + END; + IF base^ = "" THEN + Error("specified empty path to cpmake rules", "", "", 0) + END; + loc := Files.dir.This(base).This(target); + ReadLines(loc, "defines", DefineNew); + ReadLines(loc, "libs", AddLib) + END CheckParams; + + (* --------- loader --------- *) + PROCEDURE Import (m: Module; IN name: DevCPT.Name); VAR i, j: INTEGER; imp: Module; BEGIN @@ -181,7 +314,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] @@ -216,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) @@ -238,6 +374,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; @@ -248,19 +407,17 @@ MODULE DswMakeMain; 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$; -(* - 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 := m.selectors.next; + s := def.next; WHILE s # NIL DO DevCPR.Set(s.name, s.value); s := s.next @@ -268,48 +425,67 @@ 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 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 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 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; + DswDocuments.Open(loc, name, text, res) + END GetModText; + PROCEDURE Open (IN base, sub, name: Files.Name; OUT path: Files.Name; OUT text: DswDocuments.Model); + VAR cp, odc: Files.Name; 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); - 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(dir, name, "odc", path); - DswDocuments.Open(loc, name + ".odc", text, res); - IF (text = NIL) & (dir = "") THEN - MakePath(sysDir, name, "cp", path); - loc := Files.dir.This(sysDir).This(modDir); - DswDocuments.Open(loc, name + ".cp", text, res); + Files.dir.GetFileName(name, "odc", odc); (* !!! *) + GetModText(base, sub, odc, path, text); + IF (text = NIL) & (sub = "") THEN + 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 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; + base: DevCPM.Directory; + text: DswDocuments.Model; + r: DswDocuments.Reader; + i, res: INTEGER; + BEGIN + s := NIL; path := ""; base := list; + Kernel.SplitName(modName, sub, name); + Open("", sub, name, path, text); + WHILE (text = NIL) & (base # NIL) DO + ASSERT(base.legacy, 100); + Open(base.path, sub, name, path, text); + base := base.next END; IF text # NIL THEN NEW(s, text.Length() + 1); @@ -322,16 +498,14 @@ MODULE DswMakeMain; END END GetSource; - PROCEDURE Trace (m, parent: Module; depth: INTEGER; VAR lno: INTEGER); + PROCEDURE Trace (m, parent: Module; VAR lno: INTEGER); VAR i: INTEGER; BEGIN - m.depth := MAX(m.depth, depth); IF ~(trace IN m.flags) THEN INCL(m.flags, trace); - IF m.mno > 0 THEN - FOR i := 0 TO m.mno - 1 DO - Trace(m.imp[i], m, depth + 1, lno) - END + FOR i := 0 TO m.mno - 1 DO + Trace(m.imp[i], m, lno); + m.depth := MAX(m.depth, m.imp[i].depth + 1) END; IF ~(imported IN m.flags) THEN INCL(m.flags, imported); @@ -340,7 +514,7 @@ MODULE DswMakeMain; 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; @@ -353,7 +527,7 @@ MODULE DswMakeMain; WHILE i < mno DO m := cmpList[i]; j := i - 1; - WHILE (j >= 0) & (cmpList[j].depth < m.depth) DO + WHILE (j >= 0) & (cmpList[j].depth > m.depth) DO cmpList[j + 1] := cmpList[j]; DEC(j) END; @@ -362,28 +536,35 @@ MODULE DswMakeMain; END END Sort; - PROCEDURE MakeTree; - VAR i, j, num: INTEGER; m: Module; s: String; ok: BOOLEAN; + PROCEDURE CheckDeps; + 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("unable to open module ^0", m.name$, "", 0) END; INC(i) END; + INC(err, werr); num := 0; FOR i := 0 TO rno - 1 DO - Trace(modList[i], modList[i], 0, num); + Trace(modList[i], modList[i], num) END; ASSERT((err # 0) OR (num = mno), 100); Sort; - END MakeTree; + IF debugOrder THEN + Log.String("Parallel depth:"); Log.Ln; + FOR i := 0 TO mno - 1 DO + Log.String(" " + cmpList[i].name); Log.Int(cmpList[i].depth); Log.Ln; + END + END + END CheckDeps; PROCEDURE IsCompiled (m: Module): BOOLEAN; CONST target = {hasSym, hasObj}; @@ -412,27 +593,64 @@ MODULE DswMakeMain; RETURN ready END Ready; - PROCEDURE ExecuteCompiler (m: Module): DswProcs.Process; - VAR w: DswProcs.Process; ok: BOOLEAN; + PROCEDURE PrepareCompilerDeps (m: Module; p: DswProcs.Process; root, libsOnly: BOOLEAN); + VAR i: INTEGER; s: ARRAY 3 OF CHAR; lib: Library; + BEGIN + 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 ~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 PrepareCompilerDeps; + + PROCEDURE PrepareCompiler (m: Module): DswProcs.Process; + VAR p: DswProcs.Process; s: Selector; i: INTEGER; BEGIN ASSERT(m # NIL, 20); - ASSERT(m.path # "", 21); + ASSERT(m.odc # "", 21); ASSERT(m.worker = NIL, 22); - w := DswProcs.dir.New(); - w.Program("cpc486"); - w.PutParam("-legacy"); - 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 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 THEN p.PutParam("-D") ELSE p.PutParam("-d") END; + p.PutParam(s.name$); + s := s.next END; - RETURN w - END ExecuteCompiler; + FOR i := 0 TO m.mno - 1 DO + PrepareCompilerDeps(m.imp[i], p, TRUE, FALSE); + END; + 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; @@ -441,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) @@ -462,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) @@ -481,83 +701,81 @@ MODULE DswMakeMain; END Compile; PROCEDURE Link; - VAR p: DswProcs.Process; i: INTEGER; ok: BOOLEAN; + VAR p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER; BEGIN - ASSERT(exe # NIL, 20); - ASSERT(exe^ # "", 21); - p := DswProcs.dir.New(); - p.Program("cpl486"); - p.PutParam("-os"); - p.PutParam("linux"); - p.PutParam("-kernel"); - p.PutParam("Kernel"); - p.PutParam("-main"); - p.PutParam("Kernel"); - p.PutParam("-legacycodedir"); - p.PutParam("."); - p.PutParam("-o"); - p.PutParam(exe); - 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; - INC(i) - END; - p.Execute(ok); - IF ok THEN - i := p.Result(); - IF i # 0 THEN - Log.String("linker terminated with error"); Log.Int(i); Log.Ln; - INC(err) + FOR i := 0 TO mno - 1 DO + IF library IN lnkList[i].flags THEN + PrepareCompilerDeps(lnkList[i], p, FALSE, TRUE) + END + END; + 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 - ELSE - Log.String("unable to execute linker"); Log.Int(i); Log.Ln; - INC(err) END END Link; - PROCEDURE WriteSelector (s: Selector); + PROCEDURE Cleanup; + VAR p: DswProcs.Process; ok: BOOLEAN; res: INTEGER; BEGIN - Log.String(s.name$); - IF s.value THEN Log.Char("+") ELSE Log.Char("-") END - END WriteSelector; + 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; - VAR m: Module; s: Selector; p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER; BEGIN - IF Kernel.trapCount # 0 THEN Kernel.Quit(1) END; - ParseArgs; - IF err = 0 THEN - MakeTree; + IF Kernel.trapCount = 0 THEN + ParseArgs; IF err = 0 THEN - Compile; + CheckParams; IF err = 0 THEN - IF exe # NIL THEN Link END; + CheckDeps; + IF err = 0 THEN + Cleanup; + IF err = 0 THEN + Compile; + IF err = 0 THEN + Link + END + END + END END END + ELSE Error("trap occured", "", "", 0) END; - IF err = 0 THEN - Log.String("no errors"); Log.Ln; - Kernel.Quit(0) - ELSE - Kernel.Quit(1) - END; + IF err = 0 THEN Kernel.Quit(0) + ELSE Kernel.Quit(1) + END END Main; BEGIN NEW(def); + ASSERT(def # NIL, 100); + Kernel.intTrap := FALSE; Kernel.Start(Main) END DswMakeMain. - -============================== - -SYNTAX - cpmake {options module} - -OPTIONS - -a Enable automatic dependency resolution - -o name Generate executable file - -j num Specifies the number of jobs to run simultaneously - -D ident["+"|"-"] Add preprocessor selector - -U ident Remove proprocessor selector