index 824799955d58e8aec2fe9b6eb389e46de5c63ed7..acf9619195372ae79e6b78374795cf60e75dcd5e 100644 (file)
END;
VAR (* options *)
END;
VAR (* options *)
- auto, trap, clean: BOOLEAN;
+ auto, trap, clean, symonly, nocode1, nocode2: BOOLEAN;
exe, target, base: String;
jobs: INTEGER;
exe, target, base: String;
jobs: INTEGER;
i := IdentLen(n);
IF i # 0 THEN
IF ~((n[i] = 0X) OR (((n[i] = "+") OR (n[i] = "-")) & (n[i + 1] = 0X))) THEN
i := IdentLen(n);
IF i # 0 THEN
IF ~((n[i] = 0X) OR (((n[i] = "+") OR (n[i] = "-")) & (n[i + 1] = 0X))) THEN
- Error("defines: expectd + or - after identifier (^0)", n, "", 0)
+ 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;
END;
v := n[i] # "-"; n[i] := 0X; s := def;
WHILE (s.next # NIL) & (s.next.name$ # n$) DO s := s.next END;
ELSIF overwrite THEN
s.next.value := v
END
ELSIF overwrite THEN
s.next.value := v
END
- ELSE Error("defines: '^0' not valid identifier", n, "", 0)
+ ELSE Error("selector '^0' have invalid identifier", n, "", 0)
END
END Define;
END
END Define;
Log.String("Usage: cpmake [options] module..."); Log.Ln;
Log.String("Options:"); Log.Ln;
Log.String(" -a Enable automatic dependency resolution"); Log.Ln;
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(" -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(" -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(" -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;
exe := NIL; auto := FALSE; jobs := 1; def.next := NIL; mno := 0; rno := 0;
target := NewStr("default"); base := NewStr("cprules");
LOOP
exe := NIL; auto := FALSE; jobs := 1; def.next := NIL; mno := 0; rno := 0;
target := NewStr("default"); base := NewStr("cprules");
LOOP
- CASE DswOpts.GetOpt("acdgo:t:j:f:") OF
+ CASE DswOpts.GetOpt("acbxd:sgGo:t:j:f:") OF
| "a": auto := TRUE
| "a": auto := TRUE
+ | "b": nocode1 := TRUE
+ | "x": nocode2 := TRUE
| "c": clean := TRUE
| "c": clean := TRUE
- | "d": trap := TRUE
+ | "g": trap := TRUE
+ | "G": Kernel.intTrap := TRUE
+ | "s": symonly := TRUE
| "f": base := DswOpts.str
| "f": base := DswOpts.str
+ | "d": Define(DswOpts.str, TRUE)
| "h": Help
| "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
| "o": exe := DswOpts.str
| "h": Help
| "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
| "o": exe := DswOpts.str
p := DswProcs.dir.New();
p.Program(base + "/" + target + "/" + "build");
p.PutParam(m.odc);
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 force IN m.flags THEN p.PutParam("-f") END;
- IF library IN m.flags THEN p.PutParam("-s") 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;
s := def.next;
WHILE s # NIL DO
IF s.value THEN p.PutParam("-D") ELSE p.PutParam("-d") END;
PROCEDURE Link;
VAR p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER;
BEGIN
PROCEDURE Link;
VAR p: DswProcs.Process; ok: BOOLEAN; i, res: INTEGER;
BEGIN
- IF exe # NIL THEN
+ IF ~symonly & (exe # NIL) THEN
p := DswProcs.dir.New();
p.Program(base + "/" + target + "/" + "link");
p.PutParam(exe$);
p := DswProcs.dir.New();
p.Program(base + "/" + target + "/" + "link");
p.PutParam(exe$);