From 0f0db8afde96f2bb1e3844385ac920314eabeaaa Mon Sep 17 00:00:00 2001
From: Scott Rifenbark <scott.m.rifenbark@intel.com>
Date: Tue, 27 Nov 2012 18:55:56 -0600
Subject: documentation: dev-manual - Updated installing YP eclipse plugin from
 code

Fixes [YOCTO #3445]

Updated the "Installing the Plug-in Using the Latest Source Code"
section for the Eclipse section.  This was pretty much out of
whack.  I have created new steps that involve running the setup
script and then running the build script.  The new information
still needs a review.

(From yocto-docs rev: 5903964a9583c6051abefa4a7b944b59a76825b4)

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 | 43 ++++++++++++++-------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'documentation/dev-manual')

diff --git a/documentation/dev-manual/dev-manual-model.xml b/documentation/dev-manual/dev-manual-model.xml
index 25ccae1c30..3ec9eae37b 100644
--- a/documentation/dev-manual/dev-manual-model.xml
+++ b/documentation/dev-manual/dev-manual-model.xml
@@ -849,36 +849,39 @@
                                 </literallayout>
                                 For this example, the repository is named     
                                 <filename>~/yocto-eclipse</filename>.</para></listitem>
+                            <listitem><para>Change to the directory where you set up 
+                                the Git repository:
+                                <literallayout class='monospaced'>
+     $ cd ~/yocto-eclipse
+                                </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;
                                 </literallayout></para></listitem>
-                            <listitem><para>Locate the <filename>build.sh</filename> script in the 
-                                Git repository you created in the previous step.
-                                The script is located in the <filename>scripts</filename>.</para></listitem>
-                            <listitem><para>Be sure to set and export the <filename>ECLIPSE_HOME</filename> environment
-                                variable to the top-level directory in which you installed your version of Eclipse.
-                                For example, if your Eclipse directory is <filename>$HOME/eclipse</filename>, 
-                                use the following:
+                            <listitem><para>Change to the <filename>scripts</filename>
+                                directory within the Git repository:
                                 <literallayout class='monospaced'>
-     $ export ECLIPSE_HOME=$HOME/eclipse
+     $ cd scripts
                                 </literallayout></para></listitem>
-                            <listitem><para>Be sure you have the right branch in the Poky Git repository
-                                checked out.
-                                For example, the following commands checkout the <filename>&DISTRO_NAME;</filename>
-                                branch in the local Poky Git repository:
+                            <listitem><para>Set up the local build environment by running the 
+                                setup script:
                                 <literallayout class='monospaced'>
-     $ cd ~/poky
-     $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
+     $ ./setup.sh
                                 </literallayout></para></listitem>
-                            <listitem><para>Move back to your Yocto Eclipse directory and 
-                                run the <filename>build.sh</filename> script.  
-                                Provide the name of the Git branch along with the Yocto Project release you are 
-                                using.
+                            <listitem><para>When the script finishes execution, it prompts
+                                you with instructions on how to run the 
+                                <filename>build.sh</filename> script, which is also in 
+                                the <filename>scripts</filename> of the  
+                                Git repository created earlier.
+                                </para></listitem>
+                            <listitem><para>Run the <filename>build.sh</filename> script
+                                as directed.  
+                                Be sure to provide the name of the Git branch along with the 
+                                Yocto Project release you are using.
                                 Here is an example that uses the <filename>&DISTRO_NAME;</filename> branches:
                                 <literallayout class='monospaced'>
-     $ scripts/build.sh &DISTRO_NAME; &DISTRO_NAME; 
+     $ ECLIPSE_HOME=/home/scottrif/yocto-eclipse/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>
@@ -890,7 +893,7 @@
                             <listitem><para>Click "Add".</para></listitem>
                             <listitem><para>Provide anything you want in the "Name" field.</para></listitem>
                             <listitem><para>Click "Archive" and browse to the ZIP file you built 
-                                in step four.  
+                                in step seven.  
                                 This ZIP file should not be "unzipped", and must be the 
                                 <filename>*archive.zip</filename> file created by running the 
                                 <filename>build.sh</filename> script.</para></listitem>
-- 
cgit v1.2.3-54-g00ecf