diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d index 8db2c32..cdcde08 100644 --- a/source/dub/generators/build.d +++ b/source/dub/generators/build.d @@ -142,7 +142,7 @@ return cached; } - bool performCachedBuild(GeneratorSettings settings, BuildSettings buildsettings, in Package pack, string config, string build_id, in Package[] packages, in Path[] additional_dep_files) + private bool performCachedBuild(GeneratorSettings settings, BuildSettings buildsettings, in Package pack, string config, string build_id, in Package[] packages, in Path[] additional_dep_files) { auto cwd = Path(getcwd()); auto target_path = pack.path ~ format(".dub/build/%s/", build_id); @@ -181,7 +181,7 @@ return false; } - void performRDMDBuild(GeneratorSettings settings, ref BuildSettings buildsettings, in Package pack, string config) + private void performRDMDBuild(GeneratorSettings settings, ref BuildSettings buildsettings, in Package pack, string config) { auto cwd = Path(getcwd()); //Added check for existance of [AppNameInPackagejson].d @@ -247,7 +247,7 @@ } } - void performDirectBuild(GeneratorSettings settings, ref BuildSettings buildsettings, in Package pack, string config) + private void performDirectBuild(GeneratorSettings settings, ref BuildSettings buildsettings, in Package pack, string config) { auto cwd = Path(getcwd()); @@ -404,7 +404,7 @@ return objPath; } - void buildWithCompiler(GeneratorSettings settings, BuildSettings buildsettings) + private void buildWithCompiler(GeneratorSettings settings, BuildSettings buildsettings) { auto generate_binary = !(buildsettings.options & BuildOption.syntaxOnly); auto is_static_library = buildsettings.targetType == TargetType.staticLibrary || buildsettings.targetType == TargetType.library; @@ -480,7 +480,7 @@ } } - void runTarget(Path exe_file_path, in BuildSettings buildsettings, string[] run_args, GeneratorSettings settings) + private void runTarget(Path exe_file_path, in BuildSettings buildsettings, string[] run_args, GeneratorSettings settings) { if (buildsettings.targetType == TargetType.executable) { auto cwd = Path(getcwd()); @@ -515,7 +515,7 @@ enforce(false, "Target is a library. Skipping execution."); } - void cleanupTemporaries() + private void cleanupTemporaries() { foreach_reverse (f; m_temporaryFiles) { try { diff --git a/source/dub/generators/cmake.d b/source/dub/generators/cmake.d index 529cccd..fcf0b94 100644 --- a/source/dub/generators/cmake.d +++ b/source/dub/generators/cmake.d @@ -95,14 +95,14 @@ script.put( "target_link_libraries(%s %s %s)\n".format( name, - (info.dependencies ~ info.linkDependencies).dup.stdsort.uniq.map!sanitize.join(" "), + (info.dependencies ~ info.linkDependencies).dup.stdsort.uniq.map!(s => sanitize(s)).join(" "), info.buildSettings.libs.dup.join(" ") ) ); script.put( `set_target_properties(%s PROPERTIES TEXT_INCLUDE_DIRECTORIES "%s")`.format( name, - info.buildSettings.stringImportPaths.map!sanitizeSlashes.join(";") + info.buildSettings.stringImportPaths.map!(s => sanitizeSlashes(s)).join(";") ) ~ "\n" ); } @@ -136,12 +136,12 @@ } ///Transform a package name into a valid CMake target name. -string sanitize(string name) +private string sanitize(string name) { return name.replace(":", "_"); } -string sanitizeSlashes(string path) +private string sanitizeSlashes(string path) { version(Windows) return path.replace("\\", "/"); diff --git a/source/dub/generators/sublimetext.d b/source/dub/generators/sublimetext.d index 7b35199..d3970fa 100644 --- a/source/dub/generators/sublimetext.d +++ b/source/dub/generators/sublimetext.d @@ -36,7 +36,7 @@ logDebug("About to generate sublime project for %s.", m_project.rootPackage.name); auto root = Json([ - "folders": targets.byValue.map!targetFolderJson.array.Json, + "folders": targets.byValue.map!(f => targetFolderJson(f)).array.Json, "build_systems": buildSystems(settings.platform), "settings": [ "include_paths": buildSettings.importPaths.map!Json.array.Json ].Json, ]); @@ -53,7 +53,7 @@ } -Json targetFolderJson(in ProjectGenerator.TargetInfo target) +private Json targetFolderJson(in ProjectGenerator.TargetInfo target) { return [ "name": target.pack.name.Json, @@ -64,7 +64,7 @@ } -Json buildSystems(BuildPlatform buildPlatform, string workingDiretory = getcwd()) +private Json buildSystems(BuildPlatform buildPlatform, string workingDiretory = getcwd()) { enum BUILD_TYPES = [ //"plain", diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index f4e7abb..d9e324b 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -446,7 +446,7 @@ } // TODO: nice folders - struct SourceFile { + private struct SourceFile { Path structurePath; Path filePath; bool build; @@ -478,7 +478,7 @@ } } - auto sortedSources(SourceFile[] sources) { + private auto sortedSources(SourceFile[] sources) { return sort(sources); }