Skip to content

Commit 1af1885

Browse files
committed
Minor updates to allow the release creation of the version 2.0.0 of the tooling
1 parent 94269e6 commit 1af1885

File tree

14 files changed

+19
-24
lines changed

14 files changed

+19
-24
lines changed

docu/Installation.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,27 @@
22

33
### Option 1: Using the Release version (Recommended)
44

5-
In Eclipse, go to *Help* > *Install New Software...*. To install the latest version of the ROS tooling, add the update site URL [http://ros-model.seronet-project.de/updatesite/latest/](http://ros-model.seronet-project.de/updatesite/latest/)(*) in the *Work with* section. If you wish to install an earlier version instead, go to the [the update site](http://ros-model.seronet-project.de/updatesite/), choose the desired version and copy its URL.
5+
First the java environment have to be setup:
66

7-
![alt text](images/install_updatesite.png)
7+
```
8+
sudo apt-get install openjdk-19-jre
9+
```
810

9-
If none package is listed, please uncheck the option *Group items by category*. The category *ROS Model* appears in the *Name* area. Check the box in front of *ROS model* and click *Next* to review the list of items to be installed. Click *Next* again to read and accept the terms of the license agreements and afterwards click *Finish*. Eclipse will then start to install the ROS tooling and its dependencies. If you get a security warning about the authenticity, click OK. Finally, when asked, restart Eclipse to complete the installation process.
11+
Then Eclipse can be installes. Please download the installer from the official eclipse [website](https://www.eclipse.org/downloads/packages/installer). Once you start the installer, select the package "Eclipse Modeling Tools".
1012

13+
![alt text](images/install_eclipse_modeling.png)
1114

12-
(*) Apart of the latest stable release of the tooling, some pre-releases for new feautures are available. See the following list of current pre-releases:
15+
Press next, and then pick the java version 19 and the folder where you would like to install eclipse.
1316

14-
| Name | Code version | Update Site Link | Description |
15-
|---|---|---|---|
16-
|TestComponentStack|https://github.com/ipa320/ros-model/tree/1.4.0_TestComponentStacks|http://ros-model.seronet-project.de/updatesite/TestComponentStacks/latest/| Added to the RosSystem metamodel the option to group components forming components stacks. This pre-release is backward compatible for the models, but the validators and generators are **not** updated. If Xtext report errors, please ignore them. |
17-
| v1.5 | https://github.com/ipa320/ros-model/tree/1.5.0_pre-release |http://ros-model.seronet-project.de/updatesite/pre-release/latest/| Long term version of the grammar (simplified for the 1.4 release). **This version is not backwards compatible with 1.3 and earlier releases**|
17+
![alt text](images/install_eclipse_jdk_version.png)
1818

19+
Continue the installation, acepting the license, as usual.
1920

21+
Once the installation is completed, go to *Help* > *Install New Software...*. To install the latest version of the ROS tooling, add the update site URL [https://raw.githubusercontent.com/ipa320/RosTooling-update-site/2.0.0](https://raw.githubusercontent.com/ipa320/RosTooling-update-site/2.0.0)(*) in the *Work with* section.
22+
23+
![alt text](images/install_updatesite.png)
24+
25+
If none package is listed, please uncheck the option *Group items by category*. The category *ROS Model* appears in the *Name* area. Check the box in front of *ROS model* and click *Next* to review the list of items to be installed. Click *Next* again to read and accept the terms of the license agreements and afterwards click *Finish*. Eclipse will then start to install the ROS tooling and its dependencies. If you get a security warning about the authenticity, click OK. Finally, when asked, restart Eclipse to complete the installation process.
2026

2127
To start using the ROS tooling continue with the [step 1](#1-switch-to-the-ros-developer-perspective)
2228

plugins/de.fraunhofer.ipa.componentInterface.xtext/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-ActivationPolicy: lazy
88
Require-Bundle: de.fraunhofer.ipa.componentInterface,
99
org.eclipse.xtext,
1010
org.eclipse.xtext.xbase,
11-
org.eclipse.equinox.common,
1211
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
1312
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
1413
org.eclipse.xtext.util,

plugins/de.fraunhofer.ipa.componentInterface.xtext/build.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
1515
org.apache.commons.logging,\
1616
org.apache.log4j,\
1717
com.ibm.icu,\
18-
org.eclipse.xtext.generator,\
19-
org.eclipse.emf.mwe2.launch
18+
org.eclipse.emf.mwe2.launch

plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportCommObjectsHandler.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public static Object CloneAndImport() throws InvocationTargetException, Interrup
4343
Git.cloneRepository()
4444
.setURI("https://github.com/ipa320/RosCommonObjects.git")
4545
.setDirectory(git_file)
46+
.setBranch("2.0.0")
4647
.call();
4748
} catch (InvalidRemoteException e) {
4849
e.printStackTrace();

plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportRosModel.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ protected void execute(IProgressMonitor progressMonitor) {
9898
Git.cloneRepository()
9999
.setURI("https://github.com/ipa320/RosCommonObjects.git")
100100
.setDirectory(git_file)
101+
.setBranch("2.0.0")
101102
.call();
102103
} catch (InvalidRemoteException e) {
103104
e.printStackTrace();

plugins/de.fraunhofer.ipa.ros.feature/feature.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ POSSIBILITY OF SUCH DAMAGE.
8888
<import plugin="de.fraunhofer.ipa.componentInterface.edit"/>
8989
<import plugin="org.eclipse.xtext"/>
9090
<import plugin="org.eclipse.xtext.xbase"/>
91-
<import plugin="org.eclipse.equinox.common" match="greaterOrEqual"/>
9291
<import plugin="org.eclipse.xtext.util"/>
9392
<import plugin="org.eclipse.xtend.lib" version="2.14.0" match="greaterOrEqual"/>
9493
<import plugin="org.eclipse.ui.navigator"/>
@@ -98,7 +97,6 @@ POSSIBILITY OF SUCH DAMAGE.
9897
<import plugin="de.fraunhofer.ipa.rossystem.edit"/>
9998
<import plugin="org.eclipse.emf.ecore.xmi"/>
10099
<import plugin="org.eclipse.emf.edit.ui"/>
101-
<import plugin="org.eclipse.equinox.registry"/>
102100
<import plugin="org.eclipse.emf.transaction"/>
103101
<import plugin="org.eclipse.sirius.ui"/>
104102
<import plugin="de.fraunhofer.ipa.rossystem.xtext.ide"/>
@@ -108,7 +106,6 @@ POSSIBILITY OF SUCH DAMAGE.
108106
<import plugin="org.eclipse.emf.common.ui"/>
109107
<import plugin="org.eclipse.jface"/>
110108
<import plugin="org.eclipse.swt"/>
111-
<import plugin="javax.inject"/>
112109
<import plugin="org.eclipse.sirius.diagram"/>
113110
<import feature="org.eclipse.sirius.specifier"/>
114111
</requires>

plugins/de.fraunhofer.ipa.ros.observer.generator/build.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
1515
org.objectweb.asm,\
1616
org.apache.commons.logging,\
1717
org.apache.log4j,\
18-
com.ibm.icu,\
19-
org.eclipse.xtext.generator
18+
com.ibm.icu,\

plugins/de.fraunhofer.ipa.ros.xtext/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-ActivationPolicy: lazy
88
Require-Bundle: de.fraunhofer.ipa.ros,
99
org.eclipse.xtext,
1010
org.eclipse.xtext.xbase,
11-
org.eclipse.equinox.common,
1211
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
1312
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
1413
org.eclipse.xtext.util,

plugins/de.fraunhofer.ipa.ros.xtext/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
1515
org.apache.commons.logging,\
1616
org.apache.log4j,\
1717
com.ibm.icu,\
18-
org.eclipse.xtext.generator,\
1918
org.eclipse.emf.mwe2.launch

plugins/de.fraunhofer.ipa.roscode.generator/build.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ additional.bundles = org.eclipse.xtext.xbase,\
1515
org.apache.commons.logging,\
1616
org.apache.log4j,\
1717
com.ibm.icu,\
18-
org.eclipse.xtext.generator

0 commit comments

Comments
 (0)