X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=src%2Fgeneric%2FDsw%2FMod%2FMakeMain.cp;h=bd06566f501cd9a00c76bd1fa0af2f0704680a2a;hp=c45005e5b42fc2664bd8b7f383f189795d8a28a7;hb=fe8a1b7186dee342e1e5024ac44a3db8a98976aa;hpb=443883f95bea9388ecee15b193db87f44edb63d6 diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp index c45005e..bd06566 100644 --- a/src/generic/Dsw/Mod/MakeMain.cp +++ b/src/generic/Dsw/Mod/MakeMain.cp @@ -3,6 +3,8 @@ MODULE DswMakeMain; IMPORT Kernel, Files, Log, Strings, DswOpts, DswProcs, DswDocuments, DevCPM, DevCPT, DevCPR, DevCPS; CONST + version = "0.3.0"; + maxImps = 127; maxJobs = maxImps; @@ -26,12 +28,26 @@ MODULE DswMakeMain; (* module state flags *) imported = 0; trace = 1; hasObj = 2; hasSym = 3; hasErrors = 4; library = 5; + (* procesor types *) + anymach = 0; cmach = 1; mach386 = 10; mach68k = 20; + + (* operation system types *) + anyos = 0; linux = 1; freebsd = 2; openbsd = 3; win32 = 4; cygwin = 5; darwin = 6; + + (* compiler types *) + anycp = 0; cpnative = 1; cpfront = 2; + + (* internal linker types *) + anyint = 0; dev2 = 1; + debugImport = FALSE; debugOrder = FALSE; debugJobs = FALSE; + debugArgs = FALSE; TYPE String = POINTER TO ARRAY OF CHAR; + StringList = POINTER TO ARRAY OF String; Selector = POINTER TO RECORD name: DevCPT.Name; @@ -51,14 +67,57 @@ 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 *) - auto: INTEGER; + processor, compiler, os, linker: INTEGER; + cpcExe, cplExe: String; + cpcArgs, cplArgs: StringList; + auto: BOOLEAN; jobs: INTEGER; exe: String; + 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 --------- *) PROCEDURE IdentLen (IN s: ARRAY OF CHAR): INTEGER; @@ -77,7 +136,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 - 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; @@ -88,7 +147,7 @@ MODULE DswMakeMain; END; s.next.value := v ELSE - Log.String("option -D expect identifier"); Log.Ln; INC(err) + Error(1, "", "", 0) END END Define; @@ -101,7 +160,7 @@ MODULE DswMakeMain; 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) + Error(2, "", "", 0) END END Undefine; @@ -134,7 +193,7 @@ MODULE DswMakeMain; INC(mno) END ELSE - Log.String("module name must be identifier"); Log.Ln; INC(err) + Error(3, "", "", 0) END END AddModule; @@ -143,30 +202,260 @@ 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 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 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(" -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(" -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 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 + 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("I") OF + | "I": Kernel.intTrap := TRUE + | ":": Error(10, "-I" + DswOpts.str, "", 0) + | "?": Error(11, "-I" + DswOpts.str, "", 0) + | 0X: Error(11, "-I", "", 0) + END + END ParseInfoOpts; + PROCEDURE ParseArgs; BEGIN - jobs := 1; + 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:") OF - | "a": INC(auto) + CASE DswOpts.GetOpt("ao:j:D:U:TCXIhV") OF + | "a": auto := TRUE | "o": exe := DswOpts.str - | "j": IF DswOpts.str = NIL THEN jobs := maxJobs ELSE jobs := MIN(MAX(StrToInt(DswOpts.str, 0), 1), maxJobs) END + | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs) + | "h": Help + | "V": Version | "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) + | "T": ParseTargetOpts + | "C": ParseCommandOpts + | "X": ParseExternalOpts + | "I": ParseInfoOpts + | ":": Error(10, "-" + DswOpts.str, "", 0) + | "?": Error(11, "-" + DswOpts.str, "", 0) | "$": AddModule(DswOpts.str, def) | 0X: EXIT END - END + END; END ParseArgs; + PROCEDURE CheckParams; + BEGIN + IF compiler = anycp THEN + Error(12, "", "", 0) + ELSIF compiler = cpnative THEN + IF processor = anymach THEN + Error(13, "", "", 0) + ELSIF processor # mach386 THEN + Error(14, "", "", 0) + END + END; + IF (compiler = cpfront) & (linker # anyint) THEN + Error(15, "", "", 0) + END; + IF (compiler = cpfront) & (exe # NIL) THEN + Error(16, "", "", 0) + END; + IF (exe # NIL) & (compiler = cpnative) & (linker = anyint) THEN + Error(17, "", "", 0) + END; + IF (linker = dev2) & (os = anyos) THEN + Error(18, "", "", 0) + END; + IF (exe # NIL) & (exe^ = "") THEN + Error(19, "", "", 0) + 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 (cplExe = NIL) & (linker # anyint) THEN + cplExe := DswProcs.dir.GetPath("cpl486"); + IF cplExe = NIL THEN + Error(26, "", "", 0) + END + END + END CheckParams; + (* --------- loader --------- *) PROCEDURE Import (m: Module; IN name: DevCPT.Name); @@ -186,6 +475,9 @@ MODULE DswMakeMain; j := 0; (* find module in global list *) WHILE (j < mno) & (modList[j].name$ # name$) DO INC(j) END; IF j >= mno THEN + IF ~auto THEN + Log.String("module " + name + " required before " + m.name); Log.Ln; INC(werr) + END; NEW(imp); imp.name := name$; imp.selectors := CopySelectorList(m.selectors); modList[mno] := imp; INC(mno) ELSE @@ -243,6 +535,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; @@ -343,7 +658,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; @@ -376,10 +691,11 @@ MODULE DswMakeMain; CheckModule(m, s, 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) @@ -421,6 +737,23 @@ MODULE DswMakeMain; RETURN ready END Ready; + PROCEDURE PutParams (w: DswProcs.Process; p: StringList); + VAR i: INTEGER; + BEGIN + ASSERT(w # NIL, 20); + IF debugArgs THEN Log.String("PutParams") END; + IF p # NIL THEN + IF debugArgs THEN Log.String(":[" + p[0]) END; + w.PutParam(p[0]); + FOR i := 1 TO LEN(p) - 1 DO + IF debugArgs THEN Log.String("|" + p[i]) END; + w.PutParam(p[i]) + END; + IF debugArgs THEN Log.Char("]") END + END; + IF debugArgs THEN Log.Ln END + END PutParams; + PROCEDURE ExecuteCompiler (m: Module): DswProcs.Process; VAR w: DswProcs.Process; ok: BOOLEAN; BEGIN @@ -428,8 +761,90 @@ MODULE DswMakeMain; ASSERT(m.path # "", 21); ASSERT(m.worker = NIL, 22); w := DswProcs.dir.New(); - w.Program("cpc486"); + w.Program(cpcExe); w.PutParam("-legacy"); + PutParams(w, cpcArgs); + CASE compiler OF + | cpfront: + w.PutParam("-define+"); w.PutParam("CPFRONT"); + w.PutParam("-define-"); w.PutParam("NATIVE"); + | cpnative: + w.PutParam("-define-"); w.PutParam("CPFRONT"); + w.PutParam("-define+"); w.PutParam("NATIVE"); + END; + CASE processor OF + | mach386: + w.PutParam("-define+"); w.PutParam("I486"); + w.PutParam("-define-"); w.PutParam("M68K"); + | mach68k: + w.PutParam("-define+"); w.PutParam("I486"); + w.PutParam("-define-"); w.PutParam("M68K"); + ELSE + w.PutParam("-define-"); w.PutParam("I486"); + w.PutParam("-define-"); w.PutParam("M68K"); + END; + CASE os OF + | linux: + w.PutParam("-define+"); w.PutParam("POSIX"); + w.PutParam("-define+"); w.PutParam("LINUX"); + w.PutParam("-define-"); w.PutParam("FREEBSD"); + w.PutParam("-define-"); w.PutParam("OPENBSD"); + w.PutParam("-define-"); w.PutParam("WIN32"); + w.PutParam("-define-"); w.PutParam("DARWIN"); + | freebsd: + w.PutParam("-define+"); w.PutParam("POSIX"); + w.PutParam("-define-"); w.PutParam("LINUX"); + w.PutParam("-define+"); w.PutParam("FREEBSD"); + w.PutParam("-define-"); w.PutParam("OPENBSD"); + w.PutParam("-define-"); w.PutParam("WIN32"); + w.PutParam("-define-"); w.PutParam("CYGWIN"); + w.PutParam("-define-"); w.PutParam("DARWIN"); + | openbsd: + w.PutParam("-define+"); w.PutParam("POSIX"); + w.PutParam("-define-"); w.PutParam("LINUX"); + w.PutParam("-define-"); w.PutParam("FREEBSD"); + w.PutParam("-define+"); w.PutParam("OPENBSD"); + w.PutParam("-define-"); w.PutParam("WIN32"); + w.PutParam("-define-"); w.PutParam("CYGWIN"); + w.PutParam("-define-"); w.PutParam("DARWIN"); + | win32: + w.PutParam("-define-"); w.PutParam("POSIX"); + w.PutParam("-define-"); w.PutParam("LINUX"); + w.PutParam("-define-"); w.PutParam("FREEBSD"); + w.PutParam("-define-"); w.PutParam("OPENBSD"); + w.PutParam("-define+"); w.PutParam("WIN32"); + w.PutParam("-define-"); w.PutParam("CYGWIN"); + w.PutParam("-define-"); w.PutParam("DARWIN"); + | cygwin: + w.PutParam("-define+"); w.PutParam("POSIX"); + w.PutParam("-define-"); w.PutParam("LINUX"); + w.PutParam("-define-"); w.PutParam("FREEBSD"); + w.PutParam("-define-"); w.PutParam("OPENBSD"); + w.PutParam("-define+"); w.PutParam("WIN32"); + w.PutParam("-define+"); w.PutParam("CYGWIN"); + w.PutParam("-define-"); w.PutParam("DARWIN"); + | darwin: + w.PutParam("-define+"); w.PutParam("POSIX"); + w.PutParam("-define-"); w.PutParam("LINUX"); + w.PutParam("-define-"); w.PutParam("FREEBSD"); + w.PutParam("-define-"); w.PutParam("OPENBSD"); + w.PutParam("-define-"); w.PutParam("WIN32"); + w.PutParam("-define-"); w.PutParam("CYGWIN"); + w.PutParam("-define+"); w.PutParam("DARWIN"); + ELSE + w.PutParam("-define-"); w.PutParam("POSIX"); + w.PutParam("-define-"); w.PutParam("LINUX"); + w.PutParam("-define-"); w.PutParam("FREEBSD"); + w.PutParam("-define-"); w.PutParam("OPENBSD"); + w.PutParam("-define-"); w.PutParam("WIN32"); + w.PutParam("-define-"); w.PutParam("DARWIN"); + END; + CASE linker OF + | dev2: + w.PutParam("-define+"); w.PutParam("DEV2"); + ELSE + w.PutParam("-define-"); w.PutParam("DEV2"); + END; w.PutParam(m.path); w.Execute(ok); IF ok THEN @@ -489,15 +904,24 @@ MODULE DswMakeMain; END END Compile; - PROCEDURE Link; - VAR p: DswProcs.Process; i: INTEGER; ok: BOOLEAN; + PROCEDURE LinkDev2; + VAR p: DswProcs.Process; i, res: INTEGER; ok: BOOLEAN; BEGIN - ASSERT(exe # NIL, 20); - ASSERT(exe^ # "", 21); + ASSERT((exe # NIL) & (exe^ # ""), 20); + ASSERT(processor = mach386, 21); + ASSERT(compiler = cpnative, 22); p := DswProcs.dir.New(); - p.Program("cpl486"); - p.PutParam("-os"); - p.PutParam("linux"); + 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, cygwin: p.PutParam("win32") + | darwin: p.PutParam("darwin") + END + END; p.PutParam("-kernel"); p.PutParam("Kernel"); p.PutParam("-main"); @@ -506,6 +930,7 @@ MODULE DswMakeMain; p.PutParam("."); p.PutParam("-o"); p.PutParam(exe); + PutParams(p, cplArgs); i := 0; WHILE i < mno DO IF ~(library IN lnkList[i].flags) THEN @@ -515,30 +940,44 @@ MODULE DswMakeMain; 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) + Log.String("Link "); Log.String(exe); Log.Ln; + res := p.Result(); + IF res # 0 THEN + Error(22, "", "", res) END ELSE - Log.String("unable to execute linker"); Log.Int(i); Log.Ln; - INC(err) + Error(23, "", "", 0) + END + END LinkDev2; + + PROCEDURE Link; + BEGIN + IF exe # NIL THEN + CASE linker OF + | anyint: (* do not link *) + | dev2: LinkDev2 + END END END Link; 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 - CheckDeps; + 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 + Compile; + IF err = 0 THEN + Link + END + END END END + ELSE Error(24, "", "", 0) END; IF err = 0 THEN Kernel.Quit(0) ELSE Kernel.Quit(1) @@ -547,17 +986,7 @@ MODULE DswMakeMain; 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