dev-manual: Updates to "Working with Eclipse" section.

I added a step on making sure they have Oracle JDK in there
to the section that builds the plugin.  Also, removed the
third method to install the plugin.

(From yocto-docs rev: cfd2b88717a709049155a8ff15134b617fc6e172)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 27 insertions, 67 deletions

diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 334ae16276..761ac982a5 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -749,12 +749,8 @@
                 <para>
                     You can install the Eclipse Yocto Plug-in into the Eclipse
                     IDE one of two ways:  use the Yocto Project's Eclipse
-                    Update site to install the pre-built plug-in, or build and
+                    Update site to install the pre-built plug-in or build and
                     install the plug-in from the latest source code.
-                    If you do not want to permanently install the plug-in but
-                    just want to try it out within the Eclipse environment,
-                    you can import the plug-in project from the Yocto Project's
-                    Source Repositories.
                 </para>
 
                 <section id='new-software'>
@@ -807,10 +803,29 @@
                         To install the Eclipse Yocto Plug-in from the latest
                         source code, follow these steps:
                         <orderedlist>
-                            <listitem><para>Open a shell and create a Git
+                            <listitem><para>Be sure your development system
+                                is not using OpenJDK to build the plug-in
+                                by doing the following:
+                                <orderedlist>
+                                    <listitem><para>Use the Oracle JDK.
+                                        If you don't have that, go to 
+                                        <ulink url='http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html'></ulink>
+                                        and download the appropriate tarball
+                                        for your development system and 
+                                        extract it into your home directory.
+                                        </para></listitem>
+                                    <listitem><para>In the shell you are going
+                                        to do your work, export the location of 
+                                        the Oracle Java as follows:
+                                        <literallayout class='monospaced'>
+     export PATH=~/jdk1.7.0_40/bin:$PATH
+                                        </literallayout></para></listitem>
+                                </orderedlist></para></listitem>                                        
+                            <listitem><para>In the same shell, create a Git
                                 repository with:
                                 <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/eclipse-poky-kepler yocto-eclipse
+     $ cd ~
+     $ git clone git://git.yoctoproject.org/eclipse-poky-kepler
                                 </literallayout>
                                 <note>
                                     If you are using Juno, the repository is
@@ -818,19 +833,19 @@
                                     <filename>git://git.yoctoproject.org/eclipse-poky-juno</filename>.
                                 </note>
                                 For this example, the repository is named
-                                <filename>~/yocto-eclipse</filename>.
+                                <filename>~/eclipse-poky-kepler</filename>.
                                 </para></listitem>
                             <listitem><para>Change to the directory where you
                                 set up the Git repository:
                                 <literallayout class='monospaced'>
-     $ cd ~/yocto-eclipse
+     $ cd ~/eclipse-poky-kepler
                                 </literallayout></para></listitem>
                             <listitem><para>Be sure you are in the right branch
                                 for your Git repository.
                                 For this release set the branch to
                                 <filename>&DISTRO_NAME;</filename>:
                                 <literallayout class='monospaced'>
-     $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
+     $ git checkout &DISTRO_NAME;
                                 </literallayout></para></listitem>
                             <listitem><para>Change to the
                                 <filename>scripts</filename>
@@ -857,7 +872,7 @@
                                 Here is an example that uses the
                                 <filename>&DISTRO_NAME;</filename> branch:
                                 <literallayout class='monospaced'>
-     $ ECLIPSE_HOME=/home/scottrif/yocto-eclipse/scripts/eclipse ./build.sh &DISTRO_NAME; &DISTRO_NAME;
+     $ ECLIPSE_HOME=/home/scottrif/eclipse-poky-kepler/scripts/eclipse ./build.sh &DISTRO_NAME; &DISTRO_NAME;
                                 </literallayout>
                                 After running the script, the file
                                 <filename>org.yocto.sdk-&lt;release&gt;-&lt;date&gt;-archive.zip</filename>
@@ -879,7 +894,7 @@
                                 </para></listitem>
                             <listitem><para>Click through the "Okay" buttons.
                                 </para></listitem>
-                            <listitem><para>Check the box next to the new entry
+                            <listitem><para>Check the boxes 
                                 in the installation window and complete
                                 the installation.</para></listitem>
                             <listitem><para>Restart the Eclipse IDE if
@@ -893,61 +908,6 @@
                         "<link linkend='configuring-the-eclipse-yocto-plug-in'>Configuring the Eclipse Yocto Plug-in</link>"
                         section.</para>
                 </section>
-
-                <section id='yocto-project-source'>
-                    <title>Importing the Plug-in Project into the Eclipse Environment</title>
-
-                    <para>
-                        Importing the Eclipse Yocto Plug-in project from the
-                        Yocto Project source repositories is useful when you
-                        want to try out the latest plug-in from the tip of
-                        plug-in's development tree.
-                        It is important to understand when you import the
-                        plug-in you are not installing it into the Eclipse
-                        application.
-                        Rather, you are importing the project and just using it.
-                    </para>
-
-                    <para>
-                        To import the plug-in project, follow these steps:
-                        <orderedlist>
-                            <listitem><para>Open a shell and create a Git
-                                repository with:
-                                <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/eclipse-poky-kepler yocto-eclipse
-                                </literallayout>
-                                <note>
-                                    The Juno 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>
-                            <listitem><para>In Eclipse, select "Import" from
-                                the "File" menu.</para></listitem>
-                            <listitem><para>Expand the "General" box and select
-                                "existing projects into workspace" and then
-                                click "Next".</para></listitem>
-                            <listitem><para>Select the root directory and
-                                browse to
-                                <filename>~/yocto-eclipse/plugins</filename>.
-                                </para></listitem>
-                            <listitem><para>Three plug-ins exist:
-                                <filename>org.yocto.bc.ui</filename>,
-                                <filename>org.yocto.sdk.ide</filename>, and
-                                <filename>org.yocto.sdk.remotetools</filename>.
-                                Select and import all of them.</para></listitem>
-                        </orderedlist>
-                    </para>
-
-                    <para>
-                        The left navigation pane in the Eclipse application
-                        shows the default projects.
-                        Right-click on one of these projects and run it as an
-                        Eclipse application to bring up a second instance of
-                        Eclipse IDE that has the Yocto Plug-in.
-                    </para>
-                </section>
             </section>
 
             <section id='configuring-the-eclipse-yocto-plug-in'>