diff --git a/commandLine/src/defines.h b/commandLine/src/defines.h index 28068156..d4fbcebd 100644 --- a/commandLine/src/defines.h +++ b/commandLine/src/defines.h @@ -1,5 +1,5 @@ #define OFPROJECTGENERATOR_MAJOR_VERSION "0" -#define OFPROJECTGENERATOR_MINOR_VERSION "88" +#define OFPROJECTGENERATOR_MINOR_VERSION "88b" #define OFPROJECTGENERATOR_PATCH_VERSION "0" #define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION) diff --git a/commandLine/src/main.cpp b/commandLine/src/main.cpp index 2c8841c4..ee971be2 100644 --- a/commandLine/src/main.cpp +++ b/commandLine/src/main.cpp @@ -688,6 +688,13 @@ int main(int argc, char ** argv) { for (auto & t : targets) { + if(std::find(platformsOptions.begin(), platformsOptions.end(), t) != platformsOptions.end()) { +// alert ("target platform found " + t, 33); + } else { + alert ("target platform not found " + t, 35); + continue; + } + consoleSpace(); ofLogNotice() << "-----------------------------------------------"; ofLogNotice() << "target platform is: [" << t << "]"; diff --git a/commandLine/src/projects/baseProject.cpp b/commandLine/src/projects/baseProject.cpp index 8f3fe447..53d34dbc 100644 --- a/commandLine/src/projects/baseProject.cpp +++ b/commandLine/src/projects/baseProject.cpp @@ -115,7 +115,7 @@ vector baseProject::listAvailableTemplates(string target) } bool baseProject::create(const fs::path & _path, string templateName){ -// alert("baseProject::create " + path.string() + " : " + templateName, 35); +// alert("baseProject::create " + _path.string() + " : " + templateName, 35); auto path = _path; // just because it is const fs::current_path(path); @@ -142,6 +142,7 @@ bool baseProject::create(const fs::path & _path, string templateName){ // templatePath = normalizePath(getPlatformTemplateDir()); templatePath = getPlatformTemplateDir(); + ofLogNotice() << "templatePath: " << templatePath; auto projectPath = fs::canonical(fs::current_path() / path); @@ -149,7 +150,7 @@ bool baseProject::create(const fs::path & _path, string templateName){ projectDir = ""; projectPath = normalizePath(projectPath); ofLogNotice() << "projectPath: " << projectPath; - + projectName = projectPath.filename().string(); // we had this in some projects. if we decide to keep this is the place @@ -161,6 +162,7 @@ bool baseProject::create(const fs::path & _path, string templateName){ // it can be only "src" fs::path projectSrc { projectDir / "src" }; + if (fs::exists(projectSrc) && fs::is_directory(projectSrc)) { bDoesSrcDirExist = true; } else { diff --git a/commandLine/src/utils/Utils.h b/commandLine/src/utils/Utils.h index d9e6a235..4874acfc 100644 --- a/commandLine/src/utils/Utils.h +++ b/commandLine/src/utils/Utils.h @@ -53,6 +53,9 @@ static std::vector < std::string > platformsOptions { "msys2", "osx", "vs", + + "vscode", + "zed", }; string generateUUID(const string & input);