Skip to content

rdmd fixes #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 24, 2011
Merged

rdmd fixes #14

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
142e9b1
rdmd: Append UID to /tmp directory on POSIX.
CyberShadow Sep 20, 2011
27b1e8c
rdmd: --build-only should imply building to program directory
CyberShadow Sep 20, 2011
bdb39ac
rdmd: --build-only should imply building to *current* directory
CyberShadow Sep 30, 2011
03059ca
rdmd: Don't append a second extension to -of path on Windows
CyberShadow Oct 1, 2011
b0fe622
rdmd: Add .map to list of extensions to ignore
CyberShadow Oct 1, 2011
402f2dd
rdmd: Remove std.getopt.config.stopOnFirstNonOption
CyberShadow Oct 1, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions rdmd.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ int main(string[] args)
getopt(args,
std.getopt.config.caseSensitive,
std.getopt.config.passThrough,
std.getopt.config.stopOnFirstNonOption,
"build-only", &buildOnly,
"chatty", &chatty,
"compiler", &compiler,
Expand Down Expand Up @@ -148,6 +147,10 @@ int main(string[] args)
args = args[0 .. programPos];
auto compilerFlags = args[1 .. programPos - 1];

// --build-only implies the user would like a binary in the current directory
if (buildOnly && !exe)
exe = "." ~ std.path.sep;

// Compute the object directory and ensure it exists
immutable objDir = getObjPath(root, compilerFlags);
// Fetch dependencies
Expand Down Expand Up @@ -180,23 +183,21 @@ int main(string[] args)
if (std.algorithm.endsWith(exe, std.path.sep[]))
{
// user specified a directory, complete it to a file
exe = std.path.join(exe, exeBasename);
exe = std.path.join(exe, exeBasename) ~ binExt;
}
}
else
{
//exe = exeBasename ~ '.' ~ hash(root, compilerFlags);
version (Posix)
exe = std.path.join(myOwnTmpDir, rel2abs(root)[1 .. $])
~ '.' ~ hash(root, compilerFlags);
~ '.' ~ hash(root, compilerFlags) ~ binExt;
else version (Windows)
exe = std.path.join(myOwnTmpDir, replace(root, ".", "-"))
~ '-' ~ hash(root, compilerFlags);
~ '-' ~ hash(root, compilerFlags) ~ binExt;
else
static assert(0);
}
// Add an ".exe" for Windows
exe ~= binExt;

// Have at it
if (isNewer(root, exe) ||
Expand Down Expand Up @@ -234,7 +235,7 @@ size_t indexOfProgram(string[] args)
{
if (i > 0 &&
!arg.startsWith('-', '@') &&
!arg.endsWith(".obj", ".o", ".lib", ".a", ".def"))
!arg.endsWith(".obj", ".o", ".lib", ".a", ".def", ".map"))
{
return i;
}
Expand All @@ -260,7 +261,8 @@ private string myOwnTmpDir()
{
version (Posix)
{
enum tmpRoot = "/tmp/.rdmd";
import core.sys.posix.unistd;
auto tmpRoot = format("/tmp/.rdmd-%d", getuid());
}
else version (Windows)
{
Expand Down