Mercurial > projects > doodle
diff configure.d @ 132:bc5baa585b32
Updated to dmd 2.060
author | David Bryant <bagnose@gmail.com> |
---|---|
date | Thu, 02 Aug 2012 15:32:43 +0930 |
parents | 1da160a2c373 |
children | 9e1a313d8003 |
line wrap: on
line diff
--- a/configure.d Thu Jan 12 18:20:58 2012 +1030 +++ b/configure.d Thu Aug 02 15:32:43 2012 +0930 @@ -46,7 +46,7 @@ // check that source_path looks like a source tree by making sure // that a README and options file are present writefln("Examining source"); - if (!std.path.join(sourcePath, "README").exists || !std.path.join(sourcePath, "options").exists) { + if (!buildPath(sourcePath, "README").exists || !buildPath(sourcePath, "options").exists) { writefln("Error - current directory must contain README and options"); return -1; } @@ -58,26 +58,26 @@ return -1; } targetPath.mkdirRecurse; - string binPath = std.path.join(targetPath, "bin"); + string binPath = buildPath(targetPath, "bin"); binPath.mkdir; // compile builder into bin_path writefln("Building the builder"); - int ret = system(format("dmd -m32 -w -wi %s -O -of%s", - std.path.join(sourcePath, "builder.d"), std.path.join(binPath, "builder"))); + int ret = system(format("dmd -m64 -w -wi %s -O -of%s", + buildPath(sourcePath, "builder.d"), buildPath(binPath, "builder"))); if (ret) { writefln("Error - builder failed to compile"); return -1; } - std.path.join(binPath, "builder.o").remove; + buildPath(binPath, "builder.o").remove; // set up scripts { - auto file = File(std.path.join(targetPath, "build"), "w"); + auto file = File(buildPath(targetPath, "build"), "w"); file.writefln("#!/bin/bash"); - file.writefln("%s %s %s", std.path.join(binPath, "builder"), sourcePath, targetPath); + file.writefln("%s %s %s", buildPath(binPath, "builder"), sourcePath, targetPath); } - system("chmod +x " ~ std.path.join(targetPath, "build")); + system("chmod +x " ~ buildPath(targetPath, "build")); writefln("All done"); return 0;