diff --git a/source/app.d b/source/app.d index eae8689..e5d7c47 100644 --- a/source/app.d +++ b/source/app.d @@ -121,7 +121,7 @@ break; case "run": case "build": - dub.loadPackagefromCwd(); + dub.loadPackageFromCwd(); auto def_config = dub.getDefaultConfiguration(build_platform); if( !build_config.length ) build_config = def_config; @@ -229,6 +229,7 @@ if( settings.copyFiles.length ){ logInfo("Copying files..."); foreach( f; settings.copyFiles ){ + logInfo("Blah", f); auto src = Path(f); auto dst = (run_exe_file.empty ? dub.binaryPath : run_exe_file.parentPath) ~ Path(f).head; logDebug(" %s to %s", src.toNativeString(), dst.toNativeString()); @@ -247,7 +248,7 @@ break; case "upgrade": - dub.loadPackagefromCwd(); + dub.loadPackageFromCwd(); logInfo("Upgrading project in '%s'", dub.projectPath); logDebug("dub initialized"); dub.update(UpdateOptions.Reinstall | (annotate ? UpdateOptions.JustAnnotate : UpdateOptions.None)); @@ -290,7 +291,7 @@ logInfo("Usage: dub generate "); return -1; } - + dub.loadPackageFromCwd(); dub.generateProject(ide); logDebug("Project files generated."); break; diff --git a/source/dub/dub.d b/source/dub/dub.d index 8aadb38..441a230 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -521,7 +521,7 @@ @property Path binaryPath() const { return m_app.binaryPath; } - void loadPackagefromCwd() + void loadPackageFromCwd() { m_root = m_cwd; m_packageManager.projectPackagePath = m_root ~ ".dub/packages/"; @@ -594,9 +594,11 @@ /// Any existing project files will be overridden. void generateProject(string ide) { auto generator = createProjectGenerator(ide, m_app, m_packageManager); - if(null is generator) + if(generator is null ) { + logError("Unsupported IDE, there is no generator available for '"~ide~"'"); throw new Exception("Unsupported IDE, there is no generator available for '"~ide~"'"); - + } + // Q: update before generating? generator.generateProject(); diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d index 76e740b..94a0547 100644 --- a/source/dub/generators/generator.d +++ b/source/dub/generators/generator.d @@ -10,6 +10,8 @@ import dub.dub; import dub.packagemanager; import dub.generators.visuald; +import vibe.core.log; +import std.exception; /// A project generator generates projects :-/ interface ProjectGenerator @@ -18,9 +20,13 @@ } /// Creates a project generator. -ProjectGenerator createProjectGenerator(string projectType, Application app, PackageManager store) { +ProjectGenerator createProjectGenerator(string projectType, Application app, PackageManager mgr) { + enforce(app !is null, "app==null, Need an application to work on!"); + enforce(mgr !is null, "mgr==null, Need a package manager to work on!"); switch(projectType) { default: return null; - case "VisualD": return new VisualDGenerator(app, store); + case "VisualD": + logTrace("Generating VisualD generator."); + return new VisualDGenerator(app, mgr); } } \ No newline at end of file diff --git a/source/dub/generators/ideas.txt b/source/dub/generators/ideas.txt deleted file mode 100644 index 80bc414..0000000 --- a/source/dub/generators/ideas.txt +++ /dev/null @@ -1,12 +0,0 @@ - - - -Startup project - -packages -> projects - -libraries - -source files - -packages, which are installed globally \ No newline at end of file diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index 94a0f9a..3374bb6 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -38,8 +38,8 @@ m_pkgMgr = mgr; } - override void generateProject() { - logDebug("About to generate projects for %s, with %s direct dependencies.", m_app.mainPackage().name, to!string(m_app.mainPackage().dependencies().length)); + void generateProject() { + logTrace("About to generate projects for %s, with %s direct dependencies.", m_app.mainPackage().name, to!string(m_app.mainPackage().dependencies().length)); generateProjects(m_app.mainPackage()); generateSolution(); }