escet merge requestshttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests2024-02-13T17:07:56Zhttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/803#759 Improve clean_build_output.py script.2024-02-13T17:07:56ZDennis Hendriks#759 Improve clean_build_output.py script.- Improved detection of workspace name (in case of long branch names).
- Handle also 'nightly' versions.
- Hide differences in version postfixes.
- Handle modules being built in a different order.
- Handle non-sorted 'copy' plugin output...- Improved detection of workspace name (in case of long branch names).
- Handle also 'nightly' versions.
- Hide differences in version postfixes.
- Handle modules being built in a different order.
- Handle non-sorted 'copy' plugin output lines.
Closes #759v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/802#364 Add 'mri_event' and 'mri_state' CIF benchmarks.2024-02-14T11:48:46ZDennis Hendriks#364 Add 'mri_event' and 'mri_state' CIF benchmarks.* I used two separate commits.
Addresses #364* I used two separate commits.
Addresses #364v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/801#772 #773 CIF examples: fix indentation and execution of 'button_lamp_timer_g...2024-02-09T13:09:39ZDennis Hendriks#772 #773 CIF examples: fix indentation and execution of 'button_lamp_timer_genplc.tooldef'* I used two commits, one for #772 and one for #773:
* #772 CIF examples: fix button_lamp_timer_genplc.tooldef.
* #773 CIF examples: fix indentation in button_lamp_timer_genplc.tooldef.
* Also added commas after last arguments.
...* I used two commits, one for #772 and one for #773:
* #772 CIF examples: fix button_lamp_timer_genplc.tooldef.
* #773 CIF examples: fix indentation in button_lamp_timer_genplc.tooldef.
* Also added commas after last arguments.
* Make it easier to adapt the script if extra options are needed.
Closes #772, #773v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/800#765 Upgrade to eclipse dash version 1.1.1.2024-02-09T10:52:58ZFerdie Reijnen#765 Upgrade to eclipse dash version 1.1.1.Addresses #760
Closes #765Addresses #760
Closes #765v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/799#768 CIF pretty printer produces comment if specification is empty.2024-02-07T11:02:54ZDennis Hendriks#768 CIF pretty printer produces comment if specification is empty.Closes #768Closes #768v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/798#681 PLCgen: Improve prechecking error reports.2024-03-11T10:25:57ZAlbert Hofkamp#681 PLCgen: Improve prechecking error reports.This patch has more precise error messages if possible, rather than the very generic "you didn't do one of the following 4 things".
Also, it's better at indicating the point of the error (at the operator rather than the non-continuous si...This patch has more precise error messages if possible, rather than the very generic "you didn't do one of the following 4 things".
Also, it's better at indicating the point of the error (at the operator rather than the non-continuous side of the binary expression).
Other changes:
- Only one 'tau' event violation.
- Have both `cont OP value` and `value OP cont` comparisons, since now the error message is matching the code pattern.
It looks much less confusing to me now.
Closes #681v3.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/796#767 Product cell benchmark model comment fix: it has a 'feed belt'.2024-02-05T18:41:44ZDennis Hendriks#767 Product cell benchmark model comment fix: it has a 'feed belt'.Closes #767Closes #767v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/795#764 Adhere to new requirements for developer info.2024-02-05T18:42:02ZDennis Hendriks#764 Adhere to new requirements for developer info.* Best to review per commit.
* Changes:
* Account for multiple source code repositories.
* Update way of working: just create issue, no dev-list needed.
* Adhere to new requirements:
* Indicate how to build the repo already in ...* Best to review per commit.
* Changes:
* Account for multiple source code repositories.
* Update way of working: just create issue, no dev-list needed.
* Adhere to new requirements:
* Indicate how to build the repo already in the CONTRIBUTING file.
* Indicate branches to use already in the CONTRIBUTING file.
* Link from NOTICE file to CONTRIBUTING file.
* Add mandatory files to the website repo, through the deployment of the website. This makes it easier to keep the updated. And it keeps the website repo a deployment-only repo.
Fixes #764v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/794#38 Website: generated JS file now has a license header2024-02-06T19:16:11ZDennis Hendriks#38 Website: generated JS file now has a license header* Best to review per commit.
* Also switched to a resource file for the JS file content, rather than a multiline Java string.
Addresses #38* Best to review per commit.
* Also switched to a resource file for the JS file content, rather than a multiline Java string.
Addresses #38v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/793#766 CIF website: made the 'learn more' statement complete.2024-02-05T18:41:40ZDennis Hendriks#766 CIF website: made the 'learn more' statement complete.Closes #766Closes #766v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/792#424 Migrate CIF code generator precondition checks to the CIF checker framework2024-02-05T18:45:04ZDennis Hendriks#424 Migrate CIF code generator precondition checks to the CIF checker framework* Best to review per commit. There are quite a few commits, as I tried to take very small steps, one check at a time.
* Changes to existing common CIF checks:
* `FuncNoSpecificStdLibCheck` re-implemented, to be more like the unary/bina...* Best to review per commit. There are quite a few commits, as I tried to take very small steps, one check at a time.
* Changes to existing common CIF checks:
* `FuncNoSpecificStdLibCheck` re-implemented, to be more like the unary/binary/expression checks, and to disallow standard library functions on specific arguments.
* `FuncNoSpecificStdLibCheck` extended with disallows for standard library functions on specific arguments.
* New CIF checks:
* `LocOnlyStaticEvalInitPredsCheck`. Turns out I didn't need it, but seems useful to have anyway. Is similar to `LocOnlyStaticEvalMarkerPredsCheck`.
* `PrintNoSpecificPrintDeclsCheck`.
* `VarInputOnlySimulinkCompatibleTypesCheck` (CIF code generator Simulink-specific check).
* Other changes:
* Some refactoring for functionality related to Simulink types. Also some small renaming, JavaDoc improvements, etc.
* A single precondition checker for all languages, with one Simulink-specific check that is target-language specific.
* Warnings are now checking the Simulink code generator, rather than in the Simulink precondition checker. This fixes a bug where warnings were shown for function arguments and local variables of functions, that should only be reported for discrete variables.
* Added tests for Simulink-specific preconditions and warnings.
* Some fixes for typos and other small issues in the Simulink code generation documentation.
* The CIF code generation documentation now states that targets may indicate additional preconditions. The Simulink code generation documentation already did so, but this was not explicitly stated with the list of general restrictions.
* Notes:
* Can't use constructor arguments for the checks as one of them is now conditionally added, so made a static method that returns the checks.
Addresses #424v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/791#760 Build will have plugin validation issues with Maven 3.9.2+.2024-02-08T19:47:51ZFerdie Reijnen#760 Build will have plugin validation issues with Maven 3.9.2+.Addresses #760
The remaining warnings, using Maven 3.9.6:
```
[WARNING]
[WARNING] Plugin [INTERNAL, EXTERNAL] validation issues were detected in following plugin(s)
[WARNING]
[WARNING] * org.apache.maven.plugins:maven-checkstyle-pl...Addresses #760
The remaining warnings, using Maven 3.9.6:
```
[WARNING]
[WARNING] Plugin [INTERNAL, EXTERNAL] validation issues were detected in following plugin(s)
[WARNING]
[WARNING] * org.apache.maven.plugins:maven-checkstyle-plugin:3.3.1
[WARNING] Plugin EXTERNAL issue(s):
[WARNING] * Plugin depends on plexus-container-default, which is EOL
[WARNING]
[WARNING] * org.apache.maven.plugins:maven-site-plugin:3.12.1
[WARNING] Plugin EXTERNAL issue(s):
[WARNING] * Plugin depends on the deprecated Maven 2.x compatibility layer, which will be not supported in Maven 4.x
[WARNING]
[WARNING] * ch.mfrey.maven.plugin:copy-maven-plugin:1.0.0
[WARNING] Plugin EXTERNAL issue(s):
[WARNING] * Plugin is a Maven 2.x plugin, which will be not supported in Maven 4.x
[WARNING] * Plugin mixes multiple Maven versions: [3.2.1, 2.2.1]
[WARNING]
[WARNING] * org.eclipse.tycho:tycho-surefire-plugin:4.0.5
[WARNING] Declared at location(s):
[WARNING] * org.eclipse.escet:org.eclipse.escet.releng.configuration:3.0.0-SNAPSHOT (releng\org.eclipse.escet.releng.configuration\pom.xml) @ line 400
[WARNING] Mojo EXTERNAL issue(s):
[WARNING] * Mojo tycho-surefire:plugin-test (org.eclipse.tycho.surefire.TychoIntegrationTestMojo)
[WARNING] - Parameter 'localRepository' uses deprecated parameter expression '${localRepository}': ArtifactRepository type is deprecated and its use in Mojos should be avoided.
[WARNING]
[WARNING] * com.google.code.maven-replacer-plugin:replacer:1.5.3
[WARNING] Plugin EXTERNAL issue(s):
[WARNING] * Plugin should declare Maven artifacts in `provided` scope. If the plugin already declares them in `provided` scope, update the maven-plugin-plugin to latest version. Artifacts found with wrong scope: [org.apache.maven:maven-plugin-api:3.0.3]
[WARNING]
[WARNING]
[WARNING] Fix reported issues by adjusting plugin configuration or by upgrading above listed plugins. If no upgrade available, please notify plugin maintainers about reported issues.
[WARNING] For more or less details, use 'maven.plugin.validation' property with one of the values (case insensitive): [NONE, INLINE, SUMMARY, BRIEF, VERBOSE]
[WARNING]
```
Left:
- maven-checkstyle-plugin, we use the latest version: https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-checkstyle-plugin
- maven-site-plugin. Don't know where we use/import it and how its version is determined.
- copy-maven-plugin, seems to be the latest version: https://mvnrepository.com/artifact/ch.mfrey.maven.plugin/copy-maven-plugin
- tycho-surefire-plugin, this was fixed, we discussed it before here: https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/606#note_1158465, but now it is back again.
- replacer can't find a new version 1.5.3 released on April 16th, 2014: https://code.google.com/archive/p/maven-replacer-plugin/v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/790#763 Add 'TM Terminal' feature to Eclipse ESCET dev env.2024-02-03T13:29:28ZDennis Hendriks#763 Add 'TM Terminal' feature to Eclipse ESCET dev env.Closes #763Closes #763v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/789#762 CIF Ecore docs: add missing element type for 'Delete' function.2024-02-05T18:42:12ZDennis Hendriks#762 CIF Ecore docs: add missing element type for 'Delete' function.Closes #762Closes #762v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/788#761 Update dependencies after upgrading to Tycho 4.0.52024-02-09T10:29:54ZFerdie Reijnen#761 Update dependencies after upgrading to Tycho 4.0.5Closes #761Closes #761v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/787#758 Upgrade to Tycho 4.0.5.2024-02-01T20:22:18ZFerdie Reijnen#758 Upgrade to Tycho 4.0.5.Closes #758
Addresses #634Closes #758
Addresses #634v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/786#756 Remove 'no duplicate state annotations per automaton' constraint.2024-01-31T09:59:15ZDennis Hendriks#756 Remove 'no duplicate state annotations per automaton' constraint.Closes #756Closes #756v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/785#679 PLCgen: Move timer variable + block instance creation to code storage2024-02-09T07:45:15ZAlbert Hofkamp#679 PLCgen: Move timer variable + block instance creation to code storageReadable by commit, except for the 2nd to last commit that fixes state prefix text of timer variables since timer block instances are not in state.
Split the generic PlcVariable, PlcFuncDescription and PlcFuncAppl classes into more spec...Readable by commit, except for the 2nd to last commit that fixes state prefix text of timer variables since timer block instances are not in state.
Split the generic PlcVariable, PlcFuncDescription and PlcFuncAppl classes into more specific classes, and added an abstract baseclass for each.
Function block instance variables are both variable and function, where the latter also needs the former so it has a cyclic connection. As you cannot instantiate 2 objects at the same time, PLC code storage knows about state variables prefixes.v3.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/784#715 HTML codegen: use a queue for SVG input.2024-01-31T10:51:01ZDennis Hendriks#715 HTML codegen: use a queue for SVG input.- Best to review per commit.
- JS/HTML codegen: add warning logging support.
- HTML codegen: Use a queue for SVG input:
- The queue preserves the order of the clicks.
- If the clicked element is not enabled, a warning is printed and ...- Best to review per commit.
- JS/HTML codegen: add warning logging support.
- HTML codegen: Use a queue for SVG input:
- The queue preserves the order of the clicks.
- If the clicked element is not enabled, a warning is printed and the click is ignored, just like in the simulator.
- The queue consists of functions, such that we can delay determining the event until the click is at the head of the queue, to evaluate it in the proper state, also like in the simulator.
- Also fixed hover CSS for same SVG input element id in different SVGs, by using the query selector that first selects on the SVG image and only then on the SVG element id.
Addresses #715v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/783#755 Set Eclipse Wild Web Developer XML line limit to 120 characters.2024-01-28T14:27:11ZDennis Hendriks#755 Set Eclipse Wild Web Developer XML line limit to 120 characters.- Set Eclipse Wild Web Developer XML line limit to 120 characters.
- Then matches Eclipse Web Standard Tools XML editor line limit.
- They should be consistent in the ESCET development environment.
Closes #755- Set Eclipse Wild Web Developer XML line limit to 120 characters.
- Then matches Eclipse Web Standard Tools XML editor line limit.
- They should be consistent in the ESCET development environment.
Closes #755v3.0