Initial support for add new configurations & platforms.

TarmoPikaroAtVisualComponents · TarmoPikaroAtVisualComponents · commit b7f3d6274749 · 2019-02-23T10:23:10.000+02:00
diff --git a/SolutionProjectModel/Project.cpp b/SolutionProjectModel/Project.cpp
@@ -1,6 +1,7 @@
 #include "Project.h"
 #include <stdio.h>
 using namespace pugi;
+using namespace std;
 
 //
 // Expose over .dll boundary
@@ -9,6 +10,42 @@ template class __declspec(dllexport) std::allocator<char>;
 template class __declspec(dllexport) std::basic_string<char, std::char_traits<char>, std::allocator<char> >;
 
 
+template <class T, class I >
+bool vectorContains(const vector<T>& v, I& t)
+{
+    bool found = (std::find(v.begin(), v.end(), t) != v.end());
+    return found;
+}
+
+
+void Project::AddPlatform(const char* platform)
+{
+    if (!vectorContains(platforms, platform))
+        platforms.push_back(platform);
+}
+
+
+void Project::AddPlatforms(initializer_list<string> _platforms)
+{
+    platforms.reserve(_platforms.size());
+    for (initializer_list<string>::iterator i = _platforms.begin(); i != _platforms.end(); i++)
+        AddPlatform(i->c_str());
+}
+
+void Project::AddConfiguration(const char* configuration)
+{
+    if (!vectorContains(configurations, configuration))
+        configurations.push_back(configuration);
+}
+
+void Project::AddConfigurations(std::initializer_list<std::string> _configurations)
+{
+    configurations.reserve(_configurations.size());
+    for (initializer_list<string>::iterator i = _configurations.begin(); i != _configurations.end(); i++)
+        AddConfiguration(i->c_str());
+}
+
+
 bool Project::Load(const wchar_t* file)
 {
     xml_parse_result res = load_file(file, parse_default | parse_declaration | parse_ws_pcdata_single);
@@ -20,10 +57,11 @@ bool Project::Load(const wchar_t* file)
 
     for (xml_node conf : node.children())
     {
-        Configuration c;
-        c.ConfigurationName = as_utf8(conf.child(L"Configuration").text().get());
-        c.PlatformName = as_utf8(conf.child(L"Platform").text().get());
-        Configurations.push_back(c);
+        const wchar_t* xmltag[] = { L"Configuration" , L"Platform" };
+        void (Project::*func [])(const char*) = { &Project::AddConfiguration, &Project::AddPlatform };
+
+        for( int i = 0; i < _countof(xmltag); i++)
+            (this->*func[i])( as_utf8(conf.child(xmltag[i]).text().get()).c_str() );
     }
 
     return true;
diff --git a/SolutionProjectModel/Project.h b/SolutionProjectModel/Project.h
@@ -2,6 +2,7 @@
 #include "../pugixml/pugixml.hpp"
 #include <string>
 #include <vector>
+#include <initializer_list>
 
 #ifdef SPM_EXPORT
 #define SPM_DLLEXPORT __declspec(dllexport)
@@ -15,27 +16,29 @@
 #pragma warning( disable: 4275 )
 
 //---------------------------------------------------------
-//  Project configuration
+//  Project
 //---------------------------------------------------------
-class SPM_DLLEXPORT Configuration
+class SPM_DLLEXPORT Project : pugi::xml_document
 {
 public:
-    //  "Debug", "Release", user defined
-    std::string ConfigurationName;
-
     //  "Win32", "х64", ...
-    std::string PlatformName;
-};
+    std::vector<std::string> platforms;
 
+    //  "Debug", "Release", user defined
+    std::vector<std::string> configurations;
 
-//---------------------------------------------------------
-//  Project
-//---------------------------------------------------------
-class SPM_DLLEXPORT Project : pugi::xml_document
-{
-public:
-    std::vector<Configuration> Configurations;
+    //
+    // Add support for platform or configuration, if not yet added.
+    //
+    void AddPlatform(const char* platform);
+    void AddPlatforms(std::initializer_list<std::string> _platforms);
+
+    void AddConfiguration(const char* configuration);
+    void AddConfigurations(std::initializer_list<std::string> _configuration);
 
+    //
+    // Loads .vcxproj file.
+    //
     bool Load(const wchar_t* file);
 };
 
diff --git a/SolutionProjectModel/testCppApp.cpp b/SolutionProjectModel/testCppApp.cpp
@@ -3,9 +3,11 @@
 void main(void)
 {
     Project p;
-    p.Load(L"testCppApp.vcxproj");
 
-    printf("%s", p.Configurations[0].ConfigurationName.c_str());
-    p.Configurations[0].ConfigurationName = "x64";
+    //p.Load(L"testCppApp.vcxproj");
+    //printf("%s", p.configurations[0].c_str());
+
+    p.AddPlatforms( { "Win32", "x64", "x64" } );
+
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,11 @@`
`3`	`3`	`void main(void)`
`4`	`4`	`{`
`5`	`5`	`Project p;`
`6`		`- p.Load(L"testCppApp.vcxproj");`
`7`	`6`
`8`		`- printf("%s", p.Configurations[0].ConfigurationName.c_str());`
`9`		`- p.Configurations[0].ConfigurationName = "x64";`
	`7`	`+ //p.Load(L"testCppApp.vcxproj");`
	`8`	`+ //printf("%s", p.configurations[0].c_str());`
	`9`	`+`
	`10`	`+ p.AddPlatforms( { "Win32", "x64", "x64" } );`
	`11`	`+`
`10`	`12`	`}`
`11`	`13`