Changeset 1220

Timestamp:

07/05/09 14:08:48 (3 years ago)

Author:

andrei

Message:

Incorporated changes suggested by Adam Ruppe, see http://www.digitalmars.com/webnews/newsgroups.php?art_group=digitalmars.D&article_id=92769

Files:

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

trunk/tools/rdmd.d

@@ -5 +5 @@
-    std.algorithm, std.iterator, std.md5, std.path, std.regexp, std.getopt,
-    std.c.stdlib, std.process;
+
+version (Posix)
+{
+    enum objExt = ".o";
+    enum binExt = "";
+}
+else version (Windows)
+{
+    enum objExt = ".obj";
+    enum binExt = ".exe";
+}
+else
+{
+    static assert(0);
+}
-
-private bool chatty, buildOnly, dryRun, force;
@@ -113 +128 @@
-    const compilerFlags = args[1 .. programPos];
-
-    // Change to the main module's directory; all searches will be
-    // relative to that directory
-    // auto initialDir = getcwd;
-    // chdir(exeDirname);
-    // scope(exit) chdir(initialDir);
-
-    // Compute the object directory and ensure it exists
-    invariant objDir = getObjPath(root, compilerFlags);
@@ -154 +163 @@
-            assert(0);
-    }
+    // Add an ".exe" for Windows
+    exe ~= binExt; 
-
-    // Have at it
@@ -193 +204 @@
-            tmpRoot = std.process.getenv("TMP");
-        }
-"./.rdmd"
-"/
+join(".", ".rdmd")
+pathsep ~ "
-    }
-    exists(tmpRoot) && isdir(tmpRoot) || mkdirRecurse(tmpRoot);
@@ -254 +265 @@
-        return result;
-    }
-    // clean up the object file, not needed anymore
-    //remove(std.path.join(objDir, basename(root, ".d")~".o"));
-    // clean up the dir containing the object file
-    rmdirRecurse(objDir);
@@ -279 +288 @@
-{
-    string d2obj(string dfile) {
-".o"
+objExt
-    }
-