Addons parsing improvement (dont merge yet)

commandLine/src/addons/ofAddon.h

@@ -13,6 +13,7 @@
 #include <iostream>
 #include <filesystem>
 
+
 namespace fs = of::filesystem;
 using std::string;
 using std::vector;
@@ -121,9 +122,10 @@ class ofAddon {
 	ofAddon() = default;
 	ofAddon(const ofAddon& other);
 
-
-	bool fromFS(const fs::path & path, const string & platform);
-	void parseLibsPath(const fs::path & path, const fs::path & parentFolder);
+    static string cleanName(const string& name);
+
+    bool load(string addonName, const fs::path& projectDir, const string& targetPlatform);
+
 
 
 //	void fromXML(string installXmlName);
@@ -175,8 +177,17 @@ class ofAddon {
 	bool operator <(const ofAddon & addon) const{
 		return addon.name < name;
 	}
-
+    string addonMakeName;
+
+
+
 private:
+
+
+//    bool fromFS();
+    void parseLibsPath(const fs::path & path, const fs::path & parentFolder);
+
+    void addToFolder(const fs::path& path, const fs::path & parentFolder);
 
 	string currentParseState { "" };
 	string emptyString = { "" };
@@ -227,4 +238,10 @@ class ofAddon {
 			return fs::path("");
 		}
 	}
+
+#ifdef OFADDON_OUTPUT_JSON_DEBUG
+public:
+
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(ofAddon, additionalLibsFolder, libFiles, filesToFolders, srcFiles, csrcFiles, cppsrcFiles, headersrcFiles, objcsrcFiles, propsFiles, libs, dllsToCopy, includePaths, libsPaths, dependencies, cflags,    cppflags,  ldflags, pkgConfigLibs,      frameworks, xcframeworks, data, defines, definesCMAKE, name, addonPath, description, author, tags, url, pathToOF, pathToProject, isLocalAddon, addonMakeName, currentParseState, platform, excludeLibs, excludeSources, excludeIncludes, excludeFrameworks, excludeXCFrameworks)
+#endif
 };

commandLine/src/defines.h

@@ -1,5 +1,9 @@
 #define OFPROJECTGENERATOR_MAJOR_VERSION "0"
-#define OFPROJECTGENERATOR_MINOR_VERSION "78"
+#define OFPROJECTGENERATOR_MINOR_VERSION "79"
 #define OFPROJECTGENERATOR_PATCH_VERSION "0"
 
 #define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION)
+
+
+// Uncomment this line to generate a json file with all the data parsed and contained on each ofAddon instance. This is only for development debugging.
+//#define OFADDON_OUTPUT_JSON_DEBUG

commandLine/src/main.cpp

@@ -79,7 +79,7 @@ bool busingEnvVar;
 bool bVerbose;
 bool bAddonsPassedIn;
 bool bForce; // force even if things like ofRoot seem wrong of if update folder looks wonky
-pgMode mode; // what mode are we in?
+pgMode mode; // what mode are we in? //mode is never set to anything else. this is unnecesary.
 bool bRecursive; // do we recurse in update mode?
 bool bHelpRequested; // did we request help?
 bool bListTemplates; // did we request help?
@@ -685,11 +685,14 @@ int main(int argc, char ** argv) {
 //						ofLogNotice() << "project path is: [" << projectPath << "]";
 						auto project = getTargetProject(t);
 						project->create(projectPath, templateName);
-						project->parseAddons();
-
-						for (auto & addon : addons) {
-							project->addAddon(addon);
+						if(bAddonsPassedIn){
+							for (auto & addon : addons) {
+								project->addAddon(addon);
+							}							
+						}else{
+							project->parseAddons();
 						}
+
 						for (auto & s : srcPaths) {
 							project->addSrcRecursively(s);
 						}

commandLine/src/projects/CBLinuxProject.h

@@ -13,9 +13,9 @@ class CBLinuxProject: public CBWinProject {
 public:
 	CBLinuxProject(const std::string & target) : CBWinProject(target) {};
 
-	bool createProjectFile();
-	void addInclude(const fs::path & includeName){};
-	void addLibrary(const LibraryBinary & lib){};
+	virtual bool createProjectFile() override;
+	virtual void addInclude(const fs::path & includeName) override{};
+	virtual void addLibrary(const LibraryBinary & lib)override{};
 
 	static std::string LOG_NAME;
 };

commandLine/src/projects/CBWinProject.h

@@ -13,13 +13,20 @@ class CBWinProject: public baseProject {
 public:
 	CBWinProject(const std::string & target) : baseProject(target) {};
 
-	bool createProjectFile();
-	bool loadProjectFile();
-	bool saveProjectFile();
+	bool createProjectFile() override;
+	bool loadProjectFile() override;
+	bool saveProjectFile() override;
 
-	void addSrc(const fs::path & srcName, const fs::path & folder, SrcType type=DEFAULT);
-	void addInclude(const fs::path & includeName);
-	void addLibrary(const LibraryBinary & lib);
+	void addSrc(const fs::path & srcName, const fs::path & folder, SrcType type=DEFAULT) override;
+	void addInclude(const fs::path & includeName) override;
+	void addLibrary(const LibraryBinary & lib) override;
 
+    void addLDFLAG(const std::string& ldflag, LibType libType = RELEASE_LIB) override {}
+    void addCFLAG(const std::string& cflag, LibType libType = RELEASE_LIB) override {}
+    void addCPPFLAG(const std::string& cppflag, LibType libType = RELEASE_LIB) override {}
+    void addAfterRule(const std::string& script) override {}
+    void addDefine(const std::string& define, LibType libType = RELEASE_LIB) override {}
+
+
 	static std::string LOG_NAME;
 };

commandLine/src/projects/VSCodeProject.h

@@ -13,15 +13,22 @@ class VSCodeProject: public baseProject {
 public:
 	VSCodeProject(const std::string & target) : baseProject(target) {};
 
-	bool createProjectFile();
-	bool loadProjectFile();
-	bool saveProjectFile();
-
-	void addSrc(const fs::path & srcName, const fs::path & folder, SrcType type=DEFAULT);
-	void addInclude(const fs::path & includeName);
-	void addLibrary(const LibraryBinary & lib);
-
-	void addAddon(ofAddon & addon);
+	bool createProjectFile() override;
+	bool loadProjectFile() override;
+	bool saveProjectFile() override;
+
+	void addSrc(const fs::path & srcName, const fs::path & folder, SrcType type=DEFAULT) override;
+	void addInclude(const fs::path & includeName) override;
+	void addLibrary(const LibraryBinary & lib) override;
+
+    void addLDFLAG(const std::string& ldflag, LibType libType = RELEASE_LIB) override {}
+    void addCFLAG(const std::string& cflag, LibType libType = RELEASE_LIB) override {}
+    void addCPPFLAG(const std::string& cppflag, LibType libType = RELEASE_LIB) override {}
+    void addAfterRule(const std::string& script) override {}
+    void addDefine(const std::string& define, LibType libType = RELEASE_LIB) override {}
+
+
+	void addAddon(ofAddon & addon) ;
 
 	static std::string LOG_NAME;
 

commandLine/src/projects/android2024.h

@@ -6,11 +6,19 @@ class android2024Project : public baseProject {
 public:
 	android2024Project(const std::string & target);
 
-	bool createProjectFile();
-	void addInclude(const fs::path & includeName){}
-	void addLibrary(const LibraryBinary & lib){}
-	void addSrc(const fs::path & srcFile, const fs::path & folder, SrcType type=DEFAULT){};
-	bool loadProjectFile() { return false; };
-	bool saveProjectFile(){ return false; };
+    bool createProjectFile() override;
+    void addInclude(const fs::path & includeName) override {}
+    void addLibrary(const LibraryBinary & lib) override {}
+    void addSrc(const fs::path & srcFile, const fs::path & folder, SrcType type=DEFAULT) override {};
+    void addLDFLAG(const std::string& ldflag, LibType libType = RELEASE_LIB) override {}
+    void addCFLAG(const std::string& cflag, LibType libType = RELEASE_LIB) override {}
+    void addCPPFLAG(const std::string& cppflag, LibType libType = RELEASE_LIB) override {}
+    void addAfterRule(const std::string& script) override {}
+    void addDefine(const std::string& define, LibType libType = RELEASE_LIB) override {}
+
+
+
+	bool loadProjectFile() override { return false; };
+    bool saveProjectFile() override { return false; };
 	static std::string LOG_NAME;
 };

commandLine/src/projects/androidStudioProject.h

@@ -6,11 +6,18 @@ class AndroidStudioProject : public baseProject {
 public:
 	AndroidStudioProject(const std::string & target);
 
-	bool createProjectFile();
-	void addInclude(const fs::path & includeName){}
-	void addLibrary(const LibraryBinary & lib){}
-	void addSrc(const fs::path & srcFile, const fs::path & folder, SrcType type=DEFAULT){};
-	bool loadProjectFile() { return false; };
-	bool saveProjectFile(){ return false; };
+    bool createProjectFile() override;
+    void addInclude(const fs::path & includeName) override {}
+    void addLibrary(const LibraryBinary & lib) override {}
+    void addSrc(const fs::path & srcFile, const fs::path & folder, SrcType type=DEFAULT) override {};
+    void addLDFLAG(const std::string& ldflag, LibType libType = RELEASE_LIB) override {}
+    void addCFLAG(const std::string& cflag, LibType libType = RELEASE_LIB) override {}
+    void addCPPFLAG(const std::string& cppflag, LibType libType = RELEASE_LIB) override {}
+    void addAfterRule(const std::string& script) override {}
+    void addDefine(const std::string& define, LibType libType = RELEASE_LIB) override {}
+
+
+	bool loadProjectFile() override { return false; };
+	bool saveProjectFile() override { return false; };
 	static std::string LOG_NAME;
 };