Merge pull request #2436 from lf-lang/fix-dot-export

Repaired export-dependency-graph property and dropped unsupported export-to-yaml property
lf-lang · Nov 19, 2024 · 58bb134 · 58bb134
2 parents 2e6d57f + 048fb80
commit 58bb134
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 28 deletions.
diff --git a/core/src/main/java/org/lflang/target/Target.java b/core/src/main/java/org/lflang/target/Target.java
@@ -40,7 +40,6 @@
 import org.lflang.target.property.CoordinationProperty;
 import org.lflang.target.property.DockerProperty;
 import org.lflang.target.property.ExportDependencyGraphProperty;
-import org.lflang.target.property.ExportToYamlProperty;
 import org.lflang.target.property.ExternalRuntimePathProperty;
 import org.lflang.target.property.FilesProperty;
 import org.lflang.target.property.KeepaliveProperty;
@@ -612,7 +611,6 @@ public void initialize(TargetConfig config) {
               CompilerProperty.INSTANCE,
               DockerProperty.INSTANCE,
               ExportDependencyGraphProperty.INSTANCE,
-              ExportToYamlProperty.INSTANCE,
               ExternalRuntimePathProperty.INSTANCE,
               NoRuntimeValidationProperty.INSTANCE,
               PrintStatisticsProperty.INSTANCE,

diff --git a/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java b/core/src/main/java/org/lflang/target/property/ExportToYamlProperty.java
diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneMainGenerator.kt
@@ -6,7 +6,6 @@ import org.lflang.inferredType
 import org.lflang.lf.Parameter
 import org.lflang.lf.Reactor
 import org.lflang.target.property.ExportDependencyGraphProperty
-import org.lflang.target.property.ExportToYamlProperty
 import org.lflang.target.property.FastProperty
 import org.lflang.target.property.TimeOutProperty
 import org.lflang.target.property.WorkersProperty
@@ -101,12 +100,11 @@ class CppStandaloneMainGenerator(
             |
             |  // assemble reactor program
             |  e.assemble();
-        ${" |".. if (targetConfig.get(ExportDependencyGraphProperty.INSTANCE)) "e.export_dependency_graph(\"${main.name}.dot\");" else ""}
-        ${" |".. if (targetConfig.get(ExportToYamlProperty.INSTANCE)) "e.dump_to_yaml(\"${main.name}.yaml\");" else ""}
             |
             |  // start execution
             |  auto thread = e.startup();
             |  thread.join();
+        ${" |".. if (targetConfig.get(ExportDependencyGraphProperty.INSTANCE)) "e.export_dependency_graph(\"${main.name}.dot\");" else ""}
             |  return 0;
             |}
         """.trimMargin()