Skip to content
Snippets Groups Projects
Commit 44dba3bf authored by Dennis Hendriks's avatar Dennis Hendriks
Browse files

Merge branch 'develop' into 'master'

#554 develop to master for v0.10-M1

See merge request eclipse/escet/escet!586
parents c89caf74 966a66f7
No related branches found
No related tags found
No related merge requests found
Showing
with 391 additions and 169 deletions
...@@ -10,7 +10,7 @@ The toolkit includes tooling to support the entire development process of (super ...@@ -10,7 +10,7 @@ The toolkit includes tooling to support the entire development process of (super
For more information, see: For more information, see:
* Website: https://eclipse.org/escet * Website: https://eclipse.dev/escet
* GitLab: https://gitlab.eclipse.org/eclipse/escet/escet * GitLab: https://gitlab.eclipse.org/eclipse/escet/escet
* Project home: https://projects.eclipse.org/projects/technology.escet * Project home: https://projects.eclipse.org/projects/technology.escet
...@@ -18,7 +18,7 @@ For more information, see: ...@@ -18,7 +18,7 @@ For more information, see:
For more information regarding source code management, builds, setting up a developer environment, coding standards, how to contribute, and more, see the Eclipse ESCET development documentation at: For more information regarding source code management, builds, setting up a developer environment, coding standards, how to contribute, and more, see the Eclipse ESCET development documentation at:
* https://eclipse.org/escet/development * https://eclipse.dev/escet/development
The project maintains the following source code repositories: The project maintains the following source code repositories:
...@@ -38,7 +38,7 @@ Remember that contributions are always welcome! ...@@ -38,7 +38,7 @@ Remember that contributions are always welcome!
To contribute source code (e.g. patches) via GitLab, see: To contribute source code (e.g. patches) via GitLab, see:
* https://eclipse.org/escet/development/development/contributing.html * https://eclipse.dev/escet/development/development/contributing.html
To create issues, reply to issues, contribute patches and merge requests, etc, you need an Eclipse Foundation account. To create issues, reply to issues, contribute patches and merge requests, etc, you need an Eclipse Foundation account.
It can easily be created at https://accounts.eclipse.org/user/register. It can easily be created at https://accounts.eclipse.org/user/register.
......
This diff is collapsed.
...@@ -21,7 +21,7 @@ pipeline { ...@@ -21,7 +21,7 @@ pipeline {
tools { tools {
jdk 'openjdk-jdk17-latest' jdk 'openjdk-jdk17-latest'
maven 'apache-maven-3.8.4' maven 'apache-maven-3.8.6'
} }
options { options {
...@@ -49,8 +49,24 @@ pipeline { ...@@ -49,8 +49,24 @@ pipeline {
} }
stages { stages {
stage('Initialize GPG') {
steps {
withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
sh '''
# Only sign certain branches. See similar condition below for details.
if [[ "$GIT_BRANCH" == "master" || "$TAG_NAME" =~ ^v[0-9]+\\.[0-9]+.*$ ]]; then
gpg --batch --import "${KEYRING}"
for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u); do
echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust;
done
fi
'''
}
}
}
stage('Build & Test') { stage('Build & Test') {
steps { steps {
withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
sh ''' sh '''
# Print versions. # Print versions.
...@@ -74,8 +90,10 @@ pipeline { ...@@ -74,8 +90,10 @@ pipeline {
# Configure 'sign' profile for build. # Configure 'sign' profile for build.
# Sign 'master' branch, to allow checking release signing before deployment. # Sign 'master' branch, to allow checking release signing before deployment.
# Sign releases. Determined based on release version tag name. # Sign releases. Determined based on release version tag name.
# This condition must match a similar condition above.
if [[ "$GIT_BRANCH" == "master" || "$TAG_NAME" =~ ^v[0-9]+\\.[0-9]+.*$ ]]; then if [[ "$GIT_BRANCH" == "master" || "$TAG_NAME" =~ ^v[0-9]+\\.[0-9]+.*$ ]]; then
BUILD_ARGS="$BUILD_ARGS -Psign" BUILD_ARGS="$BUILD_ARGS -Psign"
BUILD_ARGS="$BUILD_ARGS -Dgpg.passphrase=${KEYRING_PASSPHRASE}"
fi fi
# Override the 'escet.version.enduser' property for releases. Remains 'dev' otherwise. # Override the 'escet.version.enduser' property for releases. Remains 'dev' otherwise.
...@@ -102,7 +120,7 @@ pipeline { ...@@ -102,7 +120,7 @@ pipeline {
# Perform build. # Perform build.
./build.sh $BUILD_ARGS ./build.sh $BUILD_ARGS
''' '''
} }}
} }
post { post {
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
This content is produced and maintained by the Eclipse Supervisory Control Engineering Toolkit (Eclipse ESCET(TM)) project. This content is produced and maintained by the Eclipse Supervisory Control Engineering Toolkit (Eclipse ESCET(TM)) project.
* Website: https://eclipse.org/escet * Website: https://eclipse.dev/escet
* Downloads: https://eclipse.org/escet/download.html * Downloads: https://eclipse.dev/escet/download.html
* GitLab development server: https://gitlab.eclipse.org/eclipse/escet/escet * GitLab development server: https://gitlab.eclipse.org/eclipse/escet/escet
* Issue tracker: https://gitlab.eclipse.org/eclipse/escet/escet/-/issues * Issue tracker: https://gitlab.eclipse.org/eclipse/escet/escet/-/issues
* Forum: https://www.eclipse.org/forums/index.php/f/527/ * Forum: https://www.eclipse.org/forums/index.php/f/527/
......
...@@ -6,6 +6,6 @@ The toolkit includes tooling to support the entire development process of (super ...@@ -6,6 +6,6 @@ The toolkit includes tooling to support the entire development process of (super
For more information, see: For more information, see:
* Website: https://eclipse.org/escet * Website: https://eclipse.dev/escet
* GitLab: https://gitlab.eclipse.org/eclipse/escet/escet * GitLab: https://gitlab.eclipse.org/eclipse/escet/escet
* Project home: https://projects.eclipse.org/projects/technology.escet * Project home: https://projects.eclipse.org/projects/technology.escet
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<intAttribute key="M2_COLORS" value="0"/>
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean"/> <stringAttribute key="M2_GOALS" value="clean"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
...@@ -14,8 +15,10 @@ ...@@ -14,8 +15,10 @@
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/> <stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.escet.root}"/> <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.escet.root}"/>
</launchConfiguration> </launchConfiguration>
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<intAttribute key="M2_COLORS" value="0"/>
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean package --projects releng/org.eclipse.escet.releng.target,chi/org.eclipse.escet.chi.documentation,cif/org.eclipse.escet.cif.documentation,releng/org.eclipse.escet.releng.dev.documentation,releng/org.eclipse.escet.releng.project.documentation,tooldef/org.eclipse.escet.tooldef.documentation --also-make"/> <stringAttribute key="M2_GOALS" value="clean package --projects releng/org.eclipse.escet.releng.target,chi/org.eclipse.escet.chi.documentation,cif/org.eclipse.escet.cif.documentation,releng/org.eclipse.escet.releng.dev.documentation,releng/org.eclipse.escet.releng.project.documentation,tooldef/org.eclipse.escet.tooldef.documentation --also-make"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="true"/> <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="true"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/> <stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables"> <mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/> <mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<intAttribute key="M2_COLORS" value="0"/>
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean verify"/> <stringAttribute key="M2_GOALS" value="clean verify"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
...@@ -14,6 +15,7 @@ ...@@ -14,6 +15,7 @@
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/> <stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables"> <mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/> <mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
......
...@@ -184,6 +184,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 ...@@ -184,6 +184,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_record_components=16 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=82 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=82
......
eclipse.preferences.version=1 eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_settings_version=22 formatter_settings_version=23
org.eclipse.jdt.ui.text.custom_code_templates= org.eclipse.jdt.ui.text.custom_code_templates=
sp_cleanup.add_all=false
sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=false sp_cleanup.add_missing_annotations=false
...@@ -15,42 +16,129 @@ sp_cleanup.always_use_blocks=true ...@@ -15,42 +16,129 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.array_with_curly=false
sp_cleanup.arrays_fill=false
sp_cleanup.bitwise_conditional_expression=false
sp_cleanup.boolean_literal=false
sp_cleanup.boolean_value_rather_than_comparison=false
sp_cleanup.break_loop=false
sp_cleanup.collection_cloning=false
sp_cleanup.comparing_on_criteria=false
sp_cleanup.comparison_statement=false
sp_cleanup.controlflow_merge=false
sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
sp_cleanup.convert_to_switch_expressions=false
sp_cleanup.correct_indentation=false sp_cleanup.correct_indentation=false
sp_cleanup.do_while_rather_than_while=false
sp_cleanup.double_negation=false
sp_cleanup.else_if=false
sp_cleanup.embedded_if=false
sp_cleanup.evaluate_nullable=false
sp_cleanup.extract_increment=false
sp_cleanup.format_source_code=false sp_cleanup.format_source_code=false
sp_cleanup.format_source_code_changes_only=false sp_cleanup.format_source_code_changes_only=false
sp_cleanup.hash=false
sp_cleanup.if_condition=false
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.instanceof=false
sp_cleanup.instanceof_keyword=false
sp_cleanup.invert_equals=false
sp_cleanup.join=false
sp_cleanup.lazy_logical_operator=false
sp_cleanup.make_local_variable_final=false sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=false sp_cleanup.make_variable_declarations_final=false
sp_cleanup.map_cloning=false
sp_cleanup.merge_conditional_blocks=false
sp_cleanup.multi_catch=false
sp_cleanup.never_use_blocks=false sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.no_string_creation=false
sp_cleanup.no_super=false
sp_cleanup.number_suffix=false
sp_cleanup.objects_equals=false
sp_cleanup.on_save_use_additional_actions=true sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
sp_cleanup.operand_factorization=false
sp_cleanup.organize_imports=false sp_cleanup.organize_imports=false
sp_cleanup.overridden_assignment=false
sp_cleanup.overridden_assignment_move_decl=false
sp_cleanup.plain_replacement=false
sp_cleanup.precompile_regex=false
sp_cleanup.primitive_comparison=false
sp_cleanup.primitive_parsing=false
sp_cleanup.primitive_rather_than_wrapper=false
sp_cleanup.primitive_serialization=false
sp_cleanup.pull_out_if_from_if_else=false
sp_cleanup.pull_up_assignment=false
sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.reduce_indentation=false
sp_cleanup.redundant_comparator=false
sp_cleanup.redundant_falling_through_block_end=false
sp_cleanup.remove_private_constructors=true sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_redundant_modifiers=false
sp_cleanup.remove_redundant_semicolons=false
sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_array_creation=false
sp_cleanup.remove_unnecessary_casts=false sp_cleanup.remove_unnecessary_casts=false
sp_cleanup.remove_unnecessary_nls_tags=false sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false sp_cleanup.remove_unused_imports=false
sp_cleanup.remove_unused_local_variables=false sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_method_parameters=false
sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true sp_cleanup.remove_unused_private_types=true
sp_cleanup.return_expression=false
sp_cleanup.simplify_lambda_expression_and_method_ref=false
sp_cleanup.single_used_field=false
sp_cleanup.sort_members=false sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false sp_cleanup.sort_members_all=false
sp_cleanup.standard_comparison=false
sp_cleanup.static_inner_class=false
sp_cleanup.strictly_equal_or_different=false
sp_cleanup.stringbuffer_to_stringbuilder=false
sp_cleanup.stringbuilder=false
sp_cleanup.stringbuilder_for_local_vars=false
sp_cleanup.stringconcat_to_textblock=false
sp_cleanup.substring=false
sp_cleanup.switch=false
sp_cleanup.system_property=false
sp_cleanup.system_property_boolean=false
sp_cleanup.system_property_file_encoding=false
sp_cleanup.system_property_file_separator=false
sp_cleanup.system_property_line_separator=false
sp_cleanup.system_property_path_separator=false
sp_cleanup.ternary_operator=false
sp_cleanup.try_with_resource=false
sp_cleanup.unlooped_while=false
sp_cleanup.unreachable_block=false
sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_directly_map_method=false
sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=false sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_string_is_blank=false
sp_cleanup.use_this_for_non_static_field_access=false sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_unboxing=false
sp_cleanup.use_var=false
sp_cleanup.useless_continue=false
sp_cleanup.useless_return=false
sp_cleanup.valueof_rather_than_instantiation=false
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
...@@ -2,16 +2,16 @@ Manifest-Version: 1.0 ...@@ -2,16 +2,16 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: ESCET Chi Java Code Generator (Incubation) Bundle-Name: ESCET Chi Java Code Generator (Incubation)
Bundle-SymbolicName: org.eclipse.escet.chi.codegen;singleton:=true Bundle-SymbolicName: org.eclipse.escet.chi.codegen;singleton:=true
Bundle-Version: 0.9.0.qualifier Bundle-Version: 0.10.0.qualifier
Bundle-Vendor: Eclipse ESCET Bundle-Vendor: Eclipse ESCET
Require-Bundle: org.eclipse.escet.chi.metamodel;bundle-version="0.9.0", Require-Bundle: org.eclipse.escet.chi.metamodel;bundle-version="0.10.0",
org.eclipse.escet.chi.metamodel.java;bundle-version="0.9.0", org.eclipse.escet.chi.metamodel.java;bundle-version="0.10.0",
org.eclipse.escet.common.box;bundle-version="0.9.0", org.eclipse.escet.common.box;bundle-version="0.10.0",
org.eclipse.escet.common.java;bundle-version="0.9.0", org.eclipse.escet.common.java;bundle-version="0.10.0",
org.eclipse.escet.chi.typecheck;bundle-version="0.9.0", org.eclipse.escet.chi.typecheck;bundle-version="0.10.0",
org.eclipse.escet.common.position.metamodel;bundle-version="0.9.0", org.eclipse.escet.common.position.metamodel;bundle-version="0.10.0",
org.eclipse.escet.chi.runtime;bundle-version="0.9.0", org.eclipse.escet.chi.runtime;bundle-version="0.10.0",
org.eclipse.escet.common.position.common;bundle-version="0.9.0" org.eclipse.escet.common.position.common;bundle-version="0.10.0"
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.eclipse.escet.chi.codegen, Export-Package: org.eclipse.escet.chi.codegen,
......
...@@ -184,6 +184,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 ...@@ -184,6 +184,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_record_components=16 org.eclipse.jdt.core.formatter.alignment_for_record_components=16
org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=82 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=82
......
eclipse.preferences.version=1 eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_settings_version=22 formatter_settings_version=23
org.eclipse.jdt.ui.text.custom_code_templates= org.eclipse.jdt.ui.text.custom_code_templates=
sp_cleanup.add_all=false
sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=false sp_cleanup.add_missing_annotations=false
...@@ -15,42 +16,129 @@ sp_cleanup.always_use_blocks=true ...@@ -15,42 +16,129 @@ sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.array_with_curly=false
sp_cleanup.arrays_fill=false
sp_cleanup.bitwise_conditional_expression=false
sp_cleanup.boolean_literal=false
sp_cleanup.boolean_value_rather_than_comparison=false
sp_cleanup.break_loop=false
sp_cleanup.collection_cloning=false
sp_cleanup.comparing_on_criteria=false
sp_cleanup.comparison_statement=false
sp_cleanup.controlflow_merge=false
sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false
sp_cleanup.convert_to_switch_expressions=false
sp_cleanup.correct_indentation=false sp_cleanup.correct_indentation=false
sp_cleanup.do_while_rather_than_while=false
sp_cleanup.double_negation=false
sp_cleanup.else_if=false
sp_cleanup.embedded_if=false
sp_cleanup.evaluate_nullable=false
sp_cleanup.extract_increment=false
sp_cleanup.format_source_code=false sp_cleanup.format_source_code=false
sp_cleanup.format_source_code_changes_only=false sp_cleanup.format_source_code_changes_only=false
sp_cleanup.hash=false
sp_cleanup.if_condition=false
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.instanceof=false
sp_cleanup.instanceof_keyword=false
sp_cleanup.invert_equals=false
sp_cleanup.join=false
sp_cleanup.lazy_logical_operator=false
sp_cleanup.make_local_variable_final=false sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=false sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=false sp_cleanup.make_variable_declarations_final=false
sp_cleanup.map_cloning=false
sp_cleanup.merge_conditional_blocks=false
sp_cleanup.multi_catch=false
sp_cleanup.never_use_blocks=false sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.no_string_creation=false
sp_cleanup.no_super=false
sp_cleanup.number_suffix=false
sp_cleanup.objects_equals=false
sp_cleanup.on_save_use_additional_actions=true sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
sp_cleanup.operand_factorization=false
sp_cleanup.organize_imports=false sp_cleanup.organize_imports=false
sp_cleanup.overridden_assignment=false
sp_cleanup.overridden_assignment_move_decl=false
sp_cleanup.plain_replacement=false
sp_cleanup.precompile_regex=false
sp_cleanup.primitive_comparison=false
sp_cleanup.primitive_parsing=false
sp_cleanup.primitive_rather_than_wrapper=false
sp_cleanup.primitive_serialization=false
sp_cleanup.pull_out_if_from_if_else=false
sp_cleanup.pull_up_assignment=false
sp_cleanup.push_down_negation=false
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.reduce_indentation=false
sp_cleanup.redundant_comparator=false
sp_cleanup.redundant_falling_through_block_end=false
sp_cleanup.remove_private_constructors=true sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_redundant_modifiers=false
sp_cleanup.remove_redundant_semicolons=false
sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_array_creation=false
sp_cleanup.remove_unnecessary_casts=false sp_cleanup.remove_unnecessary_casts=false
sp_cleanup.remove_unnecessary_nls_tags=false sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false sp_cleanup.remove_unused_imports=false
sp_cleanup.remove_unused_local_variables=false sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_method_parameters=false
sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true sp_cleanup.remove_unused_private_types=true
sp_cleanup.return_expression=false
sp_cleanup.simplify_lambda_expression_and_method_ref=false
sp_cleanup.single_used_field=false
sp_cleanup.sort_members=false sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false sp_cleanup.sort_members_all=false
sp_cleanup.standard_comparison=false
sp_cleanup.static_inner_class=false
sp_cleanup.strictly_equal_or_different=false
sp_cleanup.stringbuffer_to_stringbuilder=false
sp_cleanup.stringbuilder=false
sp_cleanup.stringbuilder_for_local_vars=false
sp_cleanup.stringconcat_to_textblock=false
sp_cleanup.substring=false
sp_cleanup.switch=false
sp_cleanup.system_property=false
sp_cleanup.system_property_boolean=false
sp_cleanup.system_property_file_encoding=false
sp_cleanup.system_property_file_separator=false
sp_cleanup.system_property_line_separator=false
sp_cleanup.system_property_path_separator=false
sp_cleanup.ternary_operator=false
sp_cleanup.try_with_resource=false
sp_cleanup.unlooped_while=false
sp_cleanup.unreachable_block=false
sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_autoboxing=false
sp_cleanup.use_blocks=false sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_directly_map_method=false
sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=false sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_string_is_blank=false
sp_cleanup.use_this_for_non_static_field_access=false sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
sp_cleanup.use_unboxing=false
sp_cleanup.use_var=false
sp_cleanup.useless_continue=false
sp_cleanup.useless_return=false
sp_cleanup.valueof_rather_than_instantiation=false
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
...@@ -2,11 +2,11 @@ Manifest-Version: 1.0 ...@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: ESCET Chi Documentation Utils (Incubation) Bundle-Name: ESCET Chi Documentation Utils (Incubation)
Bundle-SymbolicName: org.eclipse.escet.chi.documentation.utils;singleton:=true Bundle-SymbolicName: org.eclipse.escet.chi.documentation.utils;singleton:=true
Bundle-Version: 0.9.0.qualifier Bundle-Version: 0.10.0.qualifier
Bundle-Vendor: Eclipse ESCET Bundle-Vendor: Eclipse ESCET
Automatic-Module-Name: org.eclipse.escet.chi.documentation.utils Automatic-Module-Name: org.eclipse.escet.chi.documentation.utils
Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Require-Bundle: org.apache.commons.math3;bundle-version="3.5.0", Require-Bundle: org.apache.commons.math3;bundle-version="3.5.0",
org.eclipse.escet.common.java;bundle-version="0.9.0" org.eclipse.escet.common.java;bundle-version="0.10.0"
Export-Package: org.eclipse.escet.chi.documentation.utils Export-Package: org.eclipse.escet.chi.documentation.utils
...@@ -2,6 +2,6 @@ Manifest-Version: 1.0 ...@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: ESCET Chi Documentation (Incubation) Bundle-Name: ESCET Chi Documentation (Incubation)
Bundle-SymbolicName: org.eclipse.escet.chi.documentation;singleton:=true Bundle-SymbolicName: org.eclipse.escet.chi.documentation;singleton:=true
Bundle-Version: 0.9.0.qualifier Bundle-Version: 0.10.0.qualifier
Bundle-Vendor: Eclipse ESCET Bundle-Vendor: Eclipse ESCET
Require-Bundle: org.eclipse.help Require-Bundle: org.eclipse.help
...@@ -30,7 +30,7 @@ It uses a process-based view, and uses synchronous point-to-point communication ...@@ -30,7 +30,7 @@ It uses a process-based view, and uses synchronous point-to-point communication
A process is written as an imperative program, with a syntax much inspired by the well-known Python language. A process is written as an imperative program, with a syntax much inspired by the well-known Python language.
Chi is one of the tools of the Eclipse ESCET(TM) project. Chi is one of the tools of the Eclipse ESCET(TM) project.
Visit the link:https://eclipse.org/escet/{escet-website-version}[project website] for downloads, installation instructions, source code, general tool usage information, information on how to contribute, and more. Visit the link:https://eclipse.dev/escet/{escet-website-version}[project website] for downloads, installation instructions, source code, general tool usage information, information on how to contribute, and more.
[WARNING] [WARNING]
==== ====
......
...@@ -20,7 +20,16 @@ indexterm:[release, notes] ...@@ -20,7 +20,16 @@ indexterm:[release, notes]
The release notes for the versions of Chi and the associated tools, as part of the Eclipse ESCET project, are listed below in reverse chronological order. The release notes for the versions of Chi and the associated tools, as part of the Eclipse ESCET project, are listed below in reverse chronological order.
See also the Eclipse ESCET link:https://eclipse.org/escet/{escet-website-version}/release-notes.html[toolkit release notes] covering those aspects that are common to the various Eclipse ESCET tools. See also the Eclipse ESCET link:https://eclipse.dev/escet/{escet-website-version}/release-notes.html[toolkit release notes] covering those aspects that are common to the various Eclipse ESCET tools.
=== Version 0.10
TBD
Improvements and fixes:
* The Chi simulator's SVG visualizer _Save as_ dialog now properly starts in the directory that contains the SVG file, also on Windows.
And it now properly handles paths with spaces and other special characters in them (issue {escet-issue}221[#221]).
=== Version 0.9 (2023-03-31) === Version 0.9 (2023-03-31)
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<intAttribute key="M2_COLORS" value="0"/>
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean package --projects releng/org.eclipse.escet.releng.target,chi/org.eclipse.escet.chi.documentation --also-make"/> <stringAttribute key="M2_GOALS" value="clean package --projects releng/org.eclipse.escet.releng.target,chi/org.eclipse.escet.chi.documentation --also-make"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/> <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="true"/> <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="true"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/> <stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/> <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables"> <mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="JAVA_HOME" value="${system_property:java.home}"/> <mapEntry key="JAVA_HOME" value="${system_property:java.home}"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment