VSCode fix for Msys2 (#499)

Author: dimitre

commandLine/src/projects/VSCodeProject.cpp

@@ -73,42 +73,48 @@ fileJson cppProperties;
 std::string VSCodeProject::LOG_NAME = "VSCodeProject";
 
 bool VSCodeProject::createProjectFile(){
-	workspace.fileName = projectDir / (projectName + ".code-workspace");
-	cppProperties.fileName = projectDir / ".vscode/c_cpp_properties.json";
 
-	// Copy all files from template, recursively
+#if defined(__MINGW32__) || defined(__MINGW64__)
 	try {
-		//dangerous as its copying src/ and bin/ into existing project files 
-		//fs::copy(templatePath, projectDir, fs::copy_options::overwrite_existing | fs::copy_options::recursive);
-
-		//tmp fix for now - explicit copy of files needed 
-		fs::copy(templatePath / ".vscode", projectDir / ".vscode", fs::copy_options::overwrite_existing | fs::copy_options::recursive);
-		fs::copy(templatePath / "Makefile", projectDir, fs::copy_options::skip_existing | fs::copy_options::recursive);
-		fs::copy(templatePath / "config.make", projectDir, fs::copy_options::skip_existing | fs::copy_options::recursive);
-		fs::copy(templatePath / "emptyExample.code-workspace", projectDir, fs::copy_options::overwrite_existing | fs::copy_options::recursive);
-		fs::copy(templatePath / "template.config", projectDir, fs::copy_options::overwrite_existing | fs::copy_options::recursive);
-		
+		fs::remove_all(projectDir / ".vscode");
 	} catch(fs::filesystem_error& e) {
-		ofLogError(LOG_NAME) << "error copying folder " << templatePath << " : " << projectDir << " : " << e.what();
+		ofLogError(LOG_NAME) << "error removing folder .vscode " << e.what();
 		return false;
 	}
+#endif
+	
+	// Copy all files from template, recursively
+	//dangerous as its copying src/ and bin/ into existing project files
+	//fs::copy(templatePath, projectDir, fs::copy_options::overwrite_existing | fs::copy_options::recursive);
 
-
-	auto templateConfig { projectDir / "template.config" };
-	try {
-		fs::remove( templateConfig );
-	} catch(fs::filesystem_error& e) {
-		ofLogError(LOG_NAME) << "error removing file " << " : " << templateConfig << " : " << e.what();
-	}
-
-
-	// Rename Project Workspace
 	try {
-		fs::rename(projectDir / "emptyExample.code-workspace", workspace.fileName);
+		fs::copy(templatePath / ".vscode", projectDir / ".vscode", fs::copy_options::overwrite_existing | fs::copy_options::recursive);
 	} catch(fs::filesystem_error& e) {
-		ofLogError(LOG_NAME) << "error renaming project " << " : " << workspace.fileName << " : " << e.what();
+		ofLogError(LOG_NAME) << "error copying folder " << templatePath << " : " << projectDir << " : " << e.what();
 		return false;
 	}
+	
+	
+	workspace.fileName = projectDir / (projectName + ".code-workspace");
+	cppProperties.fileName = projectDir / ".vscode/c_cpp_properties.json";
+	
+	copyTemplateFiles.push_back({
+		templatePath / "Makefile",
+		projectDir / "Makefile"
+	});
+	copyTemplateFiles.push_back({
+		templatePath / "config.make",
+		projectDir / "config.make"
+	});
+	copyTemplateFiles.push_back({
+		templatePath / "emptyExample.code-workspace",
+		projectDir / workspace.fileName
+	});
+
+	for (auto & c : copyTemplateFiles) {
+		c.run();
+	}
+	
 	return true;
 }
 
@@ -133,18 +139,7 @@ void VSCodeProject::addAddon(ofAddon & addon) {
 
 
 bool VSCodeProject::saveProjectFile(){
-//	alert("VSCodeProject::saveProjectFile() ");
-//	alert("--- VSCodeProject::extSrcPaths() ");
-//	for (auto & e : extSrcPaths) {
-//		cout << e << endl;
-//		workspace.addPath(e);
-//
-//	}
-//	alert("--- VSCodeProject::extSrcPaths() ");
-
-
 	workspace.data["openFrameworksProjectGeneratorVersion"] = getPGVersion();
-
 	workspace.save();
 	cppProperties.save();
 	return true;

commandLine/src/projects/baseProject.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#define PG_VERSION "37"
+#define PG_VERSION "38"
 
 #include "ofAddon.h"
 #include "ofFileUtils.h"

commandLine/src/projects/visualStudioProject.cpp

@@ -46,7 +46,6 @@ bool visualStudioProject::createProjectFile(){
 		templatePath / "emptyExample.vcxproj.user",
 		projectDir / (projectName + ".vcxproj.user"),
 		{{ "emptyExample", projectName }}
-
 	});
 
 	// filters