v83 - Fix local Frameworks, "src" files as relative paths, std::set for unique folders (#590)

Author: dimitre

commandLine/src/defines.h

@@ -1,5 +1,5 @@
 #define OFPROJECTGENERATOR_MAJOR_VERSION "0"
-#define OFPROJECTGENERATOR_MINOR_VERSION "82"
+#define OFPROJECTGENERATOR_MINOR_VERSION "83"
 #define OFPROJECTGENERATOR_PATCH_VERSION "0"
 
 #define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION)

commandLine/src/main.cpp

@@ -255,6 +255,9 @@ void updateProject(const fs::path & path, const string & target, bool bConsiderP
 			ofLogNotice() << "parsing addons.make";
 			project->parseAddons();
 		}
+		for (auto & f : frameworks) {
+			project->addFramework(f, "Frameworks", true);
+		}
 
 		for (auto & srcPath : srcPaths) {
 			project->addSrcRecursively(srcPath);
@@ -551,7 +554,7 @@ int main(int argc, char ** argv) {
 		bAddonsPassedIn = true; // could be empty
 		if (options[FRAMEWORKS].arg != NULL) {
 			frameworks = ofSplitString(options[FRAMEWORKS].arg, ",", true, true);
-			cout << "frameworks " << options[FRAMEWORKS].arg << endl;
+//			cout << "frameworks " << options[FRAMEWORKS].arg << endl;
 		}
 	}
 
@@ -702,12 +705,12 @@ int main(int argc, char ** argv) {
 							for (auto & addon : addons) {
 								project->addAddon(addon);
 							}
-							for (auto & f : frameworks) {
-								project->addFramework(f, "", true);
-							}
 						}else{
 							project->parseAddons();
 						}
+						for (auto & f : frameworks) {
+							project->addFramework(f, "Frameworks", true);
+						}
 
 						for (auto & s : srcPaths) {
 							project->addSrcRecursively(s);

commandLine/src/projects/baseProject.cpp

@@ -154,12 +154,13 @@ bool baseProject::create(const fs::path & _path, string templateName){
 	//	if (!fs::exists(projectDir)) {
 	//		fs::create_directory(projectDir);
 	//	}
-	bool bDoesDirExist = false;
+	bool bDoesSrcDirExist = false;
 
-	fs::path project { projectDir / "src" };
+	// it can be only "src"
+	fs::path projectSrc { projectDir / "src" };
 
-	if (fs::exists(project) && fs::is_directory(project)) {
-		bDoesDirExist = true;
+	if (fs::exists(projectSrc) && fs::is_directory(projectSrc)) {
+		bDoesSrcDirExist = true;
 	} else {
 		for (auto & p : { fs::path("src"), fs::path("bin") }) {
 			try {
@@ -214,40 +215,37 @@ bool baseProject::create(const fs::path & _path, string templateName){
 
 	parseConfigMake();
 
-	if (bDoesDirExist){
-		vector <  fs::path > fileNames;
-		getFilesRecursively(projectDir / "src", fileNames);
+	if (bDoesSrcDirExist){
+		vector <fs::path> fileNames;
+
+		// CWD is already on projectDir. so with this we get relative paths
+		getFilesRecursively("src", fileNames);
 
 		std::sort(fileNames.begin(), fileNames.end(), [](const fs::path & a, const fs::path & b) {
 			return a.string() < b.string();
 		});
-		for (auto & f : fileNames) {
-			fs::path rel { fs::relative(f, projectDir) };
-			fs::path folder { rel.parent_path() };
-
-			string fileName = rel.string();
-
-			if (fileName != "src/ofApp.cpp" &&
-				fileName != "src/ofApp.h" &&
-				fileName != "src/main.cpp" &&
-				fileName != "src/ofApp.mm" &&
-				fileName != "src/main.mm") {
-				addSrc(rel.string(), folder.string());
+		for (const auto & f : fileNames) {
+			if (f != "src/ofApp.cpp" &&
+				f != "src/ofApp.h" &&
+				f != "src/main.cpp" &&
+				f != "src/ofApp.mm" &&
+				f != "src/main.mm") {
+				addSrc(f, f.parent_path());
 			} else {
 			}
 		}
-		// FIXME: Port to std::list, so no comparison is needed.
-		vector < fs::path > paths;
+
+		std::set<fs::path> uniquePaths;
 		for (auto & f : fileNames) {
-			fs::path rel { fs::relative(fs::path(f).parent_path(), projectDir) };
-			if (std::find(paths.begin(), paths.end(), rel) == paths.end()) {
-				paths.emplace_back(rel);
-				if (containsSourceFiles(rel)) {
-					ofLogVerbose() << "[prjFiles-addIncludeDir] contains src - Adding dir: [" << rel.string() << "]";
-					addInclude(rel);
-				} else {
-					ofLogVerbose() << "[prjFiles-addIncludeDir] no src - not adding: [" << rel.string() << "]";
-				}
+			uniquePaths.insert(f.parent_path());
+		}
+		
+		for (auto & p : uniquePaths) {
+			if (containsSourceFiles(p)) {
+				ofLogVerbose() << "[prjFiles-addIncludeDir] contains src - Adding dir: " << p;
+				addInclude(p);
+			} else {
+				ofLogVerbose() << "[prjFiles-addIncludeDir] no src - not adding: " << p;
 			}
 		}
 	}