diff --git a/docu/Installation.md b/docu/Installation.md index 18acfac06..fd521f0d1 100644 --- a/docu/Installation.md +++ b/docu/Installation.md @@ -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) diff --git a/docu/images/install_eclipse_jdk_version.png b/docu/images/install_eclipse_jdk_version.png new file mode 100644 index 000000000..62331b5d3 Binary files /dev/null and b/docu/images/install_eclipse_jdk_version.png differ diff --git a/docu/images/install_eclipse_modeling.png b/docu/images/install_eclipse_modeling.png new file mode 100644 index 000000000..b7e3217ef Binary files /dev/null and b/docu/images/install_eclipse_modeling.png differ diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.componentInterface.xtext/META-INF/MANIFEST.MF index b518d7d49..886d6a53c 100644 --- a/plugins/de.fraunhofer.ipa.componentInterface.xtext/META-INF/MANIFEST.MF +++ b/plugins/de.fraunhofer.ipa.componentInterface.xtext/META-INF/MANIFEST.MF @@ -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, diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext/build.properties b/plugins/de.fraunhofer.ipa.componentInterface.xtext/build.properties index 094b14197..40dbfd3a5 100644 --- a/plugins/de.fraunhofer.ipa.componentInterface.xtext/build.properties +++ b/plugins/de.fraunhofer.ipa.componentInterface.xtext/build.properties @@ -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 \ No newline at end of file diff --git a/plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportCommObjectsHandler.java b/plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportCommObjectsHandler.java index a8919b897..05349c2e3 100644 --- a/plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportCommObjectsHandler.java +++ b/plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportCommObjectsHandler.java @@ -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(); diff --git a/plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportRosModel.java b/plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportRosModel.java index fb3732525..eed943092 100644 --- a/plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportRosModel.java +++ b/plugins/de.fraunhofer.ipa.ros.editor/src/ros/presentation/ImportRosModel.java @@ -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(); diff --git a/plugins/de.fraunhofer.ipa.ros.feature/feature.xml b/plugins/de.fraunhofer.ipa.ros.feature/feature.xml index 1b380bc0f..4361053f4 100644 --- a/plugins/de.fraunhofer.ipa.ros.feature/feature.xml +++ b/plugins/de.fraunhofer.ipa.ros.feature/feature.xml @@ -88,7 +88,6 @@ POSSIBILITY OF SUCH DAMAGE. - @@ -98,7 +97,6 @@ POSSIBILITY OF SUCH DAMAGE. - @@ -108,7 +106,6 @@ POSSIBILITY OF SUCH DAMAGE. - diff --git a/plugins/de.fraunhofer.ipa.ros.observer.generator/build.properties b/plugins/de.fraunhofer.ipa.ros.observer.generator/build.properties index f1db2cffa..e67fae6a6 100644 --- a/plugins/de.fraunhofer.ipa.ros.observer.generator/build.properties +++ b/plugins/de.fraunhofer.ipa.ros.observer.generator/build.properties @@ -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,\ \ No newline at end of file diff --git a/plugins/de.fraunhofer.ipa.ros.xtext/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.ros.xtext/META-INF/MANIFEST.MF index 3bdee2b42..ba4ec6ae8 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext/META-INF/MANIFEST.MF +++ b/plugins/de.fraunhofer.ipa.ros.xtext/META-INF/MANIFEST.MF @@ -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, diff --git a/plugins/de.fraunhofer.ipa.ros.xtext/build.properties b/plugins/de.fraunhofer.ipa.ros.xtext/build.properties index 094b14197..6fcb2130d 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext/build.properties +++ b/plugins/de.fraunhofer.ipa.ros.xtext/build.properties @@ -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 diff --git a/plugins/de.fraunhofer.ipa.roscode.generator/build.properties b/plugins/de.fraunhofer.ipa.roscode.generator/build.properties index b7541b62b..469e973d7 100644 --- a/plugins/de.fraunhofer.ipa.roscode.generator/build.properties +++ b/plugins/de.fraunhofer.ipa.roscode.generator/build.properties @@ -15,4 +15,3 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.apache.commons.logging,\ org.apache.log4j,\ com.ibm.icu,\ - org.eclipse.xtext.generator diff --git a/plugins/de.fraunhofer.ipa.rossystem.deployment/build.properties b/plugins/de.fraunhofer.ipa.rossystem.deployment/build.properties index b7541b62b..469e973d7 100644 --- a/plugins/de.fraunhofer.ipa.rossystem.deployment/build.properties +++ b/plugins/de.fraunhofer.ipa.rossystem.deployment/build.properties @@ -15,4 +15,3 @@ additional.bundles = org.eclipse.xtext.xbase,\ org.apache.commons.logging,\ org.apache.log4j,\ com.ibm.icu,\ - org.eclipse.xtext.generator diff --git a/plugins/de.fraunhofer.ipa.rossystem.editor/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.rossystem.editor/META-INF/MANIFEST.MF index d7fbf13e8..008b00664 100644 --- a/plugins/de.fraunhofer.ipa.rossystem.editor/META-INF/MANIFEST.MF +++ b/plugins/de.fraunhofer.ipa.rossystem.editor/META-INF/MANIFEST.MF @@ -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, diff --git a/plugins/de.fraunhofer.ipa.rossystem.xtext/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.rossystem.xtext/META-INF/MANIFEST.MF index d5de93ef7..8779ae5a6 100644 --- a/plugins/de.fraunhofer.ipa.rossystem.xtext/META-INF/MANIFEST.MF +++ b/plugins/de.fraunhofer.ipa.rossystem.xtext/META-INF/MANIFEST.MF @@ -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, diff --git a/plugins/de.fraunhofer.ipa.rossystem.xtext/build.properties b/plugins/de.fraunhofer.ipa.rossystem.xtext/build.properties index 094b14197..6fcb2130d 100644 --- a/plugins/de.fraunhofer.ipa.rossystem.xtext/build.properties +++ b/plugins/de.fraunhofer.ipa.rossystem.xtext/build.properties @@ -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