cpmake: pass target related preprocessor selectors to compiler

[cpc.git] / src / generic / Dsw / Mod / MakeMain.cp

diff --git a/src/generic/Dsw/Mod/MakeMain.cp b/src/generic/Dsw/Mod/MakeMain.cp
index 57a46d910d2845167cb7a58a763c4b0f53b360ad..9df3961d6c067c22ccc57a3672d525ed4631c20b 100644 (file)
--- 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;
 
@@ -30,7 +32,7 @@ MODULE DswMakeMain;
     anymach = 0; cmach = 1; mach386 = 10; mach68k = 20;
 
     (* operation system types *)
-    anyos = 0; linux = 1; freebsd = 2; openbsd = 3; win32 = 4;
+    anyos = 0; linux = 1; freebsd = 2; openbsd = 3; win32 = 4; cygwin = 5; darwin = 6;
 
     (* compiler types *)
     anycp = 0; cpnative = 1; cpfront = 2;
@@ -262,11 +264,17 @@ MODULE DswMakeMain;
     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"); Log.Ln;
-    Log.String("  -v           Print version"); 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
@@ -284,6 +292,11 @@ MODULE DswMakeMain;
       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 Log.String("unknwon os "); Log.String(s); Log.Ln; INC(err)
       END
     | "g":
@@ -332,11 +345,12 @@ MODULE DswMakeMain;
     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:TCXh") OF
+      CASE DswOpts.GetOpt("ao:j:D:U:TCXhV") OF
       | "a": auto := TRUE
       | "o": exe := DswOpts.str
       | "j": jobs := MIN(MAX(StrToInt(DswOpts.str, 1), 1), maxJobs)
       | "h": Help
+      | "V": Version
       | "D": Define(DswOpts.str)
       | "U": Undefine(DswOpts.str)
       | "T": ParseTargetOpts
@@ -347,7 +361,7 @@ MODULE DswMakeMain;
       | "$": AddModule(DswOpts.str, def)
       | 0X: EXIT
       END
-    END
+    END;
   END ParseArgs;
 
   PROCEDURE CheckParams;
@@ -667,6 +681,87 @@ MODULE DswMakeMain;
     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
+    | anyos:
+      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");
+    | 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");
+    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
@@ -732,7 +827,6 @@ MODULE DswMakeMain;
     ASSERT((exe # NIL) & (exe^ # ""), 20);
     ASSERT(processor = mach386, 21);
     ASSERT(compiler = cpnative, 22);
-    ASSERT(os IN {linux, freebsd, openbsd, win32}, 23);
     p := DswProcs.dir.New();
     p.Program(cplExe);
     IF os # anyos THEN
@@ -741,7 +835,8 @@ MODULE DswMakeMain;
       | linux: p.PutParam("linux")
       | freebsd: p.PutParam("freebsd")
       | openbsd: p.PutParam("openbsd")
-      | win32: p.PutParam("win32")
+      | win32, cygwin: p.PutParam("win32")
+      | darwin: p.PutParam("darwin")
       END
     END;
     p.PutParam("-kernel");