Skip to content

Commit

Permalink
Don't include "binary" and "config" from .deps
Browse files Browse the repository at this point in the history
For some reason, the "binary" (the name of the dmd executable) and "config"
(the path to dmd.conf) lines from the .deps file were included as
dependencies.  This commit makes rdmd ignore these lines.
  • Loading branch information
kyllingstad committed Aug 18, 2011
1 parent 0fbe489 commit cae99e2
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions rdmd.d
Expand Up @@ -411,7 +411,7 @@ private string[string] getDependencies(string rootModule, string objDir,
scope(exit) collectException(depsReader.close); // don't care for errors

// Fetch all dependencies and append them to myDeps
auto pattern = new RegExp(r"^(import|file|binary|config)\s+([^\(]+)\(?([^\)]*)\)?\s*$");
auto pattern = new RegExp(r"^(import|file)\s+([^\(]+)\(?([^\)]*)\)?\s*$");
foreach (string line; lines(depsReader))
{
if (!pattern.test(line)) continue;
Expand All @@ -428,10 +428,6 @@ private string[string] getDependencies(string rootModule, string objDir,
myDeps[pattern[3].strip()] = null;
break;

case "binary", "config":
myDeps[pattern[2].strip()] = null;
break;

default: assert(0);
}
}
Expand Down

0 comments on commit cae99e2

Please sign in to comment.