Bulk generator: Specify 'with-summaries', 'with-sources', and 'with-sinks' in the config file.

Author: MathiasVP

cpp/misc/bulk_generation_targets.json

@@ -1,5 +1,6 @@
 {
   "strategy": "dca",
+  "with_summaries": true,
   "targets": [
       { "name": "openssl" },
       { "name": "sqlite" }

misc/scripts/models-as-data/bulk_generate_mad.py

@@ -185,7 +185,7 @@ def build_database(
     return database_dir
 
 
-def generate_models(args, project: Project, database_dir: str) -> None:
+def generate_models(language: str, config, project: Project, database_dir: str) -> None:
     """
     Generate models for a project.
 
@@ -196,10 +196,11 @@ def generate_models(args, project: Project, database_dir: str) -> None:
     """
     name = project["name"]
 
-    generator = mad.Generator(args.lang)
-    generator.generateSinks = args.with_sinks
-    generator.generateSources = args.with_sources
-    generator.generateSummaries = args.with_summaries
+    generator = mad.Generator(language)
+     # Note: The argument parser converts with-sinks to with_sinks, etc.
+    generator.generateSinks = config.get("with_sinks", False)
+    generator.generateSources = config.get("with_sources", False)
+    generator.generateSummaries = config.get("with_summaries", False)
     generator.setenvironment(database=database_dir, folder=name)
     generator.run()
 
@@ -451,7 +452,7 @@ def main(config, args) -> None:
 
     for project, database_dir in database_results:
         if database_dir is not None:
-            generate_models(args, project, database_dir)
+            generate_models(language, config, project, database_dir)
 
 
 if __name__ == "__main__":
@@ -474,15 +475,6 @@ def main(config, args) -> None:
     parser.add_argument(
         "--lang", type=str, help="The language to generate models for", required=True
     )
-    parser.add_argument(
-        "--with-sources", action="store_true", help="Generate sources", required=False
-    )
-    parser.add_argument(
-        "--with-sinks", action="store_true", help="Generate sinks", required=False
-    )
-    parser.add_argument(
-        "--with-summaries", action="store_true", help="Generate sinks", required=False
-    )
     args = parser.parse_args()
 
     # Load config file

rust/misc/bulk_generation_targets.json

@@ -1,5 +1,8 @@
 {
     "strategy": "repo",
+    "with-sources": true,
+    "with-sinks": true,
+    "with-summaries": true,
     "targets": [
         {
             "name": "libc",