Fixed compilation using current DMD

gecko0307 · Aug 23, 2019 · c90fee5 · c90fee5
1 parent c03fd9c
commit c90fee5
Show file tree

Hide file tree

Showing 3 changed files with 790 additions and 787 deletions.
diff --git a/cmdopt.d b/cmdopt.d
@@ -30,7 +30,8 @@ module cmdopt;
 
 import std.stdio;
 import std.getopt;
-import std.c.process;
+import std.process;
+import core.stdc.stdlib;
 
 class CmdOptions
 {
@@ -97,7 +98,7 @@ class CmdOptions
         catch(Exception)
         {
             writeln("Illegal option");
-            std.c.process.exit(1);
+            core.stdc.stdlib.exit(1);
         }
 
         program = args[0];

diff --git a/main.d b/main.d
@@ -40,7 +40,7 @@ import dmodule;
 import session;
 import exdep;
 
-static string versionString = "2.1.2";
+static string versionString = "2.1.3";
 
 void main(string[] args)
 {
@@ -72,33 +72,33 @@ void printHelp(string programName, string programVersion)
     (
         "Cook2 ", programVersion, "\n",
         "A tool for building projects in D programming language\n",
-        "\n"
+        "\n",
         "Usage:\n",
-        programName, " [MAINMODULE] [OPTIONS]\n",
-        "\n"
-        "OPTIONS:\n"
-        "\n"
-        "--help        Display this information\n"
-        "--emulate     Don't write anything to disk\n"
-        "--quiet       Don't print messages\n"
-        "--rebuild     Force rebuilding all modules\n"
-        "--nocache     Disable reading/writing module cache\n"
-        "--lib         Build a static library instead of an executable\n"
-        "--release     Compile modules in release mode\n"
-        "--noconsole   Under Windows, hide application console window\n"
-        "--strip       Remove debug symbols from resulting binary using \"strip\"\n"
-        "              (currently works only under Linux)\n"
-        "-o FILE       Compile to specified filename\n"
-        "--clean       Remove temporary data (object files, cache, etc.)\n"
-        "--cache FILE  Use specified cache file\n"
-        "--rc FILE     Under Windows, compile and link specified resource file\n"
-      "-c\"...\"       Pass specified option(s) to compiler\n"
-      "-l\"...\"       Pass specified option(s) to linker\n"
-        "--run         Run program after compilation (does't work in emulation mode)\n"
-        "--dc FILE     Specify default configuration file (default \"default.conf\")\n"
-        "--https       Use HTTPS instead of SSH when fetching remote dependencies\n"
-        "--rsp         Pass object file names to linker via responce file\n"
-        "              instead of command line\n"
+        "cook [MAINMODULE] [OPTIONS]\n",
+        "\n",
+        "OPTIONS:\n",
+        "\n",
+        "--help        Display this information\n",
+        "--emulate     Don't write anything to disk\n",
+        "--quiet       Don't print messages\n",
+        "--rebuild     Force rebuilding all modules\n",
+        "--nocache     Disable reading/writing module cache\n",
+        "--lib         Build a static library instead of an executable\n",
+        "--release     Compile modules in release mode\n",
+        "--noconsole   Under Windows, hide application console window\n",
+        "--strip       Remove debug symbols from resulting binary using \"strip\"\n",
+        "              (currently works only under Linux)\n",
+        "-o FILE       Compile to specified filename\n",
+        "--clean       Remove temporary data (object files, cache, etc.)\n",
+        "--cache FILE  Use specified cache file\n",
+        "--rc FILE     Under Windows, compile and link specified resource file\n",
+      "-c\"...\"       Pass specified option(s) to compiler\n",
+      "-l\"...\"       Pass specified option(s) to linker\n",
+        "--run         Run program after compilation (does't work in emulation mode)\n",
+        "--dc FILE     Specify default configuration file (default \"default.conf\")\n",
+        "--https       Use HTTPS instead of SSH when fetching remote dependencies\n",
+        "--rsp         Pass object file names to linker via responce file\n",
+        "              instead of command line\n",
         "--local       Store temporary data in cwd instead of home directory\n"
     );
 }