X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=src%2Fgeneric%2FDsw%2FMod%2FMakeMain.cp;h=f416a34ec325eb67fa826df5a4e8bb55602bc52d;hp=bd06566f501cd9a00c76bd1fa0af2f0704680a2a;hb=b35fa3c3fee588fdea3139f49be3b6d1f9c52a89;hpb=fe8a1b7186dee342e1e5024ac44a3db8a98976aa diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp index bd06566..f416a34 100644 --- a/src/generic/Dsw/Mod/MakeMain.cp +++ b/src/generic/Dsw/Mod/MakeMain.cp @@ -3,7 +3,10 @@ MODULE DswMakeMain; IMPORT Kernel, Files, Log, Strings, DswOpts, DswProcs, DswDocuments, DevCPM, DevCPT, DevCPR, DevCPS; CONST - version = "0.3.0"; + version = "0.3"; + + modDir = "Mod"; + sysDir = "System"; maxImps = 127; maxJobs = maxImps; @@ -57,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; @@ -74,9 +77,14 @@ MODULE DswMakeMain; processor, compiler, os, linker: INTEGER; cpcExe, cplExe: String; cpcArgs, cplArgs: StringList; + dirList: DevCPM.Directory; auto: BOOLEAN; + trap: 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; @@ -84,9 +92,9 @@ MODULE DswMakeMain; 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 *) + | 2: msg := "option -U expect identifier" (* rm *) + | 3: msg := "invalid module name" + | 4: msg := "invalid integer value" | 5: msg := "unterminated string" | 6: msg := "unknown processor ^0" | 7: msg := "unknown os ^0" @@ -94,28 +102,31 @@ MODULE DswMakeMain; | 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" + | 12: msg := "compiler not selected (use option -g)" + | 13: msg := "processor not selected (use option -m)" + | 14: msg := "selected 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" + | 16: msg := "cpfront can't produce executable file" + | 17: msg := "linker not selected (use option -i)" + | 18: msg := "os not selected (use option -s)" + | 19: msg := "specified empty file name" | 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" + | 25: msg := "compiler not installed (use option -Xg to select executable)" + | 26: msg := "linker not installed (use option -Xi to select executable)" 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) + INC(err); + IF trap THEN + HALT(100) + END END Error; (* --------- options --------- *) @@ -130,7 +141,7 @@ 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); @@ -143,41 +154,17 @@ MODULE DswMakeMain; 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 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 - Error(2, "", "", 0) - 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); @@ -188,7 +175,7 @@ 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 @@ -278,33 +265,35 @@ MODULE DswMakeMain; 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(" -a Enable automatic dependency resolution"); 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(' -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; + Log.String(" -g compiler Specify Component Pascal compiler"); Log.Ln; + Log.String(" cpfront BlackBox based C code translator"); Log.Ln; + Log.String(" native BlackBox based native code compiler"); Log.Ln; + Log.String(" -h Print help and quit"); Log.Ln; + Log.String(" -i linker Specify internal linker (native only)"); Log.Ln; + Log.String(" dev2 Dev2 based ELF/PE linker"); Log.Ln; + Log.String(" -II Trap on user interrupt (debug)"); Log.Ln; + Log.String(" -IT Trap on first error (debug)"); 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(" -j num Specifies the number of jobs to run simultaneously"); Log.Ln; + Log.String(" -m 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(" -o name Generate executable file (native only)"); Log.Ln; + Log.String(" -s os Generate code for specified operation system"); Log.Ln; + Log.String(" none Unknown operation system"); Log.Ln; + Log.String(" freebsd FreeBSD"); Log.Ln; + Log.String(" linux Linux"); Log.Ln; + Log.String(" openbsd OpenBSD"); Log.Ln; + Log.String(" win32 Windows"); Log.Ln; + Log.String(" -V Print version and quit"); 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; Kernel.Quit(1) END Help; @@ -314,49 +303,6 @@ MODULE DswMakeMain; 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 @@ -381,40 +327,98 @@ MODULE DswMakeMain; PROCEDURE ParseInfoOpts; BEGIN - CASE DswOpts.GetOpt("I") OF + CASE DswOpts.GetOpt("CLcIT") OF + | "T": trap := TRUE | "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; + VAR s: String; 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:TCXIhV") OF + CASE DswOpts.GetOpt("ao:j:D:m:s:g:i:TCXIFhV") OF | "a": auto := TRUE | "o": exe := DswOpts.str | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs) + | "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 | "h": Help | "V": Version - | "D": Define(DswOpts.str) - | "U": Undefine(DswOpts.str) - | "T": ParseTargetOpts + | "D": Define(DswOpts.str, TRUE) | "C": ParseCommandOpts | "X": ParseExternalOpts | "I": ParseInfoOpts + | "F": ParseFileOpts | ":": Error(10, "-" + DswOpts.str, "", 0) | "?": Error(11, "-" + DswOpts.str, "", 0) - | "$": AddModule(DswOpts.str, def) + | "$": AddModule(DswOpts.str, def, dirList) | 0X: EXIT 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 Error(12, "", "", 0) @@ -453,7 +457,24 @@ MODULE DswMakeMain; IF cplExe = NIL THEN Error(26, "", "", 0) END - 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 --------- *) @@ -478,7 +499,7 @@ MODULE DswMakeMain; 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); + NEW(imp); imp.name := name$; modList[mno] := imp; INC(mno) ELSE imp := modList[j] @@ -568,19 +589,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 @@ -594,31 +613,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); @@ -630,6 +645,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); @@ -681,14 +713,14 @@ 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 Error(21, m.name$, "", 0) @@ -754,101 +786,41 @@ 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); + IF trap THEN + w.PutParam("-trap") + END; 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"); + 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; - w.PutParam(m.path); + PutParams(w, cpcArgs); + 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; @@ -912,6 +884,10 @@ MODULE DswMakeMain; ASSERT(compiler = cpnative, 22); p := DswProcs.dir.New(); p.Program(cplExe); + IF trap THEN + p.PutParam("-trap") + END; + PutPathList(p, "-legacycodedir", dirList); IF os # anyos THEN p.PutParam("-os"); CASE os OF @@ -960,19 +936,57 @@ 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 @@ -981,7 +995,7 @@ MODULE DswMakeMain; END; IF err = 0 THEN Kernel.Quit(0) ELSE Kernel.Quit(1) - END; + END END Main; BEGIN