diff --git a/CHANGELOG.md b/CHANGELOG.md index 03f9c68..03f4980 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ========= -v1.2.0 - 2017-01- +v1.2.0 - 2017-01-22 ------------------- ### Features and improvements ### diff --git a/source/dub/dub.d b/source/dub/dub.d index 3c64c0b..3a87fec 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -1066,7 +1066,7 @@ auto tool_pack = m_packageManager.getBestPackage(tool, ">=0.0.0"); if (!tool_pack) tool_pack = m_packageManager.getBestPackage(tool, "~master"); if (!tool_pack) { - logInfo("% is not present, getting and storing it user wide", tool); + logInfo("%s is not present, getting and storing it user wide", tool); tool_pack = fetch(tool, Dependency(">=0.0.0"), defaultPlacementLocation, FetchOptions.none); } diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d index 7d1e472..14971cc 100644 --- a/source/dub/generators/build.d +++ b/source/dub/generators/build.d @@ -69,7 +69,7 @@ auto bs = ti.buildSettings.dup; foreach (ldep; ti.linkDependencies) { auto dbs = targets[ldep].buildSettings; - if (bs.targetType != TargetType.staticLibrary) { + if (bs.targetType != TargetType.staticLibrary && !(bs.options & BuildOption.syntaxOnly)) { bs.addSourceFiles(target_paths[ldep].toNativeString()); } else { additional_dep_files ~= target_paths[ldep]; @@ -462,9 +462,9 @@ on the other compilers. Later this should be integrated somehow in the build process (either in the dub.json, or using a command line flag) */ - } else if (settings.buildMode == BuildMode.allAtOnce || settings.compiler.name != "dmd" || !generate_binary || is_static_library) { + } else if (generate_binary && (settings.buildMode == BuildMode.allAtOnce || settings.compiler.name != "dmd" || is_static_library)) { // setup for command line - if (generate_binary) settings.compiler.setTarget(buildsettings, settings.platform); + settings.compiler.setTarget(buildsettings, settings.platform); settings.compiler.prepareBuildSettings(buildsettings, BuildSetting.commandLine); // don't include symbols of dependencies (will be included by the top level target) @@ -480,20 +480,23 @@ // setup linker command line auto lbuildsettings = buildsettings; lbuildsettings.sourceFiles = lbuildsettings.sourceFiles.filter!(f => isLinkerFile(f)).array; - settings.compiler.setTarget(lbuildsettings, settings.platform); + if (generate_binary) settings.compiler.setTarget(lbuildsettings, settings.platform); settings.compiler.prepareBuildSettings(lbuildsettings, BuildSetting.commandLineSeparate|BuildSetting.sourceFiles); // setup compiler command line buildsettings.libs = null; buildsettings.lflags = null; - buildsettings.addDFlags("-c", "-of"~tempobj.toNativeString()); + if (generate_binary) buildsettings.addDFlags("-c", "-of"~tempobj.toNativeString()); buildsettings.sourceFiles = buildsettings.sourceFiles.filter!(f => !isLinkerFile(f)).array; + settings.compiler.prepareBuildSettings(buildsettings, BuildSetting.commandLine); settings.compiler.invoke(buildsettings, settings.platform, settings.compileCallback); - logInfo("Linking..."); - settings.compiler.invokeLinker(lbuildsettings, settings.platform, [tempobj.toNativeString()], settings.linkCallback); + if (generate_binary) { + logInfo("Linking..."); + settings.compiler.invokeLinker(lbuildsettings, settings.platform, [tempobj.toNativeString()], settings.linkCallback); + } } } diff --git a/source/dub/internal/vibecompat/data/json.d b/source/dub/internal/vibecompat/data/json.d index 131944c..af9c591 100644 --- a/source/dub/internal/vibecompat/data/json.d +++ b/source/dub/internal/vibecompat/data/json.d @@ -11,7 +11,7 @@ */ module dub.internal.vibecompat.data.json; -version (Have_vibe_d) public import vibe.data.json; +version (Have_vibe_d_data) public import vibe.data.json; else: import dub.internal.vibecompat.data.utils; diff --git a/source/dub/internal/vibecompat/data/serialization.d b/source/dub/internal/vibecompat/data/serialization.d index 818739e..b351324 100644 --- a/source/dub/internal/vibecompat/data/serialization.d +++ b/source/dub/internal/vibecompat/data/serialization.d @@ -91,7 +91,7 @@ */ module dub.internal.vibecompat.data.serialization; -version (Have_vibe_d) public import vibe.data.serialization; +version (Have_vibe_d_data) public import vibe.data.serialization; else: import dub.internal.vibecompat.data.utils; diff --git a/source/dub/internal/vibecompat/data/utils.d b/source/dub/internal/vibecompat/data/utils.d index d41cd4d..7dbcf46 100644 --- a/source/dub/internal/vibecompat/data/utils.d +++ b/source/dub/internal/vibecompat/data/utils.d @@ -7,7 +7,7 @@ */ module dub.internal.vibecompat.data.utils; -version (Have_vibe_d) {} +version (Have_vibe_d_data) {} else: public import std.traits; diff --git a/source/dub/internal/vibecompat/inet/path.d b/source/dub/internal/vibecompat/inet/path.d index d42b005..a1a348f 100644 --- a/source/dub/internal/vibecompat/inet/path.d +++ b/source/dub/internal/vibecompat/inet/path.d @@ -7,7 +7,7 @@ */ module dub.internal.vibecompat.inet.path; -version (Have_vibe_d) public import vibe.inet.path; +version (Have_vibe_d_inet) public import vibe.inet.path; else: import std.algorithm; diff --git a/source/dub/internal/vibecompat/inet/url.d b/source/dub/internal/vibecompat/inet/url.d index d9f021f..7349ef5 100644 --- a/source/dub/internal/vibecompat/inet/url.d +++ b/source/dub/internal/vibecompat/inet/url.d @@ -9,7 +9,7 @@ public import dub.internal.vibecompat.inet.path; -version (Have_vibe_d) public import vibe.inet.url; +version (Have_vibe_d_inet) public import vibe.inet.url; else: import std.algorithm; diff --git a/source/dub/version_.d b/source/dub/version_.d index f65b716..94ca6f0 100644 --- a/source/dub/version_.d +++ b/source/dub/version_.d @@ -1,2 +1,2 @@ module dub.version_; -enum dubVersion = "v1.2.0-beta.2"; +enum dubVersion = "v1.2.0";