From 395486f638b31e7c74ecd12e7fd8f79ad4e00a00 Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Thu, 19 Sep 2013 22:29:37 -0700
Subject: [PATCH] dev-manual: First pass changes to support Kepler Eclipse

First pass at changes to support Eclipse Kepler 4.3 release.

(From yocto-docs rev: 265bc3f4ae3442b2fd0490d0f4558c7a584cb31c)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/dev-manual/dev-manual-model.xml | 90 ++++++-------------
 1 file changed, 28 insertions(+), 62 deletions(-)

diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 3474d05546..a2dabf0185 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -667,9 +667,6 @@
                     However, if you currently have the Juno 4.2 version
                     installed and you do not want to upgrade the IDE, you can
                     configure Juno to work with the Yocto Project.
-                    See the
-                    "<link linkend='configuring-the-eclipse-ide-juno'>Configuring the Eclipse IDE (Juno)</link>"
-                    section.
                 </para>
 
                 <para>
@@ -696,19 +693,17 @@
                 </para>
             </section>
 
-            <section id='configuring-the-eclipse-ide-kepler'>
-                <title>Configuring the Eclipse IDE (Kepler)</title>
+            <section id='configuring-the-eclipse-ide'>
+                <title>Configuring the Eclipse IDE</title>
 
                 <para>
                     This section presents the steps needed to configure the
-                    Kepler 4.3 Eclipse IDE.
-                    If you are using Juno 4.2, see the
-                    "<link linkend='configuring-the-eclipse-ide-juno'>Configuring the Eclipse IDE (Juno)</link>".
+                    Eclipse IDE.
                 </para>
 
                 <para>
                     Before installing and configuring the Eclipse Yocto Plug-in,
-                    you need to configure the Kepler 4.3 Eclipse IDE.
+                    you need to configure the Eclipse IDE.
                     Follow these general steps:
                     <orderedlist>
                         <listitem><para>Start the Eclipse IDE.</para></listitem>
@@ -716,8 +711,12 @@
                             select "Install New Software" from the "Help"
                             pull-down menu.</para></listitem>
                         <listitem><para>Select
-                            <filename>Juno - &ECLIPSE_JUNO_URL;</filename>
+                            <filename>Kepler - &ECLIPSE_KEPLER_URL;</filename>
                             from the "Work with:" pull-down menu.
+                            <note>
+                                For Juno, select
+                                <filename>Juno - &ECLIPSE_JUNO_URL;</filename>
+                            </note>
                             </para></listitem>
                         <listitem><para>Expand the box next to "Linux Tools"
                             and select the
@@ -744,52 +743,6 @@
                 </para>
             </section>
 
-            <section id='configuring-the-eclipse-ide-juno'>
-                <title>Configuring the Eclipse IDE (Juno)</title>
-
-                <para>
-                    This section presents the steps needed to configure the
-                    Juno 4.2 Eclipse IDE.
-                </para>
-
-                <para>
-                    Before installing and configuring the Eclipse Yocto Plug-in,
-                    you need to configure the Juno 4.2 Eclipse IDE.
-                    Follow these general steps:
-                    <orderedlist>
-                        <listitem><para>Start the Eclipse IDE.</para></listitem>
-                        <listitem><para>Make sure you are in your Workbench and
-                            select "Install New Software" from the "Help"
-                            pull-down menu.</para></listitem>
-                        <listitem><para>Select
-                            <filename>Juno - &ECLIPSE_JUNO_URL;</filename>
-                            from the "Work with:" pull-down menu.
-                            </para></listitem>
-                        <listitem><para>Expand the box next to "Linux Tools"
-                            and select the
-                            <filename>LTTng - Linux Tracing Toolkit</filename> boxes.
-                            </para></listitem>
-                        <listitem><para>Expand the box next to "Mobile and
-                            Device Development" and select the following boxes:
-                            <itemizedlist>
-                                <listitem><para><filename>C/C++ Remote Launch</filename></para></listitem>
-                                <listitem><para><filename>Remote System Explorer End-user Runtime</filename></para></listitem>
-                                <listitem><para><filename>Remote System Explorer User Actions</filename></para></listitem>
-                                <listitem><para><filename>Target Management Terminal</filename></para></listitem>
-                                <listitem><para><filename>TCF Remote System Explorer add-in</filename></para></listitem>
-                                <listitem><para><filename>TCF Target Explorer</filename></para></listitem>
-                            </itemizedlist></para></listitem>
-                        <listitem><para>Expand the box next to "Programming
-                            Languages" and select the
-                            <filename>Autotools Support for CDT</filename>
-                            and <filename>C/C++ Development Tools</filename>
-                            boxes.</para></listitem>
-                        <listitem><para>Complete the installation and restart
-                            the Eclipse IDE.</para></listitem>
-                    </orderedlist>
-                </para>
-            </section>
-
             <section id='installing-the-eclipse-yocto-plug-in'>
                 <title>Installing or Accessing the Eclipse Yocto Plug-in</title>
 
@@ -819,17 +772,25 @@
                             <listitem><para>Click "Add..." in the "Work with:"
                                 area.</para></listitem>
                            <listitem><para>Enter
-                                <filename>&ECLIPSE_DL_PLUGIN_URL;</filename>
+                                <filename>&ECLIPSE_DL_PLUGIN_URL;/kepler</filename>
                                 in the URL field and provide a meaningful name
-                                in the "Name" field.</para></listitem>
+                                in the "Name" field.
+                                <note>
+                                    If you are using Juno, use
+                                    <filename>&ECLIPSE_DL_PLUGIN_URL;/juno</filename>
+                                    in the URL field.
+                                </note></para></listitem>
                             <listitem><para>Click "OK" to have the entry added
                                 to the "Work with:" drop-down list.
                                 </para></listitem>
                             <listitem><para>Select the entry for the plug-in
                                 from the "Work with:" drop-down list.
                                 </para></listitem>
-                            <listitem><para>Check the box next to
-                                <filename>Development tools and SDKs for Yocto Linux</filename>.
+                            <listitem><para>Check the boxes next to
+                                <filename>Yocto Project ADT Plug-in</filename>,
+                                <filename>Yocto Project Bitbake Commander Plug-in</filename>,
+                                and
+                                <filename>Yocto Project Documentation plug-in</filename>.
                                 </para></listitem>
                             <listitem><para>Complete the remaining software
                                 installation steps and then restart the Eclipse
@@ -849,8 +810,13 @@
                             <listitem><para>Open a shell and create a Git
                                 repository with:
                                 <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/eclipse-poky yocto-eclipse
+     $ git clone git://git.yoctoproject.org/eclipse-poky-kepler yocto-eclipse
                                 </literallayout>
+                                <note>
+                                    If you are using Juno, the repository is
+                                    located at
+                                    <filename>git://git.yoctoproject.org/eclipse-poky-juno</filename>.
+                                </note>
                                 For this example, the repository is named
                                 <filename>~/yocto-eclipse</filename>.
                                 </para></listitem>
@@ -1129,7 +1095,7 @@
                                 <filename>Build system derived toolchain</filename>,
                                 the target kernel you built will be located in
                                 the Build Directory in
-                                <filename>tmp/deploy/images</filename>
+                                <filename>tmp/deploy/images/&lt;machine&gt;</filename>
                                 directory.
                                 If you selected
                                 <filename>Standalone pre-built toolchain</filename>,