Changeset 962

Timestamp:

03/06/09 16:01:51 (3 years ago)

Author:

andrei

Message:

Added --main option

Files:

• trunk/tools/rdmd.d (modified) (10 diffs)

trunk/tools/rdmd.d

@@ -98 +98 @@
-
-    // set by functions called in getopt if program should exit
-
+, addStubMain
-    string eval;
-    getopt(args,
@@ -109 +109 @@
-            "force", &force,
-            "help", (string) { writeln(helpString); bailout = true; },
+            "main", &addStubMain,
-            "man", (string) { man; bailout = true; },
-            "eval", &eval,
@@ -182 +183 @@
-            find!((string a) {return isNewer(a, exe);})(myModules.keys).length)
-    {
-
+
+
-        if (result) return result;
-    }
@@ -202 +204 @@
-}
-
-t
+myOwnT
-{
-    version (linux)
-    {
-
+/.rdmd
-    }
-    else version (Windows)
@@ -214 +216 @@
-        {
-            tmpRoot = std.process.getenv("TMP");
-
-
-
+
+
+
+
+
-    return tmpRoot;
-}
@@ -239 +243 @@
-private string getObjPath(in string root, in string[] compilerFlags)
-{
-t
+myOwnT
-    return std.path.join(tmpRoot,
-            "rdmd-" ~ basename(root) ~ '-' ~ hash(root, compilerFlags));
@@ -250 +254 @@
-private int rebuild(string root, string fullExe,
-        string objDir, in string[string] myModules,
-
+, bool addStubMain
-{
-    auto todo = compiler~" "~join(compilerFlags, " ")
@@ -259 +263 @@
-        todo ~= k ~ " ";
-    }
+
+    // Need to add the pesky void main(){}?
+    if (addStubMain)
+    {
+        auto stubMain = std.path.join(myOwnTmpDir, "stubmain.d");
+        std.file.write(stubMain, "void main(){}");
+        todo ~= stubMain;
+    }
+    
-    invariant result = run(todo);
-    if (result) 
@@ -344 +357 @@
-  --dry-run         do not compile, just show what commands would be run
-                      (implies --chatty)
+  --eval=code       evaluate code a la perl -e
-  --force           force a rebuild even if apparently not necessary
-eval=code       evaluate code a la perl -
+help            this messag
-  --loop            assume \"foreach (line; stdin.byLine()) { ... }\" for eval
-help            this message
+main            add a stub main program to the mix (e.g. for unittesting)
-  --man             open web browser on manual page
-  --shebang         rdmd is in a shebang line (put as first argument)
@@ -360 +374 @@
-    ubyte digest[16];
-    context.finish(digest);
-
-
+
-    auto progname = std.path.join(pathname,
-            "eval." ~ digestToString(digest));