Skip to content

Commit

Permalink
Fix deprecated xtext generator (#320)
Browse files Browse the repository at this point in the history
* use timsquare latest update site

* use timesquare version 2023-07-26

* regenerate melangek3fsm example trace project to support footprint

related to
eclipse-gemoc/gemoc-studio-modeldebugging#235

* update dev instructions using docker
  • Loading branch information
dvojtise authored Sep 12, 2024
1 parent 6f506c9 commit 0b88289
Show file tree
Hide file tree
Showing 40 changed files with 795 additions and 161 deletions.
39 changes: 38 additions & 1 deletion dev_support/gemoc_builder/README.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,41 @@ The image contains several build scripts for various common usages.

TIP: you can timestamp the console and save in a local log by adding `|& ts -s |& tee build.log` at the end of the command (where `ts` comes from the the `moreutils` package)

typical use: (from the folder containing all the git repositories)

[source,bourne]
----
mkdir cache-m2
----

build protocol classes

[source,bourne]
----
docker run -it --rm --name gemoc-builder -v $PWD:/home/ubuntu/src -v $PWD/cache-m2:/home/ubuntu/.m2 --env UID=$(id -u) --env GID=$(id -g) -p 5901:5901 "gemoc/gemoc-builder:latest" ./generate_protocols.sh |& ts -s |& tee generate_protocols.log
----

build eclipse (no system tests)

[source,bourne]
----
docker run -it --rm --name gemoc-builder -v $PWD:/home/ubuntu/src -v $PWD/cache-m2:/home/ubuntu/.m2 --env UID=$(id -u) --env GID=$(id -g) -p 5901:5901 "gemoc/gemoc-builder:latest" ./tycho_build.sh linux_no_system_test |& ts -s |& tee linux_build.log
----

eclipse system tests only

[source,bourne]
----
docker run -it --rm --name gemoc-builder -v $PWD:/home/ubuntu/src -v $PWD/cache-m2:/home/ubuntu/.m2 --env UID=$(id -u) --env GID=$(id -g) -p 5901:5901 "gemoc/gemoc-builder:latest" ./tycho_build.sh linux_system_test_only |& ts -s |& tee linux_system_test_only.log
----

or full build (incl. system tests)

[source,bourne]
----
docker run -it --rm --name gemoc-builder -v $PWD:/home/ubuntu/src -v $PWD/cache-m2:/home/ubuntu/.m2 --env UID=$(id -u) --env GID=$(id -g) -p 5901:5901 "gemoc/gemoc-builder:latest" ./tycho_build.sh linux |& ts -s |& tee linux_build.log
----

typical use: (from the folder containing all the git repositories


Expand All @@ -89,7 +124,9 @@ docker run -it --rm --name gemoc-builder -v $PWD:/home/ubuntu/src -v $PWD/cache-

===== Description of the docker env

The _Dockerfile_ defines a docker image based on ubuntu 24.04 with maven, oracle java17, xvfb, and graphviz. It embeds an *entrypoint.sh* script that allows to run using your own userId. (To avoid issue about file created as root instead of your local uid, it uses `gosu` in the entrypoint script (cf. https://stackoverflow.com/questions/57776452/is-it-possible-to-map-a-user-inside-the-docker-container-to-an-outside-user))
The _Dockerfile_ defines a docker image based on ubuntu 24.04 with maven, oracle java17, xvfb, and graphviz.

It embeds an *entrypoint.sh* script that allows to run using your own userId. (To avoid issue about file created as root instead of your local uid, it uses `gosu` in the entrypoint script (cf. https://stackoverflow.com/questions/57776452/is-it-possible-to-map-a-user-inside-the-docker-container-to-an-outside-user))

The _docker-compose.yml_ will mount the folder containing all gemoc repositories (ie. the place where you've done `git clone`)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="GEMOCStudio Target platform" sequenceNumber="1700842450">
<target name="GEMOCStudio Target platform" sequenceNumber="1720021704">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.acceleo.feature.group" version="3.7.13.202304041222"/>
Expand Down Expand Up @@ -93,8 +93,8 @@
<repository id="ajdt" location="https://download.eclipse.org/tools/ajdt/426/dev/update"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="fr.inria.aoste.timesquare.feature.feature.group" version="1.0.0.202109021545"/>
<repository id="timesquare" location="https://timesquare.gitlabpages.inria.fr/updatesite/2021-09-02"/>
<unit id="fr.inria.aoste.timesquare.feature.feature.group" version="1.0.0.202307261556"/>
<repository id="timesquare" location="https://timesquare.gitlabpages.inria.fr/updatesite/2023-07-26"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.ecoretools.registration.feature.feature.group" version="3.3.0.201811051325"/>
Expand All @@ -119,50 +119,50 @@
<repository id="jetty" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.44.v20210927"/>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="true" missingManifest="generate" type="Maven" label="MavenDependencies">
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot</artifactId>
<version>10.0.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>70.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
<version>10.0.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-javax-websocket-api</artifactId>
<version>1.1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>1.4.2.Final</version>
<type>jar</type>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi-boot</artifactId>
<version>10.0.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
<version>1.3.4</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>70.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
<version>10.0.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-javax-websocket-api</artifactId>
<version>1.1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>1.4.2.Final</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ location ajdt "https://download.eclipse.org/tools/ajdt/426/dev/update" {
org.eclipse.ajdt.feature.group
}

location timesquare "https://timesquare.gitlabpages.inria.fr/updatesite/2021-09-02" {
location timesquare "https://timesquare.gitlabpages.inria.fr/updatesite/2023-07-26" {
fr.inria.aoste.timesquare.feature.feature.group
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ public interface SpecificTrace extends Trace<SequentialStep<? extends SpecificSt
* Returns the value of the '<em><b>Fsm State Machine Initialize Model Sequence</b></em>' reference list.
* The list contents are of type {@link fsmTrace.Steps.Fsm_StateMachine_InitializeModel}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Fsm State Machine Initialize Model Sequence</em>' reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Fsm State Machine Initialize Model Sequence</em>' reference list.
* @see fsmTrace.FsmTracePackage#getSpecificTrace_Fsm_StateMachine_InitializeModel_Sequence()
Expand All @@ -56,10 +52,6 @@ public interface SpecificTrace extends Trace<SequentialStep<? extends SpecificSt
* Returns the value of the '<em><b>Fsm State Step Sequence</b></em>' reference list.
* The list contents are of type {@link fsmTrace.Steps.Fsm_State_Step}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Fsm State Step Sequence</em>' reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Fsm State Step Sequence</em>' reference list.
* @see fsmTrace.FsmTracePackage#getSpecificTrace_Fsm_State_Step_Sequence()
Expand All @@ -72,10 +64,6 @@ public interface SpecificTrace extends Trace<SequentialStep<? extends SpecificSt
* Returns the value of the '<em><b>Fsm Transition Fire Sequence</b></em>' reference list.
* The list contents are of type {@link fsmTrace.Steps.Fsm_Transition_Fire}.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Fsm Transition Fire Sequence</em>' reference list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Fsm Transition Fire Sequence</em>' reference list.
* @see fsmTrace.FsmTracePackage#getSpecificTrace_Fsm_Transition_Fire_Sequence()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ public interface StateMachine_consummedString_Value extends SpecificAttributeVal
/**
* Returns the value of the '<em><b>Consummed String</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Consummed String</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Consummed String</em>' attribute.
* @see #setConsummedString(String)
* @see fsmTrace.States.StatesPackage#getStateMachine_consummedString_Value_ConsummedString()
* @model unique="false"
* annotation="aspect"
* @generated
*/
String getConsummedString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,11 @@ public interface StateMachine_currentState_Value extends SpecificReferenceValue<
/**
* Returns the value of the '<em><b>Current State</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Current State</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Current State</em>' reference.
* @see #setCurrentState(TracedState)
* @see fsmTrace.States.StatesPackage#getStateMachine_currentState_Value_CurrentState()
* @model
* @model annotation="aspect"
* @generated
*/
TracedState getCurrentState();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ public interface StateMachine_producedString_Value extends SpecificAttributeValu
/**
* Returns the value of the '<em><b>Produced String</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Produced String</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Produced String</em>' attribute.
* @see #setProducedString(String)
* @see fsmTrace.States.StatesPackage#getStateMachine_producedString_Value_ProducedString()
* @model unique="false"
* annotation="aspect"
* @generated
*/
String getProducedString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ public interface StateMachine_unprocessedString_Value extends SpecificAttributeV
/**
* Returns the value of the '<em><b>Unprocessed String</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Unprocessed String</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Unprocessed String</em>' attribute.
* @see #setUnprocessedString(String)
* @see fsmTrace.States.StatesPackage#getStateMachine_unprocessedString_Value_UnprocessedString()
* @model unique="false"
* annotation="aspect"
* @generated
*/
String getUnprocessedString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public interface TracedNamedElement extends SpecificTracedObject<SpecificDimensi
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model kind="operation"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList&lt;SpecificDimension&lt;?&gt;&gt; result = new org.eclipse.emf.ecore.util.BasicInternalEList&lt;SpecificDimension&lt;?&gt;&gt;(Object.class);\nresult.addAll(super.getDimensionsInternal());\nreturn result;\n'"
* @generated
*/
EList<SpecificDimension<?>> getDimensionsInternal();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ public interface TracedState extends TracedNamedElement {
/**
* Returns the value of the '<em><b>Original Object</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Original Object</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Original Object</em>' reference.
* @see #setOriginalObject(State)
Expand All @@ -55,7 +51,6 @@ public interface TracedState extends TracedNamedElement {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model kind="operation"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList&lt;SpecificDimension&lt;?&gt;&gt; result = new org.eclipse.emf.ecore.util.BasicInternalEList&lt;SpecificDimension&lt;?&gt;&gt;(Object.class);\nresult.addAll(super.getDimensionsInternal());\nreturn result;\n'"
* @generated
*/
EList<SpecificDimension<?>> getDimensionsInternal();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ public interface TracedStateMachine extends TracedNamedElement {
/**
* Returns the value of the '<em><b>Original Object</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Original Object</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Original Object</em>' reference.
* @see #setOriginalObject(StateMachine)
Expand All @@ -62,10 +58,6 @@ public interface TracedStateMachine extends TracedNamedElement {
/**
* Returns the value of the '<em><b>State Machine consummed String Dimension</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>State Machine consummed String Dimension</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>State Machine consummed String Dimension</em>' containment reference.
* @see #setStateMachine_consummedString_Dimension(StateMachine_consummedString_Dimension)
Expand All @@ -88,10 +80,6 @@ public interface TracedStateMachine extends TracedNamedElement {
/**
* Returns the value of the '<em><b>State Machine current State Dimension</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>State Machine current State Dimension</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>State Machine current State Dimension</em>' containment reference.
* @see #setStateMachine_currentState_Dimension(StateMachine_currentState_Dimension)
Expand All @@ -114,10 +102,6 @@ public interface TracedStateMachine extends TracedNamedElement {
/**
* Returns the value of the '<em><b>State Machine produced String Dimension</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>State Machine produced String Dimension</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>State Machine produced String Dimension</em>' containment reference.
* @see #setStateMachine_producedString_Dimension(StateMachine_producedString_Dimension)
Expand All @@ -140,10 +124,6 @@ public interface TracedStateMachine extends TracedNamedElement {
/**
* Returns the value of the '<em><b>State Machine unprocessed String Dimension</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>State Machine unprocessed String Dimension</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>State Machine unprocessed String Dimension</em>' containment reference.
* @see #setStateMachine_unprocessedString_Dimension(StateMachine_unprocessedString_Dimension)
Expand All @@ -167,7 +147,6 @@ public interface TracedStateMachine extends TracedNamedElement {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model kind="operation"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList&lt;SpecificDimension&lt;?&gt;&gt; result = new org.eclipse.emf.ecore.util.BasicInternalEList&lt;SpecificDimension&lt;?&gt;&gt;(Object.class);\nresult.addAll(super.getDimensionsInternal());\nresult.add(getStateMachine_unprocessedString_Dimension());\nresult.add(getStateMachine_consummedString_Dimension());\nresult.add(getStateMachine_currentState_Dimension());\nresult.add(getStateMachine_producedString_Dimension());\nreturn result;\n'"
* @generated
*/
EList<SpecificDimension<?>> getDimensionsInternal();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ public interface TracedTransition extends TracedNamedElement {
/**
* Returns the value of the '<em><b>Original Object</b></em>' reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Original Object</em>' reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Original Object</em>' reference.
* @see #setOriginalObject(Transition)
Expand All @@ -55,7 +51,6 @@ public interface TracedTransition extends TracedNamedElement {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @model kind="operation"
* annotation="http://www.eclipse.org/emf/2002/GenModel body='final EList&lt;SpecificDimension&lt;?&gt;&gt; result = new org.eclipse.emf.ecore.util.BasicInternalEList&lt;SpecificDimension&lt;?&gt;&gt;(Object.class);\nresult.addAll(super.getDimensionsInternal());\nreturn result;\n'"
* @generated
*/
EList<SpecificDimension<?>> getDimensionsInternal();
Expand Down
Loading

0 comments on commit 0b88289

Please sign in to comment.