Added repoRootNameOverride for include guard creation

Author: calcmogul

wpiformat/README.rst

@@ -47,6 +47,8 @@ Empty config groups can be omitted. Directory separators must be "/", not "\". D
 
 Valid include guard patterns use capital letters, start with the repository name, include the path to the file and the file name itself, and have directory separators and hyphens replaced with underscores. The path to the file starts from the repository root by default. Other paths, such as include directories, can be specified in the group ``includeGuardRoots``. If a path matches, that string will be truncated from the include guard pattern.
 
+The group ``repoRootNameOverride`` allows one to override the repository name used in include guards. This is useful for giving subprojects within one repository different repository roots in their include guards. Only specify one name in this group because subsequent names will be ignored.
+
 The groups ``includeRelated``, ``includeCSys``, ``includeCppSys``, ``includeOtherLibs``, and ``includeProject`` correspond to the header groups in the style guide. If a header name matches a regex in one of the groups, it overrides the default ordering and is placed in the corresponding group. The groups of regexes are checked in order of include group precedence.
 
 The regex for C system headers produces false positives on headers from "other libraries". Regexes for them should be added to ``includeOtherLibs``. Libraries with many headers generally group them within a folder, so a regex for just the folder will suffice.

wpiformat/wpiformat/includeguard.py

@@ -79,19 +79,23 @@ def make_include_guard(self, config_file, name):
         config_file -- Config object
         name -- file name string
         """
-        repo_root = Task.get_repo_root()
+        repo_root_name_override = config_file.group("repoRootNameOverride")
 
-        name = os.path.relpath(name, repo_root)
-        guard_path = os.path.basename(repo_root) + os.sep
+        repo_root = Task.get_repo_root()
+        guard_root = os.path.relpath(name, repo_root)
+        if not repo_root_name_override:
+            guard_path = os.path.basename(repo_root) + os.sep
+        else:
+            guard_path = repo_root_name_override[0] + os.sep
         include_roots = config_file.group("includeGuardRoots")
 
         if include_roots:
             for include_root in include_roots:
-                if name.startswith(include_root):
-                    guard_path += name[len(include_root):]
+                if guard_root.startswith(include_root):
+                    guard_path += guard_root[len(include_root):]
                     return regex.sub("[^a-zA-Z0-9]", "_",
                                      guard_path).upper() + "_"
 
         # No include guard roots matched, so append full name
-        guard_path += name
+        guard_path += guard_root
         return regex.sub("[^a-zA-Z0-9]", "_", guard_path).upper() + "_"