Skip to content

Commit

Permalink
Minor updates to allow the release creation of the version 2.0.0 of t…
Browse files Browse the repository at this point in the history
…he tooling
  • Loading branch information
ipa-nhg committed Feb 28, 2024
1 parent 7e60b9a commit 7352eb0
Show file tree
Hide file tree
Showing 16 changed files with 19 additions and 24 deletions.
22 changes: 14 additions & 8 deletions docu/Installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,27 @@

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

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.
First the java environment have to be setup:

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

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.
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".

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

(*) 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:
Press next, and then pick the java version 19 and the folder where you would like to install eclipse.

| Name | Code version | Update Site Link | Description |
|---|---|---|---|
|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. |
| 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**|
![alt text](images/install_eclipse_jdk_version.png)

Continue the installation, acepting the license, as usual.

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.

![alt text](images/install_updatesite.png)

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.

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

Expand Down
Binary file added docu/images/install_eclipse_jdk_version.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docu/images/install_eclipse_modeling.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: de.fraunhofer.ipa.componentInterface,
org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.util,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
org.eclipse.xtext.generator,\
org.eclipse.emf.mwe2.launch
org.eclipse.emf.mwe2.launch
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static Object CloneAndImport() throws InvocationTargetException, Interrup
Git.cloneRepository()
.setURI("https://github.com/ipa320/RosCommonObjects.git")
.setDirectory(git_file)
.setBranch("2.0.0")
.call();
} catch (InvalidRemoteException e) {
e.printStackTrace();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ protected void execute(IProgressMonitor progressMonitor) {
Git.cloneRepository()
.setURI("https://github.com/ipa320/RosCommonObjects.git")
.setDirectory(git_file)
.setBranch("2.0.0")
.call();
} catch (InvalidRemoteException e) {
e.printStackTrace();
Expand Down
3 changes: 0 additions & 3 deletions plugins/de.fraunhofer.ipa.ros.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ POSSIBILITY OF SUCH DAMAGE.
<import plugin="de.fraunhofer.ipa.componentInterface.edit"/>
<import plugin="org.eclipse.xtext"/>
<import plugin="org.eclipse.xtext.xbase"/>
<import plugin="org.eclipse.equinox.common" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.util"/>
<import plugin="org.eclipse.xtend.lib" version="2.14.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.navigator"/>
Expand All @@ -98,7 +97,6 @@ POSSIBILITY OF SUCH DAMAGE.
<import plugin="de.fraunhofer.ipa.rossystem.edit"/>
<import plugin="org.eclipse.emf.ecore.xmi"/>
<import plugin="org.eclipse.emf.edit.ui"/>
<import plugin="org.eclipse.equinox.registry"/>
<import plugin="org.eclipse.emf.transaction"/>
<import plugin="org.eclipse.sirius.ui"/>
<import plugin="de.fraunhofer.ipa.rossystem.xtext.ide"/>
Expand All @@ -108,7 +106,6 @@ POSSIBILITY OF SUCH DAMAGE.
<import plugin="org.eclipse.emf.common.ui"/>
<import plugin="org.eclipse.jface"/>
<import plugin="org.eclipse.swt"/>
<import plugin="javax.inject"/>
<import plugin="org.eclipse.sirius.diagram"/>
<import feature="org.eclipse.sirius.specifier"/>
</requires>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.objectweb.asm,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
org.eclipse.xtext.generator
com.ibm.icu,\
1 change: 0 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.xtext/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: de.fraunhofer.ipa.ros,
org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.util,
Expand Down
1 change: 0 additions & 1 deletion plugins/de.fraunhofer.ipa.ros.xtext/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
org.eclipse.xtext.generator,\
org.eclipse.emf.mwe2.launch
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
org.eclipse.xtext.generator
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
org.eclipse.xtext.generator
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport,
de.fraunhofer.ipa.componentInterface.edit;visibility:=reexport,
de.fraunhofer.ipa.ros.edit;visibility:=reexport,
org.eclipse.equinox.registry
de.fraunhofer.ipa.ros.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
Import-Package: com.google.inject;version="1.3.0",
de.fraunhofer.ipa.rossystem.xtext.ui.internal,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: de.fraunhofer.ipa.rossystem,
org.eclipse.xtext,
org.eclipse.xtext.xbase,
org.eclipse.equinox.common,
org.eclipse.xtext.xbase.lib,
org.antlr.runtime,
org.eclipse.xtext.util,
Expand Down
1 change: 0 additions & 1 deletion plugins/de.fraunhofer.ipa.rossystem.xtext/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
org.apache.commons.logging,\
org.apache.log4j,\
com.ibm.icu,\
org.eclipse.xtext.generator,\
org.eclipse.emf.mwe2.launch

0 comments on commit 7352eb0

Please sign in to comment.