v103 - android project fixes (#634)

Author: danoli3

commandLine/src/defines.h

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

commandLine/src/projects/android.cpp

@@ -10,30 +10,40 @@ androidProject::androidProject(const std::string & target) : baseProject(target)
 
 bool androidProject::createProjectFile(){
 
+	bOverwrite = false;
 	for (auto & f : vector<fs::path> {
 		"build.gradle",
 		"gradle",
-		"gradle.properties",
-		"local.properties",
 		"ofApp/gradle.properties",
 		"ofApp/proguard-rules.pro",
 		"ofApp/src/AndroidManifest.xml",
 		"ofApp/src/ic_launcher-playstore.png",
-		"ofApp/src/CMakeLists.txt",
-		"ofApp/src/main/main.txt",
-		"ofApp/build.gradle",
-		"src/ofApp.h",
-		"src/ofApp.cpp",
-		"src/main.cpp",
 		"proguard.cfg",
 		"settings.gradle",
 		"template.config",
+		"src/main.cpp",
 	}) {
 		copyTemplateFiles.push_back({
 			templatePath / f,
 			projectDir / f
 		});
 	}
+	for (auto & f : vector<fs::path> {
+		"src/ofApp.h",
+		"src/ofApp.cpp",
+		"ofApp/src/CMakeLists.txt",
+		"ofApp/src/java/cc/openframeworks/android/OFActivity.java",
+		"local.properties",
+		"gradle.properties",
+		"ofApp/build.gradle",
+	}) {
+		if (!fs::exists(projectDir / f)) {
+			copyTemplateFiles.push_back({
+				templatePath / f,
+				projectDir / f
+			});
+		}
+	}
 	copyTemplateFiles.push_back({
 		templatePath / "ofApp" / "build.gradle",
 		projectDir / "ofApp" / "build.gradle",
@@ -61,6 +71,8 @@ bool androidProject::createProjectFile(){
 		ofLogError(LOG_NAME) << "Copy failed: " << e.what();
 		return false;
 	}
+	
+	
 
 	try {
 		fs::copy(templatePath / "ofApp/src/res", projectDir / "ofApp/src/res", fs::copy_options::recursive);

commandLine/src/projects/xcodeProject.cpp

@@ -155,21 +155,6 @@ bool xcodeProject::createProjectFile() {
 		if (fs::exists(templateDataDir) && fs::is_directory(templateDataDir)) {
 			baseProject::recursiveCopyContents(templateDataDir, projectDataDir);
 		}
-		if (fs::exists(templateBinDir) && fs::is_directory(templateBinDir)) {
-#ifdef TARGET_OS_MAC
-			try {
-				//  extended attributes on macOS
-				std::string command = "xattr -w com.apple.xcode.CreatedByBuildSystem true " + templateBinDir.string();
-				if (std::system(command.c_str()) != 0) {
-					std::cerr << "Failed to set extended attributes on " << templateBinDir.string() << std::endl;
-				} else {
-					ofLogVerbose("xcodeProject") << "xattr set correctly for /bin" << endl;
-				}
-			} catch (const std::exception & e) {
-				std::cout << "xcodeProject::createProjectFile() error " << e.what() << std::endl;
-			}
-#endif
-		}
 	}
 	return true;
 }