summaryrefslogtreecommitdiffstats
path: root/documentation/sdk-manual
diff options
context:
space:
mode:
Diffstat (limited to 'documentation/sdk-manual')
-rw-r--r--documentation/sdk-manual/sdk-eclipse-project.xml30
1 files changed, 15 insertions, 15 deletions
diff --git a/documentation/sdk-manual/sdk-eclipse-project.xml b/documentation/sdk-manual/sdk-eclipse-project.xml
index 56506e7a26..9154f1f280 100644
--- a/documentation/sdk-manual/sdk-eclipse-project.xml
+++ b/documentation/sdk-manual/sdk-eclipse-project.xml
@@ -194,7 +194,7 @@
194 following: 194 following:
195 <orderedlist> 195 <orderedlist>
196 <listitem><para> 196 <listitem><para>
197 Install the Neon version of the Eclipse IDE. 197 Install the Oxygen version of the Eclipse IDE.
198 </para></listitem> 198 </para></listitem>
199 <listitem><para> 199 <listitem><para>
200 Configure the Eclipse IDE. 200 Configure the Eclipse IDE.
@@ -219,12 +219,12 @@
219 219
220 <para> 220 <para>
221 Follow these steps to locate, install, and configure 221 Follow these steps to locate, install, and configure
222 Neon Eclipse: 222 Oxygen Eclipse:
223 <orderedlist> 223 <orderedlist>
224 <listitem><para> 224 <listitem><para>
225 <emphasis>Locate the Neon Download:</emphasis> 225 <emphasis>Locate the Oxygen Download:</emphasis>
226 Open a browser and go to 226 Open a browser and go to
227 <ulink url='http://www.eclipse.org/neon/'>http://www.eclipse.org/neon/</ulink>. 227 <ulink url='http://www.eclipse.org/oxygen/'>http://www.eclipse.org/oxygen/</ulink>.
228 </para></listitem> 228 </para></listitem>
229 <listitem><para> 229 <listitem><para>
230 <emphasis>Download the Tarball:</emphasis> 230 <emphasis>Download the Tarball:</emphasis>
@@ -259,13 +259,13 @@
259 </para></listitem> 259 </para></listitem>
260 <listitem><para> 260 <listitem><para>
261 <emphasis>Install the Software:</emphasis> 261 <emphasis>Install the Software:</emphasis>
262 Accept the default "cpp-neon" directory and 262 Accept the default "cpp-oxygen" directory and
263 click "Install". 263 click "Install".
264 Accept any license agreements and approve any 264 Accept any license agreements and approve any
265 certificates. 265 certificates.
266 </para></listitem> 266 </para></listitem>
267 <listitem><para> 267 <listitem><para>
268 <emphasis>Launch Neon:</emphasis> 268 <emphasis>Launch Oxygen:</emphasis>
269 Click the "Launch" button and accept the 269 Click the "Launch" button and accept the
270 default "workspace". 270 default "workspace".
271 </para></listitem> 271 </para></listitem>
@@ -277,7 +277,7 @@
277 <title>Configuring the Oxygen Eclipse IDE</title> 277 <title>Configuring the Oxygen Eclipse IDE</title>
278 278
279 <para> 279 <para>
280 Follow these steps to configure the Neon Eclipse IDE. 280 Follow these steps to configure the Oxygen Eclipse IDE.
281 <note> 281 <note>
282 Depending on how you installed Eclipse and what 282 Depending on how you installed Eclipse and what
283 you have already done, some of the options will 283 you have already done, some of the options will
@@ -296,7 +296,7 @@
296 </para></listitem> 296 </para></listitem>
297 <listitem><para> 297 <listitem><para>
298 Select 298 Select
299 "Neon - http://download.eclipse.org/releases/neon" 299 "Oxygen - http://download.eclipse.org/releases/oxygen"
300 from the "Work with:" pull-down menu. 300 from the "Work with:" pull-down menu.
301 </para></listitem> 301 </para></listitem>
302 <listitem><para> 302 <listitem><para>
@@ -364,7 +364,7 @@
364 </para></listitem> 364 </para></listitem>
365 <listitem><para> 365 <listitem><para>
366 Enter 366 Enter
367 <filename>&ECLIPSE_DL_PLUGIN_URL;/neon</filename> 367 <filename>&ECLIPSE_DL_PLUGIN_URL;/oxygen</filename>
368 in the URL field and provide a meaningful 368 in the URL field and provide a meaningful
369 name in the "Name" field. 369 name in the "Name" field.
370 </para></listitem> 370 </para></listitem>
@@ -427,12 +427,12 @@
427 Use Git to create the correct tag: 427 Use Git to create the correct tag:
428 <literallayout class='monospaced'> 428 <literallayout class='monospaced'>
429 $ cd ~/eclipse-yocto 429 $ cd ~/eclipse-yocto
430 $ git checkout neon/yocto-&DISTRO; 430 $ git checkout -b oxygen/yocto-&DISTRO; remotes/origin/oxygen-master
431 </literallayout> 431 </literallayout>
432 This creates a local tag named 432 This creates a local tag named
433 <filename>neon/yocto-&DISTRO;</filename> 433 <filename>oxygen/yocto-&DISTRO;</filename>
434 based on the branch 434 based on the branch
435 <filename>origin/neon-master</filename>. 435 <filename>origin/oxygen-master</filename>.
436 You are put into a detached HEAD state, 436 You are put into a detached HEAD state,
437 which is fine since you are only going to 437 which is fine since you are only going to
438 be building and not developing. 438 be building and not developing.
@@ -466,11 +466,11 @@
466 <para> 466 <para>
467 Following is an example: 467 Following is an example:
468 <literallayout class='monospaced'> 468 <literallayout class='monospaced'>
469 $ ECLIPSE_HOME=/home/scottrif/eclipse-yocto/scripts/eclipse ./build.sh -l neon/yocto-&DISTRO; master yocto-&DISTRO; 2>&amp;1 | tee build.log 469 $ ECLIPSE_HOME=/home/scottrif/eclipse-yocto/scripts/eclipse ./build.sh -l oxygen/yocto-&DISTRO; master yocto-&DISTRO; 2>&amp;1 | tee build.log
470 </literallayout> 470 </literallayout>
471 The previous example command adds the tag 471 The previous example command adds the tag
472 you need for 472 you need for
473 <filename>mars/yocto-&DISTRO;</filename> 473 <filename>oxygen/yocto-&DISTRO;</filename>
474 to <filename>HEAD</filename>, then tells 474 to <filename>HEAD</filename>, then tells
475 the build script to use the local (-l) Git 475 the build script to use the local (-l) Git
476 checkout for the build. 476 checkout for the build.
@@ -540,7 +540,7 @@
540 <title>Configuring the Oxygen Eclipse Yocto Plug-in</title> 540 <title>Configuring the Oxygen Eclipse Yocto Plug-in</title>
541 541
542 <para> 542 <para>
543 Configuring the Neon Eclipse Yocto Plug-in involves 543 Configuring the Oxygen Eclipse Yocto Plug-in involves
544 setting the Cross Compiler options and the Target 544 setting the Cross Compiler options and the Target
545 options. 545 options.
546 The configurations you choose become the default 546 The configurations you choose become the default