Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mixed-target federations #2099

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
+150 −68
Draft

Mixed-target federations #2099

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
26efd80
Fix protobufs path problem
lhstrh Nov 10, 2023
5ffafd3
Fix one more path problem
lhstrh Nov 10, 2023
4082f4e
Updated protobufs setup instructions
edwardalee Nov 10, 2023
2e3bef9
Fix comments
lhstrh Nov 13, 2023
b1bb2d6
Added failing ProtoNoPackingFederated test
lhstrh Nov 29, 2023
80c865f
Template for federate protobufs compiles. Message is incomplete
edwardalee Nov 30, 2023
29d4f25
Merge branch 'master' into mixed-federation
edwardalee Dec 1, 2023
5a2d6ae
Fix bug: set length on incoming token
edwardalee Dec 1, 2023
c205cfa
Simplified to not require a destructor at the sender
edwardalee Dec 1, 2023
67db070
Merge branch 'master' into mixed-federation
lhstrh Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix one more path problem
@lhstrh
lhstrh committed Nov 10, 2023
commit 5ffafd3b8f3c932971e37263ce9cc7fb1b9d7f93
5 changes: 3 additions & 2 deletions core/src/main/java/org/lflang/generator/c/CGenerator.java
View file
Original file line number Diff line number Diff line change
@@ -2053,10 +2053,11 @@ protected String generateTopLevelPreambles(Reactor reactor) {
.collect(Collectors.toSet())
.forEach(it -> builder.pr(toText(it.getCode())));
for (String file : targetConfig.get(ProtobufsProperty.INSTANCE)) {
var dotIndex = file.lastIndexOf(".");
var fileName = Path.of(file).getFileName().toString();
var dotIndex = fileName.lastIndexOf(".");
var rootFilename = file;
if (dotIndex > 0) {
rootFilename = file.substring(0, dotIndex);
rootFilename = fileName.substring(0, dotIndex);
}
code.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));
builder.pr("#include " + addDoubleQuotes(rootFilename + ".pb-c.h"));