[x] use a commit posterior to #3185e8f328 (merge of VAV templates feature branch into master)
Discussion: should we target a version tag instead of a commit number from now on (i.e. the next version to be released)? [EDIT 9/12] The plan is to use a version tag of MBL. However, this cannot be done now as a change in ctrl-flow vendor annotations is needed, see below. For at least another version of ctrl-flow, a commit hash will be used.
[x] refactor __Linkage with __ctrlFlow
Declaration annotations in #3185e8f328 use __ctrl_flow which I propose to modify into __ctrlFlow for proper camel case formatting. [EDIT 9/12]__ctrlFlow will be used.
[x] remove the patch to flag template classes: currently within server/bin/install-modelica-dependencies.sh see git apply $parent_path/bin/linkage-keyword.patch
This requires updating MBL as well to introduce the class annotation __ctrlFlow(template=true).
FIXME: It is uncanny to use a hierarchical annotation here because __ctrlFlow(template=false) will never be used. Prefer simple annotation __ctrlFlow_template? [EDIT 9/12]__ctrlFlow_template will be used.
[ ] Check if m2j commit (currently a46a361c3047c0a2b3d1cfc9bc8b0a4ced16006a) should not be updated to target the master version (2f006e0f7900e267307feb39228758c42237a6ef). @JayHuLBL Can you advise?
TODO:
[x] Updatelinkage-api version in server/package.json. (Client app version is unchanged as no modification in the client codebase is done. Only client/src/data/templates.json is modified.)
AntoineGautier
commented
1 month ago
This issue is to
__Linkagewith__ctrlFlow__ctrl_flowwhich I propose to modify into__ctrlFlowfor proper camel case formatting. [EDIT 9/12]__ctrlFlowwill be used.server/bin/install-modelica-dependencies.shseegit apply $parent_path/bin/linkage-keyword.patch__ctrlFlow(template=true). FIXME: It is uncanny to use a hierarchical annotation here because__ctrlFlow(template=false)will never be used. Prefer simple annotation__ctrlFlow_template? [EDIT 9/12]__ctrlFlow_templatewill be used.On a side note, we should
[x] verify that
/server/scripts/templates.jsonis copied to/client/src/data/. This is mentioned as a comment at https://github.com/lbl-srg/ctrl-flow-dev/blob/e2bb34ca76e0d1ed7413691a89ffd8525e16c750/server/Dockerfile#L48-L56 but I cannot see inparseTemplateJSONthe corresponding instruction, nor is/client/src/data/templates.jsonmodified when I rundocker exec -it linkage-api sh -c "npm run parseTemplateJSON".[ ] Check if m2j commit (currently a46a361c3047c0a2b3d1cfc9bc8b0a4ced16006a) should not be updated to target the master version (2f006e0f7900e267307feb39228758c42237a6ef). @JayHuLBL Can you advise?
TODO:
linkage-apiversion inserver/package.json. (Client app version is unchanged as no modification in the client codebase is done. Onlyclient/src/data/templates.jsonis modified.)