PG fixes (#347)

Author: dimitre

commandLine/src/main.cpp

@@ -200,7 +200,7 @@ bool containsFolder(fs::path path, std::string folderName) {
 
 bool isGoodProjectPath(fs::path path) {
 	if (!fs::is_directory(path)) return false;
-	return containsFolder(path, "src");
+	return fs::exists(path / "src");
 }
 
 bool isGoodOFPath(fs::path path) {
@@ -225,12 +225,6 @@ void updateProject(const fs::path & path, ofTargetPlatform target, bool bConside
 	if (!bDryRun) project->create(path, templateName);
 
 	if(bConsiderParameterAddons && bAddonsPassedIn){
-
-		//cout << "---->> addons.size " << addons.size() << endl;
-		for (auto & a : addons) {
-			cout << a << endl;
-		}
-
 		for(auto & addon: addons){
 			project->addAddon(addon);
 		}
@@ -258,6 +252,7 @@ void recursiveUpdate(const fs::path & path, ofTargetPlatform target) {
 		auto project = getTargetProject(target);
 		updateProject(path, target, false);
 		return;
+	} else {
 	}
 
 	// finally, recursively look at this
@@ -495,7 +490,7 @@ int main(int argc, char** argv){
 		mode = PG_MODE_CREATE;
 	}
 	//XAXA TEMP
-	mode = PG_MODE_CREATE;
+//	mode = PG_MODE_CREATE;
 
 
 	if (bVerbose){

commandLine/src/projects/baseProject.cpp

@@ -493,8 +493,6 @@ void baseProject::addAddon(ofAddon & addon){
 }
 
 void baseProject::parseAddons(){
-	alert("--- parseAddons");
-	
 	ofFile addonsMake(ofFilePath::join(projectDir,"addons.make"));
 	ofBuffer addonsMakeMem;
 	addonsMake >> addonsMakeMem;
@@ -504,8 +502,6 @@ void baseProject::parseAddons(){
 		if(addon == "") continue;
 		addAddon(ofSplitString(addon, "#")[0]);
 	}
-	alert("--- end parseAddons");
-
 }
 
 void baseProject::parseConfigMake(){
@@ -549,7 +545,7 @@ void baseProject::recursiveCopyContents(const fs::path & srcDir, const fs::path
 		auto f = entry.path();
 		auto destFile = destDir / f.filename();
 		if (fs::is_directory(f)) {
-			recursiveTemplateCopy(f, destFile);
+			recursiveCopyContents(f, destFile);
 		} else {
 			if (!fs::exists(destFile)) {
 				fs::copy_file(f, destFile);