removing ConfigParseState enum (#442)

#changelog #simplification

Author: dimitre

commandLine/src/addons/ofAddon.cpp

@@ -29,117 +29,36 @@ ofAddon::ofAddon(){
 	isLocalAddon = false;
 	pathToProject = ".";
 	pathToOF = "../../../";
-	currentParseState = Unknown;
 }
 
-ofAddon::ConfigParseState ofAddon::stateFromString(string name){
-	if(name=="meta") return Meta;
-	if(name=="common") return Common;
-	if(name=="linux64") return Linux64;
-	if(name=="linux") return Linux;
-	if(name=="msys2") return MinGW;
-	if(name=="vs") return VS;
-	if(name=="linuxarmv6l") return LinuxARMv6;
-	if(name=="linuxarmv7l") return LinuxARMv7;
-	if(name=="linuxaarch64") return LinuxAArch64;
-	if(name=="android/armeabi") return AndroidARMv5;
-	if(name=="android/armeabi-v7a") return AndroidARMv7;
-	if(name=="android/x86") return Androidx86;
-	if(name=="emscripten") return Emscripten;
-	if(name=="ios") return iOS;
-	if(name=="osx") return OSX;
-	return Unknown;
-}
-
-string ofAddon::stateName(ofAddon::ConfigParseState state){
-	switch(state){
-	case Meta:
-		return "meta";
-	case Common:
-		return "common";
-	case Linux:
-		return "linux";
-	case Linux64:
-		return "linux64";
-	case MinGW:
-		return "msys2";
-	case VS:
-		return "vs";
-	case LinuxARMv6:
-		return "linuxarmv6";
-	case LinuxARMv7:
-		return "linuxarmv7";
-	case LinuxAArch64:
-		return "linuxaarch64";
-	case AndroidARMv5:
-		return "android/armeabi";
-	case AndroidARMv7:
-		return "android/armeabi-v7a";
-	case Androidx86:
-		return "android/x86";
-	case Emscripten:
-		return "emscripten";
-	case iOS:
-		return "ios";
-	case OSX:
-		return "osx";
-	case Unknown:
-	default:
-		return "unknown";
-	}
-}
-
-bool ofAddon::checkCorrectPlatform(ConfigParseState state){
-	switch(state){
-	case Meta:
-		return true;
-	case Common:
+bool ofAddon::checkCorrectPlatform(const string & state) {
+	if (state == "meta" || state == "common") {
 		return true;
-	case Linux:
-	case Linux64:
-	case MinGW:
-	case VS:
-	case LinuxARMv6:
-	case LinuxARMv7:
-	case AndroidARMv5:
-	case AndroidARMv7:
-	case Androidx86:
-	case Emscripten:
-	case iOS:
-	case OSX:
-		return platform==stateName(state);
-	case Unknown:
-	default:
-		return false;
 	}
+	if (std::find(parseStates.begin(), parseStates.end(), state) != parseStates.end()) {
+		if (platform == state) {
+			return true;
+		}
+	}
+	return false;
+//	return std::find(parseStates.begin(),
+//					 parseStates.end(),
+//					 state) != parseStates.end();
 }
 
 
-bool ofAddon::checkCorrectVariable(string variable, ConfigParseState state){
-	switch(state){
-	case Meta:
-			return std::find(AddonMetaVariables.begin(),
-							 AddonMetaVariables.end(),
-							 variable) != AddonMetaVariables.end();
-	case Common:
-	case Linux:
-	case Linux64:
-	case MinGW:
-	case VS:
-	case LinuxARMv6:
-	case LinuxARMv7:
-	case AndroidARMv5:
-	case AndroidARMv7:
-	case Androidx86:
-	case Emscripten:
-	case iOS:
-	case OSX:
-			return std::find(AddonProjectVariables.begin(),
-							 AddonProjectVariables.end(),
-							 variable) != AddonProjectVariables.end();
-	case Unknown:
-	default:
-		return false;
+bool ofAddon::checkCorrectVariable(const string & variable, const string & state){
+	if (state == "meta") {
+		return std::find(AddonMetaVariables.begin(),
+						 AddonMetaVariables.end(),
+						 variable) != AddonMetaVariables.end();
+	}
+	else if (state == "osx") {
+		return std::find(AddonProjectVariables.begin(),
+						 AddonProjectVariables.end(),
+						 variable) != AddonProjectVariables.end();
+	} else {
+		return checkCorrectPlatform(state);
 	}
 }
 
@@ -235,7 +154,7 @@ void ofAddon::addReplaceStringVector(vector<LibraryBinary> & variable, string va
 }
 
 void ofAddon::parseVariableValue(string variable, string value, bool addToValue, string line, int lineNum){
-	if(variable == ADDON_NAME){
+	if(variable == "ADDON_NAME"){
 		if(value!=name){
 			ofLogError() << "Error parsing " << name << " addon_config.mk" << "\n\t\t"
 						<< "line " << lineNum << ": " << line << "\n\t\t"
@@ -252,31 +171,31 @@ void ofAddon::parseVariableValue(string variable, string value, bool addToValue,
 		addonRelPath = addonPath;
 	}
 
-	if(variable == ADDON_DESCRIPTION){
+	if(variable == "ADDON_DESCRIPTION"){
 		addReplaceString(description,value,addToValue);
 		return;
 	}
 
-	if(variable == ADDON_AUTHOR){
+	if(variable == "ADDON_AUTHOR"){
 		addReplaceString(author,value,addToValue);
 		return;
 	}
 
-	if(variable == ADDON_TAGS){
+	if(variable == "ADDON_TAGS"){
 		addReplaceStringVector(tags,value,"",addToValue);
 		return;
 	}
 
-	if(variable == ADDON_URL){
+	if(variable == "ADDON_URL"){
 		addReplaceString(url,value,addToValue);
 		return;
 	}
 
-	if(variable == ADDON_DEPENDENCIES){
+	if(variable == "ADDON_DEPENDENCIES"){
 		addReplaceStringVector(dependencies,value,"",addToValue);
 	}
 
-	if(variable == ADDON_INCLUDES){
+	if(variable == "ADDON_INCLUDES"){
 		addReplaceStringVector(includePaths, value, addonRelPath.string(), addToValue);
 	}
 
@@ -415,11 +334,13 @@ void ofAddon::parseConfig(){
 		// found section?
 		if(line[line.size()-1]==':'){
 			ofStringReplace(line,":","");
-			currentParseState = stateFromString(line);
-			if(currentParseState == Unknown){
+			// FIXME: Remove
+			currentParseState = line;
+			
+			if (std::find(parseStates.begin(), parseStates.end(), currentParseState) == parseStates.end()) {
 				ofLogError() << "Error parsing " << name << " addon_config.mk" << "\n\t\t"
 								<< "line " << lineNum << ": " << originalLine << "\n\t\t"
-								<< "sectionName " << stateName(currentParseState) << " not recognized";
+								<< "sectionName " << currentParseState << " not recognized";
 			}
 			continue;
 		}
@@ -439,16 +360,18 @@ void ofAddon::parseConfig(){
 			variable = ofTrim(varValue[0]);
 			value = ofTrim(varValue[1]);
 
+			// FIXME: This seems to be meaningless
 			if(!checkCorrectPlatform(currentParseState)){
 				continue;
 			}
 
-			if(!checkCorrectVariable(variable,currentParseState)){
+			if(!checkCorrectVariable(variable, currentParseState)){
 				ofLogError() << "Error parsing " << name << " addon_config.mk" << "\n\t\t"
 								<< "line " << lineNum << ": " << originalLine << "\n\t\t"
-								<< "variable " << variable << " not recognized for section " << stateName(currentParseState);
+								<< "variable " << variable << " not recognized for section " << currentParseState;
 				continue;
 			}
+			
 			parseVariableValue(variable, value, addToValue, originalLine, lineNum);
 		}
 	}
@@ -640,8 +563,6 @@ bool ofAddon::fromFS(const fs::path & path, const string & platform){
 	}
 
 
-
-
 	paths.sort();
 
 	for (auto & p : paths) {
@@ -650,12 +571,6 @@ bool ofAddon::fromFS(const fs::path & path, const string & platform){
 
 	parseConfig();
 
-//		alert ("--- LIST LIBS", 35);
-//		for (auto & l : libs) {
-//			alert (l.path, 35);
-//		}
-//		alert ("--- LIST LIBS", 35);
-
 	return true;
 }
 

commandLine/src/addons/ofAddon.h

@@ -16,18 +16,32 @@ using std::string;
 using std::vector;
 // #include <map>
 // About Metadata
-const string ADDON_NAME = "ADDON_NAME";
-const string ADDON_DESCRIPTION = "ADDON_DESCRIPTION";
-const string ADDON_AUTHOR = "ADDON_AUTHOR";
-const string ADDON_TAGS = "ADDON_TAGS";
-const string ADDON_URL = "ADDON_URL";
-
-const vector<string> AddonMetaVariables = {
-	ADDON_NAME,
-	ADDON_DESCRIPTION,
-	ADDON_AUTHOR,
-	ADDON_TAGS,
-	ADDON_URL,
+
+const vector<string> AddonMetaVariables {
+	"ADDON_NAME",
+	"ADDON_DESCRIPTION",
+	"ADDON_AUTHOR",
+	"ADDON_TAGS",
+	"ADDON_URL",
+};
+
+const vector<string> parseStates {
+	"meta",
+	"common",
+	"linux",
+	"linux64",
+	"msys2",
+	"vs",
+	"linuxarmv6l",
+	"linuxarmv7l",
+	"linuxaarch64",
+	"android/armeabi",
+	"android/armeabi-v7a",
+	"android/x86",
+	"emscripten",
+	"ios",
+	"osx",
+	"tvos",
 };
 
 // About Project settings
@@ -143,25 +157,8 @@ class ofAddon {
 	}
 
 private:
-
-	enum ConfigParseState{
-		Meta,
-		Common,
-		Linux,
-		Linux64,
-		MinGW,
-		VS,
-		LinuxARMv6,
-		LinuxARMv7,
-		LinuxAArch64,
-		AndroidARMv5,
-		AndroidARMv7,
-		Androidx86,
-		Emscripten,
-		iOS,
-		OSX,
-		Unknown
-	} currentParseState;
+	
+	string currentParseState { "" };
 
 	void parseConfig();
 	void parseVariableValue(string variable, string value, bool addToValue, string line, int lineNum);
@@ -170,10 +167,8 @@ class ofAddon {
 	void addReplaceStringVector(vector<LibraryBinary> & variable, string value, string prefix, bool addToVariable);
 	void exclude(vector<string> & variable, vector<string> exclusions);
 	void exclude(vector<LibraryBinary> & variable, vector<string> exclusions);
-	ConfigParseState stateFromString(string name);
-	string stateName(ConfigParseState state);
-	bool checkCorrectVariable(string variable, ConfigParseState state);
-	bool checkCorrectPlatform(ConfigParseState state);
+	bool checkCorrectVariable(const string & variable, const string & state);
+	bool checkCorrectPlatform(const string & state);
 
 	string platform;
 

commandLine/src/main.cpp

@@ -54,7 +54,7 @@ bool busingEnvVar;
 bool bVerbose;
 bool bAddonsPassedIn;
 bool bForce;                  // force even if things like ofRoot seem wrong of if update folder looks wonky
-int mode;                     // what mode are we in?
+pgMode mode;                     // what mode are we in?
 bool bRecursive;              // do we recurse in update mode?
 bool bHelpRequested;          // did we request help?
 bool bListTemplates;          // did we request help?

commandLine/src/projects/baseProject.h

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