Merge pull request #505 from machindertechnologies/singleFileFixes

Fixed singleFile build mode issues
dlang · Feb 12, 2015 · 83b2926 · 83b2926
2 parents 00c5478 + 0dc606e
commit 83b2926
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 6 deletions.
diff --git a/source/dub/compilers/buildsettings.d b/source/dub/compilers/buildsettings.d
@@ -185,7 +185,8 @@ enum TargetType {
 	library,
 	sourceLibrary,
 	dynamicLibrary,
-	staticLibrary
+	staticLibrary,
+	object
 }
 
 enum BuildRequirements {

diff --git a/source/dub/compilers/compiler.d b/source/dub/compilers/compiler.d
@@ -366,6 +366,10 @@ string getTargetFileName(in BuildSettings settings, in BuildPlatform platform)
 			if( platform.platform.canFind("windows") )
 				return settings.targetName ~ ".dll";
 			else return "lib" ~ settings.targetName ~ ".so";
+		case TargetType.object:
+			if (platform.platform.canFind("windows"))
+				return settings.targetName ~ ".obj";
+			else return settings.targetName ~ ".o";
 	}
 }
 

diff --git a/source/dub/compilers/dmd.d b/source/dub/compilers/dmd.d
@@ -169,6 +169,9 @@ class DmdCompiler : Compiler {
 				version (Windows) settings.addDFlags("-shared");
 				else settings.addDFlags("-shared", "-fPIC");
 				break;
+			case TargetType.object:
+				settings.addDFlags("-c");
+				break;
 		}
 
 		if (tpath is null)
@@ -189,14 +192,18 @@ class DmdCompiler : Compiler {
 	{
 		import std.string;
 		auto tpath = Path(settings.targetPath) ~ getTargetFileName(settings, platform);
-		auto args = [platform.compilerBinary, "-of"~tpath.toNativeString()];
+		auto args = ["-of"~tpath.toNativeString()];
 		args ~= objects;
 		args ~= settings.sourceFiles;
 		version(linux) args ~= "-L--no-as-needed"; // avoids linker errors due to libraries being speficied in the wrong order by DMD
 		args ~= settings.lflags.map!(l => "-L"~l)().array;
 		args ~= settings.dflags.filter!(f => isLinkerDFlag(f)).array;
-		logDiagnostic("%s", args.join(" "));
-		invokeTool(args, output_callback);
+
+		auto res_file = getTempFile("dub-build", ".lnk");
+		std.file.write(res_file.toNativeString(), join(args, "\n"));
+
+		logDiagnostic("%s %s", platform.compilerBinary, args.join(" "));
+		invokeTool([platform.compilerBinary, "@"~res_file.toNativeString()], output_callback);
 	}
 
 	private static bool isLinkerDFlag(string arg)

diff --git a/source/dub/compilers/gdc.d b/source/dub/compilers/gdc.d
@@ -167,6 +167,7 @@ class GdcCompiler : Compiler {
 			case TargetType.executable: break;
 			case TargetType.library:
 			case TargetType.staticLibrary:
+			case TargetType.object:
 				settings.addDFlags("-c");
 				break;
 			case TargetType.dynamicLibrary:

diff --git a/source/dub/compilers/ldc.d b/source/dub/compilers/ldc.d
@@ -157,6 +157,9 @@ class LdcCompiler : Compiler {
 			case TargetType.dynamicLibrary:
 				settings.addDFlags("-shared");
 				break;
+			case TargetType.object:
+				settings.addDFlags("-c");
+				break;
 		}
 
 		if (tpath is null)

diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d
@@ -350,15 +350,20 @@ class BuildGenerator : ProjectGenerator {
 	/// Output an unique name to represent the source file.
 	/// Calls with path that resolve to the same file on the filesystem will return the same,
 	/// unless they include different symbolic links (which are not resolved).
-	static string pathToObjName(string path) { return std.path.buildNormalizedPath(getcwd(), path~objSuffix)[1..$].replace("/", "."); }
+
+	static string pathToObjName(string path)
+	{
+		return std.path.stripDrive(std.path.buildNormalizedPath(getcwd(), path~objSuffix))[1..$].replace(std.path.dirSeparator, ".");
+	}
+
 	/// Compile a single source file (srcFile), and write the object to objName.
 	static string compileUnit(string srcFile, string objName, BuildSettings bs, GeneratorSettings gs) {
 		Path tempobj = Path(bs.targetPath)~objName;
 		string objPath = tempobj.toNativeString();
 		bs.libs = null;
 		bs.lflags = null;
-		bs.addDFlags("-c");
 		bs.sourceFiles = [ srcFile ];
+		bs.targetType = TargetType.object;
 		gs.compiler.prepareBuildSettings(bs, BuildSetting.commandLine);
 		gs.compiler.setTarget(bs, gs.platform, objPath);
 		gs.compiler.invoke(bs, gs.platform, gs.compileCallback);