Build: Generator: Use ConfigHelpers because of exceptions

CMake/generate.py

@@ -127,17 +127,17 @@ class Project:
     def find_sources(self):
         return self._find_sources(
-            CONFIG['CMake:Sources']['SourcesDir'],
+            ConfigHelpers.c_get(CONFIG, 'CMake:Sources', 'SourcesDir'),
             ConfigHelpers.c_get_array(CONFIG, 'CMake:Sources', 'ExcludeSources'))
     def find_sources_test(self):
         return self._find_sources(
-            CONFIG['CMake:Sources']['TestSourcesDir'],
+            ConfigHelpers.c_get(CONFIG, 'CMake:Sources', 'TestSourcesDir'),
             ConfigHelpers.c_get_array(CONFIG, 'CMake:Sources', 'ExcludeSources'))
     def find_install_sources(self):
         return self._find_sources(
-            CONFIG['CMake:Sources']['SourcesDir'],
+            ConfigHelpers.c_get(CONFIG, 'CMake:Sources', 'SourcesDir'),
             [],
             ConfigHelpers.c_get_array(CONFIG, 'CMake:Sources', 'InstallSources'))
@@ -193,9 +193,9 @@ class Generator:
             f.write(CATEGORIES['root'].format(
                 alib_modules_lib=Helpers.join([p.name for p in projects if p.category == "library"]),
                 alib_modules_exe=Helpers.join([p.name for p in projects if p.category == "executable"]),
-                alib_versioning_major=CONFIG['Versioning']['major'],
-                alib_versioning_minor=CONFIG['Versioning']['minor'],
-                alib_versioning_patch=CONFIG['Versioning']['patch'],
+                alib_versioning_major=ConfigHelpers.c_get(CONFIG, 'Versioning', 'major'),
+                alib_versioning_minor=ConfigHelpers.c_get(CONFIG, 'Versioning', 'minor'),
+                alib_versioning_patch=ConfigHelpers.c_get(CONFIG, 'Versioning', 'patch'),
             ))
     @classmethod
@@ -247,14 +247,14 @@ class Generator:
 SCRIPT_DIRECTORY = Helpers.path(os.path.dirname(__file__))
 CONFIG = configparser.ConfigParser(allow_no_value=True)
 CONFIG.read(Helpers.path(SCRIPT_DIRECTORY, 'generate.conf'))
-ALIB_DIRECTORY = Helpers.path(SCRIPT_DIRECTORY, CONFIG['General']['PathToSources'])
+ALIB_DIRECTORY = Helpers.path(SCRIPT_DIRECTORY, ConfigHelpers.c_get(CONFIG, 'General', 'PathToSources'))
 PROJECTS = {
-    project: Project(project, CONFIG['General']['ProjectConfFile'])
-    for project in Helpers.find_dirs_with_file(ALIB_DIRECTORY, CONFIG['General']['ProjectConfFile'])
+    project: Project(project, ConfigHelpers.c_get(CONFIG, 'General', 'ProjectConfFile'))
+    for project in Helpers.find_dirs_with_file(ALIB_DIRECTORY, ConfigHelpers.c_get(CONFIG, 'General', 'ProjectConfFile'))
 }
 CATEGORIES = {
     category: SmartOpen(template, directory=SCRIPT_DIRECTORY, mode='r').read()
-    for category, template in CONFIG['CMake:Categories'].items()
+    for category, template in ConfigHelpers.c_section(CONFIG, 'CMake:Categories').items()
 }
@@ -308,8 +308,8 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='CMakeLists generator for Algorithms Library Toolkit')
     parser.add_argument('-w', '--write', action='store_true', default=False, help="Write files")
     parser.add_argument('-m', '--main', action='store_true', default=False, help="Generate main CMakeLists.txt")
-    parser.add_argument('-p', '--packages', action='append', help='Specify packages to build. For multiple packages, use -p multiple times')
+    parser.add_argument('-p', '--package', action='append', help='Specify packages to build. For multiple packages, use -p multiple times')
     parser.add_argument('--no-deps', action='store_true', default=False, help="Don't generate dependencies")
     args = parser.parse_args()
-    sys.exit(main(not args.write, args.main, args.packages, args.no_deps))
+    sys.exit(main(not args.write, args.main, args.package, args.no_deps))