Skip to content

Commit

Permalink
By default, let main file (re)set target properties specified in gene…
Browse files Browse the repository at this point in the history
…rated federates
  • Loading branch information
lhstrh committed Feb 24, 2023
1 parent 60f2789 commit bae32df
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions org.lflang/src/org/lflang/TargetProperty.java
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,6 @@ public enum TargetProperty {
}
}),


/**
* Directive to let the runtime export its internal dependency graph.
*
Expand Down Expand Up @@ -875,7 +874,7 @@ private interface PropertyGetter {
this.supportedBy = supportedBy;
this.getter = getter;
this.setter = setter;
this.updater = (config, value, err) -> { /* Ignore the update by default */ };
this.updater = setter; // (Re)set by default
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public boolean doGenerate(Resource resource, LFGeneratorContext context) throws
final List<DockerData> services = new ArrayList();
// 1. create a Dockerfile for each federate
subContexts.forEach((subContext) -> {
// Inherit Docker properties from main context
// Inherit Docker options from main context
subContext.getTargetConfig().dockerOptions = context.getTargetConfig().dockerOptions;
var dockerGenerator = dockerGeneratorFactory(subContext);
var dockerData = dockerGenerator.generateDockerData();
Expand Down

0 comments on commit bae32df

Please sign in to comment.