From f68861367bd43356ed983efc2aa72567009ad2d1 Mon Sep 17 00:00:00 2001
From: Thraix <thraix@hotmail.com>
Date: Mon, 2 Mar 2020 21:44:38 +0100
Subject: [PATCH] Add exclude source and header compilation

---
 makegen.xml        |  2 --
 src/ConfigCLI.cpp  | 58 ++++++++++++++++++++++++++--------------------
 src/ConfigFile.cpp |  2 +-
 src/ConfigUtils.h  | 14 ++++++++++-
 src/HFileGen.cpp   | 10 ++++++--
 src/Utils.cpp      | 20 +++++++++++++---
 6 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/makegen.xml b/makegen.xml
index f555d6d..09c15df 100644
--- a/makegen.xml
+++ b/makegen.xml
@@ -1,7 +1,6 @@
 <makegen>
   <configuration name="Release">
     <generatehfile>false</generatehfile>
-    <hfilename>MakeGen.h</hfilename>
     <outputdir>bin/</outputdir>
     <outputname>makegen</outputname>
     <outputtype>executable</outputtype>
@@ -13,7 +12,6 @@
     <cflag>-g3</cflag>
     <cflag>-w</cflag>
     <generatehfile>false</generatehfile>
-    <hfilename>MakeGen.h</hfilename>
     <outputdir>bin/</outputdir>
     <outputname>makegen</outputname>
     <outputtype>executable</outputtype>
diff --git a/src/ConfigCLI.cpp b/src/ConfigCLI.cpp
index 1ffcd1c..e6641fc 100644
--- a/src/ConfigCLI.cpp
+++ b/src/ConfigCLI.cpp
@@ -13,16 +13,16 @@ MakeGen conf is used to create, modify and query the makegen.xml file.
 Usage: makegen conf <command> [<args>] [--help]
 
 Generating config files
-  gen             Prompt the user to enter information to create config
+  gen            Prompt the user to enter information to create config
 
 Modifying config settings
-  add           Add values to config settings which support multiple arguments
-  remove        Remove values from config settings which support multiple
-                 arguments
-  set           Set value to config settings which support only one argument
+  add            Add values to config settings which support multiple arguments
+  remove         Remove values from config settings which support multiple
+                  arguments
+  set            Set value to config settings which support only one argument
 
 Querying config settings
-  get             Get value of the config setting)");
+  get            Get value of the config setting)");
 }
 
 void ConfigCLI::DisplayGenHelp()
@@ -33,10 +33,10 @@ Generate a config file from prompts
 Usage: makegen conf gen <option>
 
 options:
-  prompt        Prompt the user for all needed settings
-  default       Generate a default config file. Source directory is set to
-                 src/, outputdir is set to bin/ and project name is set to
-                 the current directory name.)");
+  prompt         Prompt the user for all needed settings
+  default        Generate a default config file. Source directory is set to
+                  src/, outputdir is set to bin/ and project name is set to
+                  the current directory name.)");
 }
 
 void ConfigCLI::DisplayAddHelp()
@@ -47,13 +47,15 @@ Add values to config settings which support multiple arguments
 Usage: makegen conf add <setting> <value> [<values>]
 
 Valid settings are:
-  library       Library
-  librarydir    Library directory
-  includedir    Include directory
-  define        Preprocessor define
-  cflag         g++ compiler flag
-  lflag         g++ linking flag
-  dependency    Project which current project depends on)");
+  library        Library
+  librarydir     Library directory
+  includedir     Include directory
+  define         Preprocessor define
+  cflag          g++ compiler flag
+  lflag          g++ linking flag
+  dependency     Project which current project depends on
+  excludesource  Exclude source file from compiling
+  excludeheader  Exclude header file from project h-file)");
 }
 
 void ConfigCLI::DisplayRemoveHelp()
@@ -64,13 +66,15 @@ Remove values to config settings which support multiple
 Usage: makegen conf remove <setting> <value> [<
 
 Valid settings are
-  library       Library name
-  librarydir    Library directory
-  includedir    Include directory
-  define        Preprocessor define
-  cflag         g++ compiler flag
-  lflag         g++ linking flag
-  dependency    Project which current project depends on)");
+  library        Library name
+  librarydir     Library directory
+  includedir     Include directory
+  define         Preprocessor define
+  cflag          g++ compiler flag
+  lflag          g++ linking flag
+  dependency     Project which current project depends on
+  excludesource  Exclude source file from compiling
+  excludeheader  Exclude header file from project h-file)");
 }
 
 void ConfigCLI::DisplaySetHelp()
@@ -108,7 +112,9 @@ Valid settings are:
   define        Preprocessor define
   cflag         g++ compiler flag
   lflag         g++ linking flag
-  dependency    Project which current project depends on
+  dependency     Project which current project depends on
+  excludesource  Exclude source file from compiling
+  excludeheader  Exclude header file from project h-file
   outputdir     Directory of the compiled output
   outputname    Name of the output executable/library
   outputtype    Type of the output, valid values are executable, sharedlibrary
@@ -134,6 +140,8 @@ ConfigSetting ConfigCLI::CLIStringToSetting(const std::string& s)
     {"define", ConfigSetting::Define},
     {"cflag", ConfigSetting::CFlag},
     {"lflag", ConfigSetting::LFlag},
+    {"excludesource", ConfigSetting::ExcludeSource},
+    {"excludeheader", ConfigSetting::ExcludeHeader},
     {"dependency", ConfigSetting::Dependency},
     {"genhfile", ConfigSetting::GenerateHFile},
   };
diff --git a/src/ConfigFile.cpp b/src/ConfigFile.cpp
index 7d503f0..3c50ca5 100755
--- a/src/ConfigFile.cpp
+++ b/src/ConfigFile.cpp
@@ -316,7 +316,7 @@ XMLObject& ConfigFile::GetConfiguration()
 
 const std::string& ConfigFile::GetConfigPath() const
 {
-  return configPath;;
+  return configPath;
 }
 
 ConfigFile& ConfigFile::GetDependencyConfig(size_t i)
diff --git a/src/ConfigUtils.h b/src/ConfigUtils.h
index 602bdd3..c387b7f 100644
--- a/src/ConfigUtils.h
+++ b/src/ConfigUtils.h
@@ -18,7 +18,7 @@ struct ConfigCache
 enum class ConfigSetting
 {
   // vectors
-  Library = 0, LibraryDir = 1, IncludeDir = 2, Define = 3, Dependency = 4, CFlag = 5, LFlag = 6,
+  Library = 0, LibraryDir = 1, IncludeDir = 2, Define = 3, Dependency = 4, CFlag = 5, LFlag = 6, ExcludeSource = 7, ExcludeHeader = 8,
   // Strings
   SourceDir = 32, OutputDir = 33, OutputName = 34, OutputType = 35, ProjectName = 36, HFileName = 37,
   // Bools
@@ -59,6 +59,10 @@ struct ConfigUtils
         return "cflag";
       case ConfigSetting::LFlag:
         return "lflag";
+      case ConfigSetting::ExcludeSource:
+        return "excludesource";
+      case ConfigSetting::ExcludeHeader:
+        return "excludeheader";
       case ConfigSetting::GenerateHFile:
         return "generatehfile";
       case ConfigSetting::Invalid:
@@ -84,6 +88,8 @@ struct ConfigUtils
       case ConfigSetting::Define:
       case ConfigSetting::CFlag:
       case ConfigSetting::LFlag:
+      case ConfigSetting::ExcludeSource:
+      case ConfigSetting::ExcludeHeader:
       case ConfigSetting::GenerateHFile:
         return false;
       default:
@@ -110,6 +116,8 @@ struct ConfigUtils
       case ConfigSetting::Define:
       case ConfigSetting::CFlag:
       case ConfigSetting::LFlag:
+      case ConfigSetting::ExcludeHeader:
+      case ConfigSetting::ExcludeSource:
       case ConfigSetting::GenerateHFile:
       case ConfigSetting::Invalid:
         return false;
@@ -127,6 +135,8 @@ struct ConfigUtils
       case ConfigSetting::Define:
       case ConfigSetting::CFlag:
       case ConfigSetting::LFlag:
+      case ConfigSetting::ExcludeHeader:
+      case ConfigSetting::ExcludeSource:
         return true;
       case ConfigSetting::SourceDir:
       case ConfigSetting::OutputDir:
@@ -158,6 +168,8 @@ struct ConfigUtils
       case ConfigSetting::Define:
       case ConfigSetting::CFlag:
       case ConfigSetting::LFlag:
+      case ConfigSetting::ExcludeHeader:
+      case ConfigSetting::ExcludeSource:
       case ConfigSetting::Invalid:
         return false;
     }
diff --git a/src/HFileGen.cpp b/src/HFileGen.cpp
index bf41b12..25f2ff1 100644
--- a/src/HFileGen.cpp
+++ b/src/HFileGen.cpp
@@ -10,7 +10,7 @@ void HFileGen::Create(ConfigFile& conf)
   std::string path = conf.GetConfigPath() + conf.GetSettingString(ConfigSetting::SourceDir);
   FileUtils::GetAllFiles(path,files);
   // include paramenter with the path of the file
-  // For example src/graphics/Window.h -> graphics/Window.h if src is a src folder 
+  // For example src/graphics/Window.h -> graphics/Window.h if src is a src folder
   for(auto it = files.begin(); it!=files.end();++it)
   {
     size_t extensionPos = it->find_last_of(".");
@@ -25,8 +25,14 @@ void HFileGen::Create(ConfigFile& conf)
     }
   }
 
+  const std::vector<std::string>& excludeHeaders = conf.GetSettingVectorString(ConfigSetting::ExcludeHeader);
   std::ofstream os(path + "/" + conf.GetSettingString(ConfigSetting::HFileName));
   os << "#pragma once" << std::endl << std::endl;
   for(auto&& hFile : hFiles)
-    os << "#include <" << hFile << ">" << std::endl; 
+  {
+    std::string headerFile = conf.GetSettingString(ConfigSetting::SourceDir) +  hFile;
+    auto it = std::find(excludeHeaders.begin(), excludeHeaders.end(), headerFile);
+    if(it == excludeHeaders.end())
+      os << "#include <" << hFile << ">" << std::endl;
+  }
 }
diff --git a/src/Utils.cpp b/src/Utils.cpp
index c4eace0..d28674f 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -22,6 +22,7 @@ void Utils::GetCppFiles(ConfigFile& conf, std::set<std::string>& cppFiles)
   std::vector<std::string> files;
   std::string path = conf.GetConfigPath() + conf.GetSettingString(ConfigSetting::SourceDir);
   FileUtils::GetAllFiles(path, files);
+  const std::vector<std::string>& excludeSources = conf.GetSettingVectorString(ConfigSetting::ExcludeSource);
 
   for(auto it = files.begin(); it!=files.end();++it)
   {
@@ -32,7 +33,12 @@ void Utils::GetCppFiles(ConfigFile& conf, std::set<std::string>& cppFiles)
       std::string filename = it->substr(path.length());
       if(extension == "cpp" || extension == "c")
       {
-        cppFiles.emplace(filename);
+        std::string sourceFile =conf.GetSettingString(ConfigSetting::SourceDir) + filename;
+        auto it = std::find(excludeSources.begin(), excludeSources.end(), sourceFile);
+        if(it == excludeSources.end())
+        {
+          cppFiles.emplace(filename);
+        }
       }
     }
   }
@@ -43,8 +49,9 @@ void Utils::GetCppAndHFiles(ConfigFile& conf, std::set<HFile>& hFiles, std::set<
   std::vector<std::string> files;
   std::string path = conf.GetConfigPath() + conf.GetSettingString(ConfigSetting::SourceDir);
   FileUtils::GetAllFiles(path,files);
+  const std::vector<std::string>& excludeSources = conf.GetSettingVectorString(ConfigSetting::ExcludeSource);
   // include paramenter with the path of the file
-  // For example src/graphics/Window.h -> graphics/Window.h if src is a src folder 
+  // For example src/graphics/Window.h -> graphics/Window.h if src is a src folder
   for(auto it = files.begin(); it!=files.end();++it)
   {
     size_t extensionPos = it->find_last_of(".");
@@ -54,7 +61,14 @@ void Utils::GetCppAndHFiles(ConfigFile& conf, std::set<HFile>& hFiles, std::set<
       std::string filename = it->substr(path.length());
       if(extension == "cpp" || extension == "c")
       {
-        cppFiles.emplace(filename);
+        std::string sourceFile =conf.GetSettingString(ConfigSetting::SourceDir) + filename;
+        auto it = std::find(excludeSources.begin(), excludeSources.end(), sourceFile);
+        if(it == excludeSources.end())
+        {
+          cppFiles.emplace(filename);
+        }
+        else
+          LOG_INFO("Excluding: ", sourceFile);
       }
       else if(extension == "hpp" || extension == "h")
       {