changes android2024

Author: dimitre

commandLine/src/projects/CBLinuxProject.cpp

@@ -13,11 +13,6 @@
 std::string CBLinuxProject::LOG_NAME { "CBLinuxProject" };
 
 bool CBLinuxProject::createProjectFile(){
-	// FIXME: This only exists here, not other projects. I think it should be removed
-	if (!fs::exists(projectDir)) {
-		fs::create_directory(projectDir);
-	}
-
 	vector < std::pair <fs::path, fs::path > > fromTo {
 		{ templatePath / ("emptyExample_" + target + ".cbp"),   		projectDir / (projectName + ".cbp") },
 		{ templatePath / ("emptyExample_" + target + ".workspace"), 	projectDir / (projectName + ".workspace") },

commandLine/src/projects/android2024.cpp

@@ -11,45 +11,60 @@ android2024Project::android2024Project(const std::string & target) : baseProject
 
 bool android2024Project::createProjectFile(){
 	// Make sure project name doesn't include "-"
-	std::string packageName { projectName };
-	ofStringReplace(packageName, "-", "");
+//	std::string packageName { projectName };
+//	ofStringReplace(packageName, "-", "");
 
-	if (!fs::exists(projectDir)) {
-		fs::create_directory(projectDir);
+
+	for (auto & f : vector<fs::path> {
+       	"build.gradle",
+        "gradle",
+        "gradle.properties",
+        "local.properties",
+        "ofApp/gradle.properties",
+        "ofApp/proguard-rules.pro",
+        "proguard.cfg",
+        "settings.gradle",
+	}) {
+        copyTemplateFiles.push_back({
+			templatePath / f,
+			projectDir / f
+		});
 	}
 
-//	std::vector <std::string> fileNames {
-//		"build.gradle",
-//		"settings.gradle",
-//		"AndroidManifest.xml",
-//		".gitignore",
-//		"gradlew",
-//		"gradlew.bat",
-//	};
+	copyTemplateFiles.push_back({
+		templatePath / "ofApp" / "build.gradle",
+		projectDir /  "ofApp" / "build.gradle",
+		{ { "emptyExample", projectName } }
+	});
 
+	// copy and replace where needed
+	for (auto & c : copyTemplateFiles) {
+		c.run();
+	}
+
+	// TODO: try
+	fs::create_directory(projectDir /  "ofApp");
+	// copy recursively and try not overwrite code.
 	try {
-		fs::copy(templatePath, projectDir, fs::copy_options::overwrite_existing | fs::copy_options::recursive);
-	} catch (std::exception& e) {
-		std::cout << e.what();
-		std::cout << "unable to copy android2024 template recursively" << std::endl;
+		fs::copy(
+				 templatePath / "ofApp" / "src",
+				 projectDir / "ofApp" / "src",
+				 fs::copy_options::recursive | fs::copy_options::skip_existing
+		);
+	} catch(fs::filesystem_error & e) {
+		ofLogError() << "copy failed " << e.what() << endl;
 	}
 
-//	for (auto & f : fileNames) {
-//		fs::path to { projectDir / f };
-//		if (!fs::exists(to)) {
-//			fs::path from { templatePath / f };
-//			try {
-//				fs::copy(from, to);
-//			} catch(fs::filesystem_error & e) {
-//				if (f == "AndroidManifest.xml") {
-//					findandreplaceInTexfile(to, "TEMPLATE_PACKAGE_NAME", packageName);
-//				} else {
-//					ofLogError(LOG_NAME) << "error copying template from " << from << " to " << to << e.what();
-//				}
-//			}
-//		}
+	
+	// Leftovers from other
+
+//	try {
+//		fs::copy(templatePath, projectDir, fs::copy_options::overwrite_existing | fs::copy_options::recursive);
+//	} catch (std::exception& e) {
+//		std::cout << e.what();
+//		std::cout << "unable to copy android2024 template recursively" << std::endl;
 //	}
-//
+
 //	for (auto & p : { string("res") , string("srcJava"), string("gradle") }) {
 //		fs::copy (templatePath / p, projectDir / p, fs::copy_options::recursive);
 //	}

commandLine/src/projects/androidStudioProject.cpp

@@ -14,9 +14,6 @@ bool AndroidStudioProject::createProjectFile(){
 	std::string packageName { projectName };
 	ofStringReplace(packageName, "-", "");
 
-	if (!fs::exists(projectDir)) {
-		fs::create_directory(projectDir);
-	}
 
 	std::vector <std::string> fileNames {
 		"build.gradle",

commandLine/src/projects/baseProject.cpp

@@ -143,24 +143,25 @@ bool baseProject::create(const fs::path & path, string templateName){
 	projectDir = path;
 	auto projectPath = fs::canonical(fs::current_path() / path);
 	projectName = projectPath.filename().string();
-
-//	cout << "templatePath " << templatePath << endl;
-//	cout << "projectDir " << projectDir << endl;
-//	cout << "projectPath " << projectPath << endl;
-//	cout << "projectName = " << projectName << endl;
-//
+	
+	
+	// we had this in some projects. if we decide to keep this is the place
+	//	if (!fs::exists(projectDir)) {
+	//		fs::create_directory(projectDir);
+	//	}
 	bool bDoesDirExist = false;
 
 	fs::path project { projectDir / "src" };
 
 	if (fs::exists(project) && fs::is_directory(project)) {
 		bDoesDirExist = true;
 	} else {
-		for (auto & p : { string("src") , string("bin") }) {
+		for (auto & p : { fs::path("src") , fs::path("bin") }) {
 			fs::copy (templatePath / p, projectDir / p, fs::copy_options::recursive);
 		}
 	}
 
+	
 	bool ret = createProjectFile();
 	if(!ret) return false;
 

commandLine/src/projects/qtcreatorproject.cpp

@@ -11,9 +11,6 @@ QtCreatorProject::QtCreatorProject(const std::string & target) : baseProject(tar
 
 bool QtCreatorProject::createProjectFile(){
 //	alert("QtCreatorProject::createProjectFile " + projectDir.string());
-	if (!fs::exists(projectDir)) {
-		fs::create_directory(projectDir);
-	}
 
 	fs::path qbsFile { fs::path { projectName + ".qbs" } };
 	vector < std::pair <fs::path, fs::path > > fromTo {