1 files changed, 56 insertions, 63 deletions

diff --git a/doc/book-enea-linux-user-guide/doc/using_eclipse.xml b/doc/book-enea-linux-user-guide/doc/using_eclipse.xml
index 7484db4..0e8f335 100644
--- a/doc/book-enea-linux-user-guide/doc/using_eclipse.xml
+++ b/doc/book-enea-linux-user-guide/doc/using_eclipse.xml
@@ -3,72 +3,65 @@
   <title>Using Eclipse</title>
 
   <section id="install_eclipse">
-    <title>Installing Eclipse</title>
+    <title>Installing Oxygen Eclipse IDE</title>
+
+    <note>
+      <para>Yocto Eclipse Plugins are discontinued, with the last Yocto version that provides them 
+        being Yocto 2.5.</para>
+    </note>
+
+    <para>Configuration of the Eclipse Oxygen IDE should be done following the 
+      <ulink url="http://www.yoctoproject.org/docs/2.5/sdk-manual/sdk-manual.html#adt-eclipse">Yocto
+        Project Application Development and the Extensible Software Development Kit
+        (eSDK)</ulink> documentation.</para>
+    
+    <para>The installation instructions provided in Chapter 5.2.1.1 are no longer valid, please follow the 
+    steps below in order to install Eclipse Oxygen:
+    </para>
 
-    <para>For instructions on how to install Eclipse Oxygen, please refer to
-    the <ulink
-    url="http://www.yoctoproject.org/docs/2.5/sdk-manual/sdk-manual.html#adt-eclipse">Yocto
-    Project Software Development Kit (SDK) Developer's Guide</ulink>, chapter
-    4.3.2.1. Although the instructions listed there currently, refer to the
-    Neon release of Eclipse, the same steps still apply to the Oxygen release,
-    with some small differences:</para>
-
-    <itemizedlist>
+    <orderedlist>
       <listitem>
-        <para>In <emphasis role="bold">step 1</emphasis> from chapter
-        4.3.2.1.1, the URL for downloading Eclipse should be <ulink
-        url="http://www.eclipse.org/oxygen">http://www.eclipse.org/oxygen</ulink>
-        instead.</para>
+        <para>Download the <ulink
+        url="https://www.eclipse.org/downloads/packages/release/oxygen/2/eclipse-ide-cc-developers">
+       Eclipse Oxygen archive</ulink>. Make sure to select the correct architecture in the link provided, 
+          e.g. <filename>eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz</filename>.
+        </para>
       </listitem>
 
       <listitem>
-        <para>In <emphasis role="bold">step 3</emphasis> from chapter
-        4.3.2.1.2, the correct option in the drop-down menu should look like:
-        <emphasis>Oxygen -
-        http://download.eclipse.org/releases/oxygen</emphasis>.</para>
+        <para>Unzip the Eclipse archive in your home directory and start the IDE:
+            <programlisting>
+  $ tar xf ~/Downloads/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz -C ~/
+  $ ~/eclipse/eclipse
+            </programlisting>
+        </para>
       </listitem>
 
       <listitem>
-        <para>In <emphasis role="bold">step 5</emphasis> from chapter
-        4.3.2.1.2, under the category <emphasis role="bold">Mobile and Device
-        Development</emphasis>, select <emphasis role="bold">C/C++ GDB
-        Hardware Debugging</emphasis> as well.</para>
+          <para>Proceed to Chapter 5.2.1.2 in the Yocto documentation and configure Eclipse with
+              Oxygen.
+          </para>
       </listitem>
-    </itemizedlist>
+    </orderedlist>
+
+    <note>
+      <para>For compatibility reasons, only use JDK version 1.8 on your host.</para>
+        </note>
   </section>
 
   <section id="install_yocto">
-    <title>Installing Yocto Plug-ins</title>
-
-    <para>Retrieve the archive containing the Yocto Plug-ins from the Enea
-    Linux release location and save it on your local machine. The archive file
-    has the following format:
-    <filename>org.yocto.sdk-&lt;release&gt;-&lt;date&gt;-archive.zip</filename>.</para>
-
-    <para>To install the Yocto Plugins in Eclipse, follow the instructions in
-    <ulink
-    url="http://www.yoctoproject.org/docs/2.5/sdk-manual/sdk-manual.html#adt-eclipse">chapter
-    4.3.2.1.3.2</ulink>. of the Yocto Manual, starting with <emphasis
-    role="bold">step 8</emphasis>. In <emphasis role="bold">step 12</emphasis>
-    use the local archive that you downloaded previously.</para>
-
-    <para>To make sure that all required packages have been installed, go to
-    the menu <emphasis role="bold">Help &gt; Install New Software &gt; Eclipse
-    version</emphasis>, and select the version you use (e.g. Oxygen), to add
-    any missing packages. You can also check what packages are currently
-    installed by pressing the <emphasis role="bold">What is Already
-    Installed?</emphasis> link, as seen below.</para>
-
-    <mediaobject>
-      <imageobject role="fo">
-        <imagedata align="center" contentwidth="600"
-                   fileref="images/install_new_sw.svg" />
-      </imageobject>
-
-      <imageobject role="html">
-        <imagedata align="center" fileref="images/install_new_sw.png" />
-      </imageobject>
-    </mediaobject>
+    <title>Installing Yocto Plugins</title>
+
+    <para>To install the Yocto Plugins in Eclipse, follow the instructions in the <ulink 
+            url="http://www.yoctoproject.org/docs/2.5/sdk-manual/sdk-manual.html#oxygen-setting-up-the-eclipse-ide">
+        Yocto Project Application Development and the Extensible Software Development Kit
+        (eSDK)</ulink> documentation, Chapter 5.2.1.3.
+    </para>
+    <para>
+        You have the option of installing pre-built plugins from the Yocto Project Eclipse
+        update site (Chapter 5.2.1.3.1) or to install the plugins using the latest source code
+        (Chapter 5.2.1.3.2). We recommend for the first installation the use of pre-built plugins.
+    </para>
   </section>
 
   <section id="eclipse_remote_connection">
@@ -219,12 +212,12 @@ root 329 0.0 0.2 1864824 2600 ? Ssl 12:47 0:08 /usr/sbin/tcf-agent -d -L- -l0</p
       </orderedlist>
 
       <tip>
-        <para>More details on how to configure the cross-compiler can be found
+        <para>Details on how to configure the cross-compiler can be found
         in the <ulink
-        url="http://www.yoctoproject.org/docs/2.5/sdk-manual/sdk-manual.html"><emphasis>Yocto
-        Project Software Development Kit (SDK) Developer's Guide
-        2.5</emphasis></ulink>. Change the Yocto version in the link if
-        needed.</para>
+        url="http://www.yoctoproject.org/docs/2.5/sdk-manual/sdk-manual.html">Yocto
+        Project Application Development and Extensible Software Development Kit
+        (eSDK) Manual</ulink>.
+        </para>
 
         <para>There is also a good cheat sheet available in Eclipse, under
         <emphasis role="bold">Help &gt; Cheat Sheets &gt; Yocto Project &gt;
@@ -877,7 +870,7 @@ root 329 0.0 0.2 1864824 2600 ? Ssl 12:47 0:08 /usr/sbin/tcf-agent -d -L- -l0</p
                 <para>Under the <emphasis role="bold">Debugger</emphasis> tab,
                 fill in the <literal>GDB Debugger</literal> field with the
                 path to the GDB binary from the SDK. Example path:
-                <filename>&lt;extsdkdir&gt;/tmp/sysroots/x86_64-linux/usr/bin/&lt;arch&gt;-enea-linux/&lt;arch&gt;-enea-linux-gdb</filename></para>
+                <filename>&lt;extsdkdir&gt;/tmp/sysroots/x86_64/usr/bin/&lt;arch&gt;-enea-linux/&lt;arch&gt;-enea-linux-gdb</filename></para>
               </listitem>
 
               <listitem>
@@ -934,7 +927,7 @@ root 329 0.0 0.2 1864824 2600 ? Ssl 12:47 0:08 /usr/sbin/tcf-agent -d -L- -l0</p
         you can find it in the rootfs under the <literal>/boot</literal>
         folder. If you build your own kernel using bitbake, it should be
         available in your build folder. Located in, for example:
-        <filename><filename>tmp/work/corei7-64-intel-common-enea-linux/linux-intel-rt/4.14.59+gitAUTOINC+d64aec9793_6a0fa58d9e-r0/linux-corei7-64-intel-common-preempt-rt-build/vmlinux</filename></filename></para>
+        <filename><filename>tmp/work/corei7-64-intel-common-enea-linux/linux-intel/4.14.66+gitAUTOINC+d64aec9793_dd6a8b48d4-r0/linux-corei7-64-intel-common-standard-build/vmlinux</filename></filename></para>
       </listitem>
 
       <listitem>
@@ -1042,7 +1035,7 @@ root 329 0.0 0.2 1864824 2600 ? Ssl 12:47 0:08 /usr/sbin/tcf-agent -d -L- -l0</p
                 <para>Browse to the location of the <emphasis role="bold">GDB
                 binary</emphasis> installed by the cross-compilation toolchain
                 installer, by default:
-                <filename>&lt;extsdkdir&gt;/tmp/sysroots/x86_64/usr/bin/&lt;arch&gt;-enea-linux/&lt;arch&gt;-enea-linux-gdb</filename>.</para>
+                <filename>&lt;extsdkdir&gt;/tmp/sysroots/x86_64-linux/usr/bin/&lt;arch&gt;-enea-linux/&lt;arch&gt;-enea-linux-gdb</filename>.</para>
               </listitem>
 
               <listitem>
@@ -1185,7 +1178,7 @@ root 329 0.0 0.2 1864824 2600 ? Ssl 12:47 0:08 /usr/sbin/tcf-agent -d -L- -l0</p
               cross-compilation toolchain, from your <emphasis
               role="bold">Sysroot Location</emphasis>. Example:</para>
 
-              <programlisting>$ &lt;extsdkdir&gt;/tmp/sysroots/x86_64/usr/bin/\
+              <programlisting>$ &lt;extsdkdir&gt;/tmp/sysroots/x86_64-linux/usr/bin/\
 &lt;arch&gt;-enea-linux/&lt;arch&gt;-enea-linux-gdb</programlisting>
 
               <para>where <filename>&lt;sdkdir&gt;</filename> is e.g.