diff --git a/source/app.d b/source/app.d index 8e016fc..3388fef 100644 --- a/source/app.d +++ b/source/app.d @@ -1,7 +1,7 @@ /** The entry point to dub - Copyright: © 2012 Matthias Dondorff + Copyright: © 2012-2013 Matthias Dondorff License: Subject to the terms of the MIT license, as written in the included LICENSE.txt file. Authors: Matthias Dondorff, Sönke Ludwig */ @@ -250,7 +250,6 @@ gensettings.config = build_config; gensettings.buildType = build_type; gensettings.compiler = compiler; - gensettings.compilerBinary = compiler_name; gensettings.buildSettings = build_settings; gensettings.run = cmd == "run"; gensettings.runArgs = args[1 .. $]; diff --git a/source/dub/dub.d b/source/dub/dub.d index ac08d7f..1428905 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -398,10 +398,9 @@ ddox_dub.loadPackage(ddox_pack.path); GeneratorSettings settings; - settings.compilerBinary = "dmd"; settings.config = "application"; - settings.compiler = getCompiler(settings.compilerBinary); - settings.platform = settings.compiler.determinePlatform(settings.buildSettings, settings.compilerBinary); + settings.compiler = getCompiler(settings.platform.compilerBinary); + settings.platform = settings.compiler.determinePlatform(settings.buildSettings, settings.platform.compilerBinary); settings.buildType = "debug"; ddox_dub.generateProject("build", settings); diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d index 13b9e43..d4cfc18 100644 --- a/source/dub/generators/build.d +++ b/source/dub/generators/build.d @@ -101,13 +101,13 @@ on the other compilers. Later this should be integrated somehow in the build process (either in the package.json, or using a command line flag) */ - if (settings.compilerBinary != "dmd" || !generate_binary || is_static_library) { + if (settings.platform.compilerBinary != "dmd" || !generate_binary || is_static_library) { // setup for command line if( generate_binary ) settings.compiler.setTarget(buildsettings, settings.platform); settings.compiler.prepareBuildSettings(buildsettings, BuildSetting.commandLine); // invoke the compiler - logInfo("Running %s...", settings.compilerBinary); + logInfo("Running %s...", settings.platform.compilerBinary); if( settings.run ) cleanup_files ~= exe_file_path; settings.compiler.invoke(buildsettings, settings.platform); } else { @@ -128,10 +128,10 @@ buildsettings.sourceFiles = buildsettings.sourceFiles.filter!(f => !f.endsWith(".lib"))().array(); settings.compiler.prepareBuildSettings(buildsettings, BuildSetting.commandLine); - logInfo("Running %s (compile)...", settings.compilerBinary); + logInfo("Compiling..."); settings.compiler.invoke(buildsettings, settings.platform); - logInfo("Linking...", settings.compilerBinary); + logInfo("Linking..."); if( settings.run ) cleanup_files ~= exe_file_path; settings.compiler.invokeLinker(lbuildsettings, settings.platform, [tempobj.toNativeString()]); } diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d index 02673e2..56f3ea6 100644 --- a/source/dub/generators/generator.d +++ b/source/dub/generators/generator.d @@ -37,7 +37,6 @@ BuildPlatform platform; string config; Compiler compiler; - string compilerBinary; // compiler executable name BuildSettings buildSettings; // only used for generator "rdmd" diff --git a/source/dub/generators/rdmd.d b/source/dub/generators/rdmd.d index 47dcf3d..f745498 100644 --- a/source/dub/generators/rdmd.d +++ b/source/dub/generators/rdmd.d @@ -70,7 +70,7 @@ logDiagnostic("Application output name is '%s'", getTargetFileName(buildsettings, settings.platform)); - string[] flags = ["--build-only", "--compiler="~settings.compilerBinary]; + string[] flags = ["--build-only", "--compiler="~settings.platform.compilerBinary]; flags ~= buildsettings.dflags; flags ~= (mainsrc).toNativeString();