iOS targets fix (#605)

* iOS targets fix

* now PG can add .storyboards from src folders adding correctly to copy bundle resources

(cherry picked from commit 9843883)

---------

Co-authored-by: Dimitre <[email protected]>

Author: danoli3

commandLine/src/addons/ofAddon.cpp

@@ -773,6 +773,14 @@ void ofAddon::addToFolder(const fs::path& path, const fs::path & parentFolder){
 	filesToFolders[path] = folder;
 }
 
+
+void ofAddon::prepareForWrite() {
+	removeDuplicates(libs);
+	removeDuplicates(libFiles);
+	removeDuplicates(frameworks);
+	removeDuplicates(xcframeworks);
+}
+
 void ofAddon::parseLibsPath(const fs::path & libsPath, const fs::path & parentFolder) {
 	if (!fs::exists(libsPath)) {
 //		alert("file not found " + libsPath.string(), 35);
@@ -781,7 +789,7 @@ void ofAddon::parseLibsPath(const fs::path & libsPath, const fs::path & parentFo
 //	alert ("parseLibsPath " + libsPath.string() + ", parent=" + parentFolder.string(), 35);
 
 
-	if (platform == "osx"  || platform == "macos"){
+	if (platform == "osx"  || platform == "macos" || platform == "ios" || platform == "tvos"){
 		// Horrible hack to make it work with the bad idea of renaming osx to macos
 		getLibsRecursively(libsPath, libFiles, libs, "macos");
 		getLibsRecursively(libsPath, libFiles, libs, "osx");
@@ -802,15 +810,6 @@ void ofAddon::parseLibsPath(const fs::path & libsPath, const fs::path & parentFo
 		getLibsRecursively(libsPath, libFiles, libs, platform);
 	}
 
-	if (//platform == "osx"  ||
-		platform == "ios"  ||
-		platform == "tvos"){//} ||
-		//platform == "macos"){
-
-		getFrameworksRecursively(libsPath, platform);
-//		getXCFrameworksRecursively(libsPath, platform);
-	}
-
 	if (platform == "vs" || platform == "msys2"
 		   || platform == "vscode"
 		   || platform == "linux"

commandLine/src/addons/ofAddon.h

@@ -25,24 +25,32 @@ const vector<string> parseStates {
 	"common",
 	"linux",
 	"linux64",
+	"linux/64",
 	"msys2",
 	"vs",
 	"linuxarmv6l",
 	"linuxarmv7l",
 	"linuxaarch64",
+	"linux/armv6l",
+	"linux/armv7l",
+	"linux/aarch64",
+	"linux/arm64",
 	"android/armeabi",
 	"android/armeabi-v7a",
 	"android/arm64-v8a",
 	"android/x86",
 	"android/x86_64",
 	"emscripten",
+	"emscripten/32",
+	"emscripten/64",
 	"android",
 	"ios",
 	"osx",
 	"tvos",
 	"macos",
 	"watchos",
 	"visionos",
+	"catos",
 };
 
 
@@ -136,6 +144,7 @@ class ofAddon {
 
 	bool load(string addonName, const fs::path& projectDir, const string& targetPlatform);
 
+	void prepareForWrite();
 
 	void clear();
 

commandLine/src/projects/baseProject.cpp

@@ -531,6 +531,8 @@ void baseProject::addAddon(ofAddon & addon){
 			return;
 		}
 	}
+	
+	addon.prepareForWrite();
 
 	/*
 
@@ -561,6 +563,7 @@ void baseProject::addAddon(ofAddon & addon){
 	}
 //	alert("---> dependencies");
 	addons.emplace_back(addon);
+	
 
 	//ofLogVerbose("baseProject") << "libs in addAddon " << addon.libs.size();
 
@@ -583,7 +586,6 @@ void baseProject::addAddon(ofAddon & addon){
 
 	addAddonDefines(addon);
 	addAddonFrameworks(addon);
-//    addAddonXCFrameworks(addon);
     copyAddonData(addon);
     addAddonProps(addon);
 }

commandLine/src/projects/xcodeProject.cpp

@@ -648,9 +648,10 @@ void xcodeProject::addAddonFrameworks(const ofAddon& addon){
 	ofLogVerbose("xcodeProject::addAddonFrameworks") << addon.name;
 
 	std::vector <std::string> allFrameworks;
+	
 	allFrameworks.reserve( addon.frameworks.size() + addon.xcframeworks.size() );
 	allFrameworks.insert( allFrameworks.end(), addon.frameworks.begin(), addon.frameworks.end() );
-	allFrameworks.insert( allFrameworks.end(), addon.xcframeworks.begin(), addon.xcframeworks.end() );
+//	allFrameworks.insert( allFrameworks.end(), addon.xcframeworks.begin(), addon.xcframeworks.end() );
 
 	for (auto & f : allFrameworks) {
 //    for (auto & f : addon.frameworks) {

commandLine/src/utils/Utils.cpp

@@ -638,28 +638,3 @@ bool containsSourceFiles(const fs::path& dir) {
 	ofLogVerbose() << "No source files found in directory: [" << dir.string() << "]";
 	return false;
 }
-
-
-// fs::path ofRelativeToOFPATH(const fs::path& path) {
-// 	try {
-// 		fs::path normalized_path = path;
-// 		std::string path_str = normalized_path.string();
-// #ifdef TARGET_WIN32
-// 		std::regex relative_pattern(R"((\.\.\\\.\.\\\.\.\\)|(\.\.\\\.\.\\\.\.))");
-// #else
-// 		std::regex relative_pattern(R"((\.\.\/\.\.\/\.\.\/))");
-// #endif
-// 		path_str = std::regex_replace(path_str, relative_pattern, "$(OF_PATH)/");
-// #ifdef TARGET_WIN32
-// 		fixSlashOrderPath(normalized_path);
-// #endif
-// 		return normalized_path;
-// 	} catch (const std::exception& ex) {
-// 		std::cout << "Canonical path for [" << path << "] threw exception:\n"
-// 				  << ex.what() << '\n';
-// 		return fs::path("");
-// 	}
-// }
-
-
-

commandLine/src/utils/Utils.h

@@ -31,6 +31,7 @@ static std::map <ofTargetPlatform, std::string> platformsToString {
 	{ OF_TARGET_ANDROID, "android" },
 //	{ OF_TARGET_EMSCRIPTEN, "" },
 	{ OF_TARGET_IOS, "ios" },
+	{ OF_TARGET_IOS, "tvos" },
 	{ OF_TARGET_MACOS, "macos" },
 	{ OF_TARGET_LINUX, "linux" },
 	{ OF_TARGET_LINUX64, "linux64" },
@@ -150,8 +151,6 @@ std::string normalizePath(const std::string& path);
 fs::path normalizePath(const fs::path& path);
 
 bool containsSourceFiles(const fs::path& dir);
-// fs::path ofRelativeToOFPATH(const fs::path& path);
-
 /*
  Idea: create an object to hold the origin and destination files, with renames where needed
  and string substitution, so we can avoid opening and writing multiple times the same file, less ssd wear.