cpmake: add more options

diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp
index 48de2a89eddc90b6cb3f46dcdc82a973ccca0f4e..57a46d910d2845167cb7a58a763c4b0f53b360ad 100644 (file)
--- a/src/generic/Dsw/Mod/MakeMain.cp
+++ b/src/generic/Dsw/Mod/MakeMain.cp
@@ -41,9 +41,11 @@ MODULE DswMakeMain;
     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;
@@ -68,6 +70,8 @@ MODULE DswMakeMain;
     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;
@@ -162,6 +166,72 @@ MODULE DswMakeMain;
     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 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;
@@ -180,10 +250,12 @@ MODULE DswMakeMain;
 (*
     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("  -Cp params   Pass parameters to Component Pasacal compiler directly"); 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;
@@ -233,12 +305,34 @@ MODULE DswMakeMain;
     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;
     processor := anymach; os := anyos; compiler := anycp;
     LOOP
-      CASE DswOpts.GetOpt("ao:j:D:U:Th") OF
+      CASE DswOpts.GetOpt("ao:j:D:U:TCXh") OF
       | "a": auto := TRUE
       | "o": exe := DswOpts.str
       | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
@@ -246,6 +340,8 @@ MODULE DswMakeMain;
       | "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)
@@ -279,6 +375,14 @@ MODULE DswMakeMain;
     END;
     IF (exe # NIL) & (exe^ = "") THEN
       Log.String("output file name can't be empty"); Log.Ln; INC(err)
+    END;
+    IF cpcExe = NIL THEN
+      IF compiler = cpnative THEN cpcExe := NewStr("cpc486")
+      ELSIF compiler = cpfront THEN cpcExe := NewStr("cpfront")
+      END
+    END;
+    IF cplExe = NIL THEN
+      IF linker = dev2 THEN cplExe := NewStr("cpl486") END
     END
   END CheckParams;
 
@@ -536,6 +640,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
@@ -543,11 +664,9 @@ MODULE DswMakeMain;
     ASSERT(m.path # "", 21);
     ASSERT(m.worker = NIL, 22);
     w := DswProcs.dir.New();
-    CASE compiler OF
-    | cpnative: w.Program("cpc486")
-    | cpfront: w.Program("cpfront")
-    END;
+    w.Program(cpcExe);
     w.PutParam("-legacy");
+    PutParams(w, cpcArgs);
     w.PutParam(m.path);
     w.Execute(ok);
     IF ok THEN
@@ -615,7 +734,7 @@ MODULE DswMakeMain;
     ASSERT(compiler = cpnative, 22);
     ASSERT(os IN {linux, freebsd, openbsd, win32}, 23);
     p := DswProcs.dir.New();
-    p.Program("cpl486");
+    p.Program(cplExe);
     IF os # anyos THEN
       p.PutParam("-os");
       CASE os OF
@@ -633,6 +752,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
@@ -692,15 +812,3 @@ BEGIN
   NEW(def);
   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