Create / Update (#355)

#changelog #core

Author: dimitre

commandLine/src/addons/ofAddon.cpp

@@ -49,6 +49,7 @@ ofAddon::ConfigParseState ofAddon::stateFromString(string name){
 	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;
@@ -76,6 +77,8 @@ string ofAddon::stateName(ofAddon::ConfigParseState state){
 		return "linuxarmv6";
 	case LinuxARMv7:
 		return "linuxarmv7";
+	case LinuxAArch64:
+		return "linuxaarch64";
 	case AndroidARMv5:
 		return "android/armeabi";
 	case AndroidARMv7:

commandLine/src/addons/ofAddon.h

@@ -151,6 +151,7 @@ class ofAddon {
 		VS,
 		LinuxARMv6,
 		LinuxARMv7,
+		LinuxAArch64,
 		AndroidARMv5,
 		AndroidARMv7,
 		Androidx86,

commandLine/src/main.cpp

@@ -148,6 +148,9 @@ void addPlatforms(const std::string & value) {
 		else if (p == "linuxarmv7l") {
 			targets.emplace_back(OF_TARGET_LINUXARMV7L);
 		}
+		else if (p == "linuxaarch64") {
+			targets.emplace_back(OF_TARGET_LINUXAARCH64);
+		}
 		else if (p == "msys2") {
 			targets.emplace_back(OF_TARGET_MINGW);
 		}
@@ -213,28 +216,27 @@ void updateProject(const fs::path & path, ofTargetPlatform target, bool bConside
 	// bConsiderParameterAddons = do we consider that the user could call update with a new set of addons
 	// either we read the addons.make file, or we look at the parameter list.
 	// if we are updating recursively, we *never* consider addons passed as parameters.
-
 	ofLogNotice() << "updating project " << path;
-	auto project = getTargetProject(target);
 
-	if (!bDryRun) project->create(path, templateName);
+	if (!bDryRun) {
+		auto project = getTargetProject(target);
+
+		project->create(path, templateName);
 
-	if(bConsiderParameterAddons && bAddonsPassedIn){
-		for(auto & addon: addons){
-			project->addAddon(addon);
+		if(bConsiderParameterAddons && bAddonsPassedIn){
+			for(auto & addon: addons){
+				project->addAddon(addon);
+			}
+		}else{
+			ofLogNotice() << "parsing addons.make";
+			project->parseAddons();
 		}
-	}else{
-		ofLogNotice() << "parsing addons.make";
-		project->parseAddons();
-	}
 
-	if(!bDryRun){
 		for(auto & srcPath : srcPaths){
 			project->addSrcRecursively(srcPath);
 		}
+		project->save();
 	}
-
-	if (!bDryRun) project->save();
 }
 
 void recursiveUpdate(const fs::path & path, ofTargetPlatform target) {
@@ -244,7 +246,7 @@ void recursiveUpdate(const fs::path & path, ofTargetPlatform target) {
 	// second check if this is a folder that has src in it
 	if (isGoodProjectPath(path)) {
 		nProjectsUpdated++;
-		auto project = getTargetProject(target);
+//		auto project = getTargetProject(target);
 		updateProject(path, target, false);
 		return;
 	} else {
@@ -483,100 +485,77 @@ int main(int argc, char** argv){
 	else {
 		mode = PG_MODE_CREATE;
 	}
-
-//	mode = PG_MODE_CREATE;
+	mode = PG_MODE_CREATE;
 
 
 	if (bVerbose){
 		ofSetLogLevel(OF_LOG_VERBOSE);
 	}
 
-	if (mode == PG_MODE_CREATE) {
-		nProjectsCreated += 1;
-
-		for (int i = 0; i < (int)targets.size(); i++) {
-			auto project = getTargetProject(targets[i]);
-			auto target = getTargetString(targets[i]);
-
-
+	if (bRecursive) {
+		for (auto & t : targets) {
 			ofLogNotice() << "-----------------------------------------------";
-			ofLogNotice() << "setting OF path to: " << ofPath;
-			if(busingEnvVar){
-				ofLogNotice() << "from PG_OF_PATH environment variable";
-			}else{
-				ofLogNotice() << "from -o option";
-			}
-			ofLogNotice() << "target platform is: " << target;
-			ofLogNotice() << "project path is: " << projectPath;
-
-			if(templateName!=""){
-				ofLogNotice() << "using additional template " << templateName;
-			}
+			ofLogNotice() << "updating an existing project";
+			ofLogNotice() << "target platform is: " << getTargetString(t);
 
+			recursiveUpdate(projectPath, t);
 
-			ofLogNotice() << "setting up new project " << projectPath;
-			if (!bDryRun) project->create(projectPath, templateName);
-
+			ofLogNotice() << "project updated! ";
+			ofLogNotice() << "-----------------------------------------------";
+		}
+	} else {
+		if (mode == PG_MODE_UPDATE && !isGoodProjectPath(projectPath)) {
+			ofLogError() << "there's no src folder in this project path to update, maybe use create instead? (or use force to force updating)";
+		} else {
+			nProjectsCreated += 1;
 
-			if (!bDryRun){
-				for(auto & addon: addons){
-					project->addAddon(addon);
-				}
-				for(auto & srcPath : srcPaths){
-					project->addSrcRecursively(srcPath);
+			for (auto & t : targets) {
+				ofLogNotice() << "-----------------------------------------------";
+				ofLogNotice() << "setting OF path to: " << ofPath;
+				if(busingEnvVar){
+					ofLogNotice() << "from PG_OF_PATH environment variable";
+				}else{
+					ofLogNotice() << "from -o option";
 				}
-			}
-			if (!bDryRun) project->save();
+				ofLogNotice() << "target platform is: " << getTargetString(t);
+				ofLogNotice() << "project path is: " << projectPath;
 
-			ofLogNotice() << "project created! ";
-			ofLogNotice() << "-----------------------------------------------";
-			consoleSpace();
-		}
-	}
+				if(templateName != ""){
+					ofLogNotice() << "using additional template " << templateName;
+				}
 
-	else if (mode == PG_MODE_UPDATE) {
-		if (!bRecursive) {
-			if (isGoodProjectPath(projectPath) || bForce) {
-				nProjectsUpdated += 1;
-
-				for (int i = 0; i < (int)targets.size(); i++) {
-					ofLogNotice() << "-----------------------------------------------";
-					ofLogNotice() << "setting OF path to: " << ofPath;
-					if(busingEnvVar){
-						ofLogNotice() << "from PG_OF_PATH environment variable";
-					}else{
-						ofLogNotice() << "from -o option";
-					}
-					ofLogNotice() << "target platform is: " << getTargetString(targets[i]);
+				ofLogNotice() << "setting up new project " << projectPath;
 
-					if(templateName!=""){
-						ofLogNotice() << "using additional template " << templateName;
+				if (mode == PG_MODE_UPDATE) {
+					
+					updateProject(projectPath, t);
+					ofLogNotice() << "project updated! ";
+					
+				} else {
+					
+					if (!bDryRun){
+						auto project = getTargetProject(t);
+						project->create(projectPath, templateName);
+						for(auto & addon: addons){
+							project->addAddon(addon);
+						}
+						for(auto & srcPath : srcPaths){
+							project->addSrcRecursively(srcPath);
+						}
+						project->save();
 					}
-					updateProject(projectPath,targets[i]);
 
-					ofLogNotice() << "project updated! ";
-					ofLogNotice() << "-----------------------------------------------";
-					consoleSpace();
+					ofLogNotice() << "project created! ";
 				}
-			}
-			else {
-				ofLogError() << "there's no src folder in this project path to update, maybe use create instead? (or use force to force updating)";
-			}
-		}
-		else {
-			for (int i = 0; i < (int)targets.size(); i++) {
-				ofLogNotice() << "-----------------------------------------------";
-				ofLogNotice() << "updating an existing project";
-				ofLogNotice() << "target platform is: " << getTargetString(targets[i]);
-
-				recursiveUpdate(projectPath, targets[i]);
-
-				ofLogNotice() << "project updated! ";
 				ofLogNotice() << "-----------------------------------------------";
+				consoleSpace();
 			}
 		}
+
 	}
 
+
+
 	consoleSpace();
 	float elapsedTime = ofGetElapsedTimef() - startTime;
 	if (nProjectsCreated > 0) std::cout << nProjectsCreated << " project created ";

commandLine/src/projects/baseProject.cpp

@@ -112,7 +112,7 @@ std::vector<baseProject::Template> baseProject::listAvailableTemplates(std::stri
 
 bool baseProject::create(const fs::path & _path, std::string templateName){
 	auto path = _path; // just because it is const
-	
+
 	templatePath = getPlatformTemplateDir();
 	addons.clear();
 	extSrcPaths.clear();
@@ -122,6 +122,11 @@ bool baseProject::create(const fs::path & _path, std::string templateName){
 	}
 	projectDir = path;
 	projectName = path.filename();
+	if (projectName == "") {
+		projectName = path.parent_path().filename();
+	}
+//	cout << "path = " << path << endl;
+//	cout << "projectName = " << projectName << endl;
 	bool bDoesDirExist = false;
 
 	fs::path project { projectDir / "src" };
@@ -137,13 +142,9 @@ bool baseProject::create(const fs::path & _path, std::string templateName){
 	bool ret = createProjectFile();
 	if(!ret) return false;
 
-	//MARK: -
 	if(templateName!=""){
 		fs::path templateDir = getOFRoot() / templatesFolder / templateName;
 
-		// TODO: PORT
-// !!!: asdf
-//		templateDir.setShowHidden(true);
 		auto templateConfig = parseTemplate(templateDir);
 		if(templateConfig){
 			recursiveTemplateCopy(templateDir, projectDir);
@@ -152,8 +153,7 @@ bool baseProject::create(const fs::path & _path, std::string templateName){
 				auto from = projectDir / rename.first;
 				auto to = projectDir / rename.second;
 //				auto to = projectDir / templateConfig->renames[rename.first];
-
-//				moveTo(const of::filesystem::path& path, bool bRelativeToData = true, bool overwrite = false);
+				// Reference: moveTo(const of::filesystem::path& path, bool bRelativeToData = true, bool overwrite = false);
 				ofFile(from).moveTo(to,true,true);
 			}
 		}else{
@@ -223,14 +223,14 @@ bool baseProject::save(){
 			string str = line;
 
 			//add the of root path
-			if( str.rfind("# OF_ROOT =", 0) == 0 ){
-   
-                            auto path = getOFRoot();
-                            if( projectDir.string().rfind(getOFRoot(),0) == 0 ){
-                                path = getOFRelPath(projectDir);
-                            }
-                            
-                            saveConfig << "OF_ROOT = " << path << std::endl;
+			if( str.rfind("# OF_ROOT =", 0) == 0 || str.rfind("OF_ROOT =", 0) == 0){
+				auto path = getOFRoot().string();
+		
+				if( projectDir.string().rfind(getOFRoot(),0) == 0 ){
+					path = getOFRelPath(projectDir);
+				}
+				
+				saveConfig << "OF_ROOT = " << path << std::endl;
 			}
 			// replace this section with our external paths
 			else if( extSrcPaths.size() && str.rfind("# PROJECT_EXTERNAL_SOURCE_PATHS =", 0) == 0 ){

commandLine/src/projects/xcodeProject.cpp

@@ -64,7 +64,7 @@ xcodeProject::xcodeProject(string target)
 
 bool xcodeProject::createProjectFile(){
 	fs::path xcodeProject = projectDir / ( projectName + ".xcodeproj" );
-	
+//	cout << "createProjectFile " << xcodeProject << endl;
 	if (ofDirectory::doesDirectoryExist(xcodeProject)){
 		ofDirectory::removeDirectory(xcodeProject, true);
 	}
@@ -438,7 +438,7 @@ void xcodeProject::addSrc(string srcFile, string folder, SrcType type){
 }
 
 void xcodeProject::addFramework(string name, string path, string folder){
-	cout << "addFramework " << name << " path = " << path << " folder = " << folder << endl;
+//	cout << "addFramework " << name << " path = " << path << " folder = " << folder << endl;
 	// name = name of the framework
 	// path = the full path (w name) of this framework
 	// folder = the path in the addon (in case we want to add this to the file browser -- we don't do that for system libs);

commandLine/src/utils/Utils.cpp

@@ -417,31 +417,34 @@ std::string getOFRootFromConfig(){
 
 std::string getTargetString(ofTargetPlatform t){
 	switch (t) {
-	case OF_TARGET_OSX:
-		return "osx";
-	case OF_TARGET_MINGW:
-		return "msys2";
-	case OF_TARGET_WINVS:
-		return "vs";
-	case OF_TARGET_IOS:
-		return "ios";
-	case OF_TARGET_ANDROID:
-		return "android";
-	case OF_TARGET_LINUX:
-		return "linux";
-	case OF_TARGET_LINUX64:
-		return "linux64";
-	case OF_TARGET_LINUXARMV6L:
-		return "linuxarmv6l";
-	case OF_TARGET_LINUXARMV7L:
-		return "linuxarmv7l";
-	default:
-		return "";
+		case OF_TARGET_OSX:
+			return "osx";
+		case OF_TARGET_MINGW:
+			return "msys2";
+		case OF_TARGET_WINVS:
+			return "vs";
+		case OF_TARGET_IOS:
+			return "ios";
+		case OF_TARGET_ANDROID:
+			return "android";
+		case OF_TARGET_LINUX:
+			return "linux";
+		case OF_TARGET_LINUX64:
+			return "linux64";
+		case OF_TARGET_LINUXARMV6L:
+			return "linuxarmv6l";
+		case OF_TARGET_LINUXARMV7L:
+			return "linuxarmv7l";
+		case OF_TARGET_LINUXAARCH64:
+			return "linuxaarch64";
+		default:
+			return "";
 	}
 }
 
 
 unique_ptr<baseProject> getTargetProject(ofTargetPlatform targ) {
+//	cout << "getTargetProject :" << getTargetString(targ) << endl;
 	switch (targ) {
 	case OF_TARGET_OSX:
 		return unique_ptr<xcodeProject>(new xcodeProject(getTargetString(targ)));
@@ -459,6 +462,8 @@ unique_ptr<baseProject> getTargetProject(ofTargetPlatform targ) {
 		return unique_ptr<QtCreatorProject>(new QtCreatorProject(getTargetString(targ)));
 	case OF_TARGET_LINUXARMV7L:
 		return unique_ptr<QtCreatorProject>(new QtCreatorProject(getTargetString(targ)));
+	case OF_TARGET_LINUXAARCH64:
+		return unique_ptr<QtCreatorProject>(new QtCreatorProject(getTargetString(targ)));
 	case OF_TARGET_ANDROID:
 		return unique_ptr<AndroidStudioProject>(new AndroidStudioProject(getTargetString(targ)));
 	default: