Skip to content

Commit 2a969c7

Browse files
tshoangtshoang
authored
Merge pull request #5 from tshoang/master
Bundles for July 2021 - Based on Rodin 3.6.0 - Update CamilleX to 2.1.0 - Update Scenario Checker to 1.0.0 - Update ProB Support to 0.0.1 - Include RMF 0.13 - Include Sphinx 0.11
2 parents 7626c68 + 8eb97ec commit 2a969c7

File tree

1,083 files changed

+141
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,083 files changed

+141
-85
lines changed

‎README.md‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,71 +5,81 @@ group. Currently the folllowing bundles are included:
55
* *ac.soton.rodinp.releases*: Bundle including the released features
66
from our group. This bundle is intended for users. Currently, the
77
content of the bundle is as follows
8-
- Rodin Product 3.5.0.202009111309-74e0e4188
9-
- CamilleX 2.0.0.release
8+
- Rodin Product 3.6.0.202105121522-77c344946
9+
- Rodin Handbook 2.5.0.201606291411
10+
- CamilleX 2.1.0.release
1011
- UML-B Statemachines 4.0.1.release
1112
- UML-B Statemachines Animation 3.0.0.release
1213
- UML-B Classdiagrams 3.0.0.release
13-
- Scenario Checker 0.0.0.release
14+
- Scenario Checker 1.0.0.release
1415
- Rose Editor 1.7.0.release
1516
- SMT Solvers 1.4.0.8c9a179
16-
- ProB 3.0.10.202009160721
17+
- ProB 3.0.10.202106111432
18+
- RMF ProR 0.13.0.201509161042
1719

1820
* *ac.soton.rodinp.baseline*: Bundle including the released features
1921
including their source and tests (SDK) from our group. This bundle
2022
is intended for developers and to be used as the API baseline.
2123
Currently, the content of the bundle is as follows
22-
- Rodin Product 3.5.0.202009111309-74e0e4188
23-
- CamilleX SDK 2.0.0.release
24+
- Rodin Product 3.6.0.202105121522-77c344946
25+
- Rodin Handbook 2.5.0.201606291411
26+
- CamilleX SDK 2.1.0.release
2427
- UML-B Statemachines SDK 4.0.1.release
2528
- UML-B Statemachines Animation SDK 3.0.0.release
2629
- UML-B Classdiagrams SDK 3.0.0.release
27-
- Scenario Checker SDK 0.0.0.release
30+
- Scenario Checker SDK 1.0.0.release
2831
- Rose Editor SDK 1.7.0.release
29-
- Event-B Utils SDK 0.2.4.release
32+
- Event-B Utils SDK 0.2.6.release
3033
- Event-B EMF SDK 6.1.0.release
3134
- EMF Translator SDK 3.0.1.release
3235
- Event-B EMF Extension SDK 6.1.0.release
3336
- Event-B Translator Support SDK 0.1.0.release
34-
- Event-B ProB Support SDK 0.0.0.release
37+
- Event-B ProB Support SDK 0.0.1.release
3538
- UML-B Diagrams SDK 8.0.1.release
36-
- EMF Inclusion SDK 2.0.0.release
37-
- EMF Records SDK 0.1.0.release
39+
- EMF Inclusion SDK 2.0.2.release
40+
- EMF Records SDK 0.1.2.release
3841
- EMF Containment SDK 0.0.2.release
3942

40-
4143
* *ac.soton.rodinp.target*: Bundle including the released features
4244
including their source and tests (SDK) from our group. Additionally,
4345
this bundle also include the SDK of Eclipse features that our
4446
features depend on. This bundle is intended for developers and to be
4547
used as the target platform. Currently, the content of the bundle is
4648
as follows
47-
- Rodin Product 3.5.0.202009111309-74e0e4188
48-
- CamilleX SDK 2.0.0.release
49+
- Rodin Product 3.6.0.202105121522-77c344946
50+
- Rodin Handbook 2.5.0.201606291411
51+
- Event-B IDE Source 3.6.0.202105121522-77c344946
52+
- Rodin Platform Source 3.6.0.202105121522-77c344946
53+
- Rodin Platform Tests Source 3.6.0.202105121522-77c344946
54+
- CamilleX SDK 2.1.0.release
4955
- UML-B Statemachines SDK 4.0.1.release
5056
- UML-B Statemachines Animation SDK 3.0.0.release
5157
- UML-B Classdiagrams SDK 3.0.0.release
52-
- Scenario Checker SDK 0.0.0.release
58+
- Scenario Checker SDK 1.0.0.release
5359
- Rose Editor SDK 1.7.0.release
5460
- SMT Solvers 1.4.0.8c9a179
55-
- ProB 3.0.10.202009160721
56-
- Event-B Utils SDK 0.2.4.release
61+
- ProB 3.0.10.202106111432
62+
- Event-B Utils SDK 0.2.6.release
5763
- Event-B EMF SDK 6.1.0.release
5864
- EMF Translator SDK 3.0.1.release
5965
- Event-B EMF Extension SDK 6.1.0.release
6066
- Event-B Translator Support SDK 0.1.0.release
61-
- Event-B ProB Support SDK 0.0.0.release
67+
- Event-B ProB Support SDK 0.0.1.release
6268
- UML-B Diagrams SDK 8.0.1.release
63-
- EMF Inclusion SDK 2.0.0.release
64-
- EMF Records SDK 0.1.0.release
69+
- EMF Inclusion SDK 2.0.2.release
70+
- EMF Records SDK 0.1.2.release
6571
- EMF Containment SDK 0.0.2.release
66-
- XText SDK 2.22.0.v20200602-1533
67-
- Eclipse SDK 5.17.0.v20200604-0951
68-
- EMF SDK 2.22.0.v20200519-1135
69-
- GEF SDK 3.11.0.201606061308
70-
- GMF Runtime SDK 1.13.0.202004160913
72+
- XText SDK 2.24.0.v20201130-1016
73+
- Eclipse SDK 4.18.0.I20201202-1800
74+
- EMF SDK 2.24.0.v20200917-1439
75+
- GMF Tooling SDK 3.2.1.201409171321
76+
- RMF ProR SDK 0.13.0.201509161042
77+
- Sphinx SDK 0.11.0.201706140911
7178

7279
Running *mvn clean verify* at the top level will build all
7380
bundles. Individual bundle can be built by running *mvn clean verify*
7481
within the corresponding folder.
7582

83+
We recommend that you install the Atelier-B provers (via Atelier-B Update
84+
Site) and the Relevance Filter plug-in (from the Rodin Plug-ins update site) to
85+
enhance your proof experience.

‎ac.soton.rodinp.baseline/Rodin.p2.inf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
instructions.configure=\
22
mkdir(path:${installFolder}/dropins);\
3-
addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.16,name:Eclipse 2020-06);\
4-
addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.16,name:Eclipse 2020-06);\
3+
addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.18,name:Eclipse 2020-12);\
4+
addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.18,name:Eclipse 2020-12);\
55
addRepository(type:0,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
66
addRepository(type:1,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
77
addRepository(type:0,location:http${#58}//rodin-b-sharp.sourceforge.net/updates,name:Rodin Plug-ins);\
@@ -20,8 +20,6 @@ instructions.configure=\
2020
addRepository(type:1,location:http${#58}//download.scala-ide.org/sdk/lithium/e44/scala211/stable/site,name:Scala);\
2121
addRepository(type:0,location:http${#58}//handbook.event-b.org/updatesite,name:Rodin Handbook);\
2222
addRepository(type:1,location:http${#58}//handbook.event-b.org/updatesite,name:Rodin Handbook);\
23-
addRepository(type:0,location:http${#58}//eventb-soton.github.io/updateSite/releases,name:UML-B and CamilleX);\
24-
addRepository(type:1,location:http${#58}//eventb-soton.github.io/updateSite/releases,name:UML-B and CamilleX);\
25-
addRepository(type:0,location:http${#58}//download.eclipse.org/modeling/tmf/xtext/updates/composite/releases,name:XText);\
26-
addRepository(type:1,location:http${#58}//download.eclipse.org/modeling/tmf/xtext/updates/composite/releases,name:XText);
23+
addRepository(type:0,location:http${#58}//eventb-soton.github.io/updateSite/releases,name:Soton Plug-ins);\
24+
addRepository(type:1,location:http${#58}//eventb-soton.github.io/updateSite/releases,name:Soton Plug-ins);
2725
# BEWARE ! THE PREVIOUS LINE MUST NOT END WITH A BACKSLASH

‎ac.soton.rodinp.baseline/Rodin.product‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.5.0.202009111309-9f39f1653-BL2008" useFeatures="true" includeLaunchers="true">
4+
<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.6.0.202105121522-77c344946-BL2107" useFeatures="true" includeLaunchers="true">
55

66
<aboutInfo>
77
<image path="icons/about.gif"/>
@@ -48,24 +48,24 @@
4848
</plugins>
4949

5050
<features>
51-
<feature id="org.eventb.ide" version="3.5.0.qualifier"/>
52-
<feature id="org.rodinp.platform" version="3.5.0.qualifier"/>
51+
<feature id="org.rodinp.platform" version="3.6.0.qualifier"/>
5352
<feature id="org.rodinp.handbook.feature" installMode="root"/>
54-
<feature id="ac.soton.xeventb.sdk" version="2.0.0.qualifier" installMode="root"/>
53+
<feature id="ac.soton.xeventb.sdk" version="2.1.0.qualifier" installMode="root"/>
5554
<feature id="ac.soton.eventb.statemachines.sdk" version="4.0.1.qualifier" installMode="root"/>
5655
<feature id="ac.soton.eventb.statemachines.animation.sdk" version="3.0.0.qualifier" installMode="root"/>
5756
<feature id="ac.soton.eventb.classdiagrams.sdk" version="3.0.0.qualifier" installMode="root"/>
58-
<feature id="ac.soton.eventb.scenariochecker.sdk" version="0.0.0.qualifier" installMode="root"/>
57+
<feature id="ac.soton.eventb.scenariochecker.sdk" version="1.0.0.qualifier" installMode="root"/>
5958
<feature id="ac.soton.eventb.roseEditor.sdk" version="1.7.0.qualifier" installMode="root"/>
60-
<feature id="ch.ethz.eventb.utils.sdk" version="0.2.4.qualifier" installMode="root"/>
59+
<feature id="ch.ethz.eventb.utils.sdk" version="0.2.6.qualifier" installMode="root"/>
6160
<feature id="org.eventb.emf.sdk" version="6.1.0.qualifier" installMode="root"/>
6261
<feature id="ac.soton.emf.translator.sdk" version="3.0.1.qualifier" installMode="root"/>
6362
<feature id="ac.soton.eventb.emf.core.extension.sdk" version="6.1.0.qualifier" installMode="root"/>
6463
<feature id="ac.soton.emf.translator.eventb.sdk" version="0.1.0.qualifier" installMode="root"/>
65-
<feature id="ac.soton.eventb.probsupport.sdk" version="0.0.0.qualifier" installMode="root"/>
64+
<feature id="ac.soton.eventb.probsupport.sdk" version="0.0.1.qualifier" installMode="root"/>
6665
<feature id="ac.soton.eventb.emf.diagrams.sdk" version="8.0.1.qualifier" installMode="root"/>
67-
<feature id="ac.soton.eventb.emf.inclusion.sdk" version="2.0.0.qualifier" installMode="root"/>
68-
<feature id="ac.soton.eventb.emf.record.sdk" version="0.1.0.qualifier" installMode="root"/>
66+
<feature id="ac.soton.eventb.emf.inclusion.sdk" version="2.0.2.qualifier" installMode="root"/>
67+
<feature id="ac.soton.eventb.emf.record.sdk" version="0.1.2.qualifier" installMode="root"/>
68+
<feature id="ac.soton.eventb.emf.containment.sdk" version="0.0.2.qualifier" installMode="root"/>
6969
</features>
7070

7171
<configurations>

‎ac.soton.rodinp.baseline/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020 University of Southampton.
3+
Copyright (c) 2020, 2021 University of Southampton.
44
55
This program and the accompanying materials
66
are made available under the terms of the Eclipse Public License 2.0
@@ -27,7 +27,7 @@
2727
<groupId>ac.soton.rodinp</groupId>
2828
<artifactId>baseline</artifactId>
2929
<name>Soton Baseline Bundle</name>
30-
<version>3.5.0-SNAPSHOT</version>
30+
<version>3.6.0-SNAPSHOT</version>
3131

3232
<repositories>
3333
<!-- Repository contains the based Rodin platform -->
@@ -39,7 +39,7 @@
3939
</repositories>
4040

4141
<properties>
42-
<bundle-suffix>BL2012</bundle-suffix>
42+
<bundle-suffix>BL2107</bundle-suffix>
4343
</properties>
4444

4545
<packaging>eclipse-repository</packaging>

‎ac.soton.rodinp.releases/Rodin.p2.inf‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
instructions.configure=\
22
mkdir(path:${installFolder}/dropins);\
3-
addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.16,name:Eclipse 2020-06);\
4-
addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.16,name:Eclipse 2020-06);\
3+
addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
4+
addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2020-12,name:2020-12);\
5+
addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.18,name:The Eclipse Project 4.18 Updates);\
6+
addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.18,name:The Eclipse Project 4.18 Updates);\
57
addRepository(type:0,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
68
addRepository(type:1,location:http${#58}//methode-b.com/update_site/atelierb_provers,name:Atelier B Provers);\
79
addRepository(type:0,location:http${#58}//rodin-b-sharp.sourceforge.net/updates,name:Rodin Plug-ins);\
@@ -20,8 +22,10 @@ instructions.configure=\
2022
addRepository(type:1,location:http${#58}//download.scala-ide.org/sdk/lithium/e44/scala211/stable/site,name:Scala);\
2123
addRepository(type:0,location:http${#58}//handbook.event-b.org/updatesite,name:Rodin Handbook);\
2224
addRepository(type:1,location:http${#58}//handbook.event-b.org/updatesite,name:Rodin Handbook);\
23-
addRepository(type:0,location:http${#58}//eventb-soton.github.io/updateSite/releases,name:UML-B and CamilleX);\
24-
addRepository(type:1,location:http${#58}//eventb-soton.github.io/updateSite/releases,name:UML-B and CamilleX);\
25-
addRepository(type:0,location:http${#58}//download.eclipse.org/modeling/tmf/xtext/updates/composite/releases,name:XText);\
26-
addRepository(type:1,location:http${#58}//download.eclipse.org/modeling/tmf/xtext/updates/composite/releases,name:XText);
25+
addRepository(type:0,location:http${#58}//download.eclipse.org/rmf/updates/releases,name:RMF Update Site);\
26+
addRepository(type:1,location:http${#58}//download.eclipse.org/rmf/updates/releases,name:RMF Update Site);\
27+
addRepository(type:0,location:http${#58}//http://download.eclipse.org/sphinx/releases/0.11.x,name:Sphinx 0.11 Update Site);\
28+
addRepository(type:1,location:http${#58}//http://download.eclipse.org/sphinx/releases/0.11.x,name:Sphinx 0.11 Update Site);\
29+
addRepository(type:0,location:http${#58}//eventb-soton.github.io/updateSite/releases,name:Soton Plug-ins);\
30+
addRepository(type:1,location:http${#58}//eventb-soton.github.io/updateSite/releases,name:Soton Plug-ins);
2731
# BEWARE ! THE PREVIOUS LINE MUST NOT END WITH A BACKSLASH

‎ac.soton.rodinp.releases/Rodin.product‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
33

4-
<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.5.0.202009111309-9f39f1653-RL2008" useFeatures="true" includeLaunchers="true">
4+
<product name="Rodin Platform" uid="org.rodinp.platform.product" id="org.rodinp.platform.product" application="org.eclipse.ui.ide.workbench" version="3.6.0.202105121522-77c344946-RL2107" useFeatures="true" includeLaunchers="true">
55

66
<aboutInfo>
77
<image path="icons/about.gif"/>
@@ -48,18 +48,19 @@
4848
</plugins>
4949

5050
<features>
51-
<feature id="org.eventb.ide" version="3.5.0.qualifier"/>
52-
<feature id="org.rodinp.platform" version="3.5.0.qualifier"/>
51+
<feature id="org.rodinp.platform" version="3.6.0.qualifier"/>
5352
<feature id="org.rodinp.handbook.feature" installMode="root"/>
54-
<feature id="ac.soton.xeventb.feature" version="2.0.0.qualifier" installMode="root"/>
53+
<feature id="ac.soton.xeventb.feature" version="2.1.0.qualifier" installMode="root"/>
5554
<feature id="ac.soton.eventb.statemachines.feature" version="4.0.1.qualifier" installMode="root"/>
5655
<feature id="ac.soton.eventb.statemachines.animation.feature" version="3.0.0.qualifier" installMode="root"/>
5756
<feature id="ac.soton.eventb.classdiagrams.feature" version="3.0.0.qualifier" installMode="root"/>
58-
<feature id="ac.soton.eventb.scenariochecker.feature" version="0.0.0.qualifier" installMode="root"/>
57+
<feature id="ac.soton.eventb.scenariochecker.feature" version="1.0.0.qualifier" installMode="root"/>
5958
<feature id="ac.soton.eventb.roseEditor.feature" version="1.7.0.qualifier" installMode="root"/>
6059
<feature id="org.eventb.smt" version="1.4.0.qualifier" installMode="root"/>
6160
<feature id="de.prob2.feature" version="3.0.10.qualifier" installMode="root"/>
61+
<feature id="org.eclipse.rmf.reqif10.pror.feature" version="0.13.0.qualifier" installMode="root"/>
6262
</features>
63+
6364

6465
<configurations>
6566
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />

‎ac.soton.rodinp.releases/pom.xml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020 University of Southampton.
3+
Copyright (c) 2020, 2021 University of Southampton.
44
55
This program and the accompanying materials
66
are made available under the terms of the Eclipse Public License 2.0
@@ -27,10 +27,10 @@
2727
<groupId>ac.soton.rodinp</groupId>
2828
<artifactId>releases</artifactId>
2929
<name>Soton Releases Bundle</name>
30-
<version>3.5.0-SNAPSHOT</version>
30+
<version>3.6.0-SNAPSHOT</version>
3131

3232
<properties>
33-
<bundle-suffix>RL2012</bundle-suffix>
33+
<bundle-suffix>RL2107</bundle-suffix>
3434
</properties>
3535

3636
<repositories>
@@ -40,6 +40,16 @@
4040
<layout>p2</layout>
4141
<url>http://rodin-b-sharp.sourceforge.net/core-updates</url>
4242
</repository>
43+
<repository>
44+
<id>rmf-updates</id>
45+
<layout>p2</layout>
46+
<url>http://download.eclipse.org/rmf/updates/releases</url>
47+
</repository>
48+
<repository>
49+
<id>sphinx-updates</id>
50+
<layout>p2</layout>
51+
<url>http://download.eclipse.org/sphinx/releases/0.11.x</url>
52+
</repository>
4353
</repositories>
4454

4555
<packaging>eclipse-repository</packaging>

‎ac.soton.rodinp.releng/pom.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2020 University of Southampton.
3+
Copyright (c) 2020, 2021 University of Southampton.
44
55
This program and the accompanying materials
66
are made available under the terms of the Eclipse Public License 2.0
@@ -26,11 +26,12 @@
2626
<www-basedir>/tmp/rodin-build/</www-basedir>
2727

2828
<!-- This should match the based Rodin platform in Rodin.product -->
29-
<rodin-version>3.5.0.202009111309-9f39f1653</rodin-version>
29+
<rodin-version>3.6.0.202105121522-77c344946</rodin-version>
3030

3131
<!-- Plug-in versions -->
3232
<tycho-version>2.0.0</tycho-version>
3333
<maven-resources-plugin-version>3.2.0</maven-resources-plugin-version>
34+
<rodinp-dev>org.rodinp.dev-3.6.0-77c344946</rodinp-dev>
3435
<!-- <maven-antrun-plugin-version>3.0.0</maven-antrun-plugin-version> -->
3536
<!-- <maven-toolchains-plugin-version>3.0.0</maven-toolchains-plugin-version> -->
3637
</properties>
@@ -57,9 +58,9 @@
5758
</repository>
5859
<!-- Eclipse Releases Update Site -->
5960
<repository>
60-
<id>2020-06</id>
61+
<id>2020-12</id>
6162
<layout>p2</layout>
62-
<url>http://download.eclipse.org/releases/2020-06</url>
63+
<url>http://download.eclipse.org/releases/2020-12</url>
6364
</repository>
6465
<!-- GMF Tooling Update Site -->
6566
<repository>
@@ -71,7 +72,14 @@
7172
<repository>
7273
<id>handbook</id>
7374
<layout>p2</layout>
74-
<url>http://handbook.event-b.org/updatesite</url>
75+
<url>https://www3.hhu.de/stups/handbook/rodin/updatesite</url>
76+
<!-- <url>http://handbook.event-b.org/updatesite</url> -->
77+
</repository>
78+
<repository>
79+
<!-- Repository contains the based Rodin platform and source -->
80+
<id>rodinp-dev</id>
81+
<layout>p2</layout>
82+
<url>file://${basedir}/../${rodinp-dev}</url>
7583
</repository>
7684
</repositories>
7785

0 commit comments

Comments
 (0)