[Esbox-commits] r1067 - in trunk/org.maemo.esbox.help: . html/gettingstarted html/images html/images/pref_images html/reference
jeffc at garage.maemo.org
jeffc at garage.maemo.org
Sat Dec 13 00:18:35 EET 2008
Author: jeffc
Date: 2008-12-13 00:18:34 +0200 (Sat, 13 Dec 2008)
New Revision: 1067
Modified:
trunk/org.maemo.esbox.help/html/gettingstarted/Introduction.html
trunk/org.maemo.esbox.help/html/gettingstarted/ProfilingMaemoApplications.html
trunk/org.maemo.esbox.help/html/gettingstarted/SettingPreferences.html
trunk/org.maemo.esbox.help/html/gettingstarted/virtualmachine.html
trunk/org.maemo.esbox.help/html/images/buildmachine_qemu.png
trunk/org.maemo.esbox.help/html/images/buildmachine_qemu_machine.png
trunk/org.maemo.esbox.help/html/images/buildmachine_qemu_shfold.png
trunk/org.maemo.esbox.help/html/images/buildmachines.png
trunk/org.maemo.esbox.help/html/images/debug_python.png
trunk/org.maemo.esbox.help/html/images/debugperspec.png
trunk/org.maemo.esbox.help/html/images/maketarget1.jpg
trunk/org.maemo.esbox.help/html/images/pref_images/maemo_pref.png
trunk/org.maemo.esbox.help/html/images/pref_images/pref_maemo_env.png
trunk/org.maemo.esbox.help/html/images/pref_images/sbox1.png
trunk/org.maemo.esbox.help/html/images/pref_images/sbox2.png
trunk/org.maemo.esbox.help/html/images/pref_images/ssh.png
trunk/org.maemo.esbox.help/html/images/pref_images/targets.png
trunk/org.maemo.esbox.help/html/images/pref_images/xserver.png
trunk/org.maemo.esbox.help/html/images/profiling4.jpg
trunk/org.maemo.esbox.help/html/images/runpython.png
trunk/org.maemo.esbox.help/html/images/setbreakpoint.png
trunk/org.maemo.esbox.help/html/images/xserver.png
trunk/org.maemo.esbox.help/html/reference/FAQ.html
trunk/org.maemo.esbox.help/plugin.xml
trunk/org.maemo.esbox.help/tocgettingstarted.xml
Log:
merged latest updates from work_jeff branch 12_12
Modified: trunk/org.maemo.esbox.help/html/gettingstarted/Introduction.html
===================================================================
--- trunk/org.maemo.esbox.help/html/gettingstarted/Introduction.html 2008-12-12 22:13:35 UTC (rev 1066)
+++ trunk/org.maemo.esbox.help/html/gettingstarted/Introduction.html 2008-12-12 22:18:34 UTC (rev 1067)
@@ -17,7 +17,7 @@
Scratchbox is a cross-compilation toolkit designed to make embedded
Linux application development easier.
It also provides a full set of tools to integrate and
-cross-compile an entire Linux distribution.</p>
+cross-compile an entire Linux distribution. Integration information is supplied here <a href="http://maemo.org/development/documentation/ide_integration/">http://maemo.org/development/documentation/ide_integration/</a>.</p>
</ul>
<h4 align="left" class="style1">Toolchain</h4>
@@ -49,7 +49,7 @@
<p>This release officially supports Diablo and Chinook, while older releases are not supported, though they may work.
<p><b>SDK releases for maemo</b></p>
<p>OS2008 for Diablo 4.1
-<p>OS2008 for N800 & N810 developers
+<p>OS2008 for N800 & N810 Internet Tablet devices
<ul>
<li>Latest stable: maemo 4.0.1 Chinook</li>
</ul>
Modified: trunk/org.maemo.esbox.help/html/gettingstarted/ProfilingMaemoApplications.html
===================================================================
--- trunk/org.maemo.esbox.help/html/gettingstarted/ProfilingMaemoApplications.html 2008-12-12 22:13:35 UTC (rev 1066)
+++ trunk/org.maemo.esbox.help/html/gettingstarted/ProfilingMaemoApplications.html 2008-12-12 22:18:34 UTC (rev 1067)
@@ -65,7 +65,7 @@
After you click OK on the dialog, OProfile data collecting will
stop and the profiling result will be shown in the OProfile View.</p>
<br>
-<img src="../images/profiling4.jpg">
+<img src="../images/profiling4.jpg" width="1024" height="783">
<br>
</body>
</html>
Modified: trunk/org.maemo.esbox.help/html/gettingstarted/SettingPreferences.html
===================================================================
--- trunk/org.maemo.esbox.help/html/gettingstarted/SettingPreferences.html 2008-12-12 22:13:35 UTC (rev 1066)
+++ trunk/org.maemo.esbox.help/html/gettingstarted/SettingPreferences.html 2008-12-12 22:18:34 UTC (rev 1067)
@@ -19,26 +19,37 @@
<p>
The first thing a user should do is set the preferences for using Scratchbox, since the rest
of the functionality of the plug-ins depends on these settings. Once the Eclipse IDE is
-running with the plug-ins, the preferences may be set by selecting <strong>Window > Preferences...</strong> and expanding the Maemo group.</p>
-
-
-<p>
-The Maemo page allows you to define the command pattern for the launch shell and whether or not to log commands.</p>
-
+running with the plug-ins, the preferences may be set by selecting <strong>Window > Preferences...</strong> and expanding the ESbox and Maemo groups.</p>
+<p>The ESbox group contains preferences to select the build machine for ESbox, define options for Scratchbox1 and Scratchbox 2, and define settings for X Server.</p>
+<h2><a name="bldmachine"></a>Build Machines</h2>
+<p>The Build Machines page allows you to select a build machine for ESbox. If you select VMware Linux Build Machine or QEMU Linux Build Machine then additional tabs will appear for further setup. Additional information about build machines is provided in the topic <a href="virtualmachine.html">Running ESbox on other operating systems</a>.</p>
+<p> </p>
+<p><img src="../images/buildmachines.png" width="908" height="392"></p>
+<h2><a name="sbox1"></a>Scratchbox 1</h2>
+<p>Define your sandbox root directory and command template for Scratchbox 1. </p>
+<p><img src="../images/pref_images/sbox1.png" alt="sbox1" width="1342" height="392"></p>
+<p> </p>
+<h2><a name="sbox2"></a>Scratchbox 2</h2>
+<p>Define your mapping mode, level of messages that you want logged, and command template for Scratchbox 2.</p>
+<p><img src="../images/pref_images/sbox2.png" alt="sbox2" width="994" height="496"></p>
+<p> </p>
+<h2><a name="xsr"></a>X Server</h2>
+<p>The X Server page contains commands for starting the X Server.</p>
+<p><img src="../images/pref_images/xserver.png" alt="xserver" width="1031" height="367"></p>
+<p> </p>
+<p> </p>
+<p>The Maemo page allows you to define the command pattern for the launch shell and whether or not to log commands.</p>
<p></p>
-<img src="../images/pref_images/maemo_pref.png" alt="preferences1" width="892" height="477"><br>
+<img src="../images/pref_images/maemo_pref.png" alt="preferences1" width="903" height="351"><br>
<br>
-
-
-<p> </p>
<h2><a name="env"></a>Environment</h2>
<p>The <strong>Environment</strong> page allows you to define Scratchbox environment variables. Click the New button to specify the variable Name and Value. This dialog also specifies environment variable *changes* for any program invoked by ESbox. Variables may be replaced/added or undefined.</p>
-<p><img src="../images/pref_images/pref_maemo_env.png" alt="environment" width="804" height="495"></p>
+<p><img src="../images/pref_images/pref_maemo_env.png" alt="environment" width="903" height="371"></p>
<p> </p>
<h2><a name="int"></a>Installed Targets</h2>
<p>The Installed Targets page allows you to add or remove scratchbox targets. Click New to launch a wizard that guides you through the steps to add a target.</p>
<p><strong>CAUTION:</strong> If you select an existing target and click <strong>Remove</strong>, the complete installation of the SDK will be removed from your filesystem!</p>
-<p><img src="../images/pref_images/targets.png" alt="installed targets" width="692" height="492"></p>
+<p><img src="../images/pref_images/targets.png" alt="installed targets" width="765" height="377"></p>
<p> </p>
<blockquote>
<h3><a name="newtarget"></a>Creating a New Target</h3>
@@ -87,20 +98,10 @@
<p>Enter the hostname or ip address and click Finish.</p>
<p> </p>
</blockquote>
-<h2><a name="sbox1"></a>Scratchbox 1</h2>
-<p>Define your sandbox root directory and command template for Scratchbox 1. </p>
-<p><img src="../images/pref_images/sbox1.png" alt="sbox1" width="1012" height="475"></p>
-<p> </p>
-<h2><a name="sbox2"></a>Scratchbox 2</h2>
-<p>Define your mapping mode, level of messages that you want logged, and command template for Scratchbox 2.</p>
-<p><img src="../images/pref_images/sbox2.png" alt="sbox2" width="912" height="563"></p>
-<p> </p>
<h2><a name="ssh"></a>SSH</h2>
<p>Use the SSH page to configure secure shell settings for communicating with a device.</p>
-<p><img src="../images/pref_images/ssh.png" alt="ssh" width="922" height="575"></p>
+<p><img src="../images/pref_images/ssh.png" alt="ssh" width="908" height="392"></p>
<p> </p>
-<h2><a name="xsr"></a>X Server</h2>
-<p>The X Server page contains commands for starting the X Server.</p>
-<p><img src="../images/pref_images/xserver.png" alt="xserver" width="930" height="472"></p>
+<p> </p>
</body>
</html>
Modified: trunk/org.maemo.esbox.help/html/gettingstarted/virtualmachine.html
===================================================================
--- trunk/org.maemo.esbox.help/html/gettingstarted/virtualmachine.html 2008-12-12 22:13:35 UTC (rev 1066)
+++ trunk/org.maemo.esbox.help/html/gettingstarted/virtualmachine.html 2008-12-12 22:18:34 UTC (rev 1067)
@@ -15,7 +15,7 @@
<P>The maemo SDK, scratchbox, and rootstraps only work on Linux/x86. If you want to use ESbox in Windows, or Linux/x86-64, then you can do this by hooking up ESbox with an appropriately configured virtual machine.</P>
<P>ESbox exposes the concept of "Build Machines". For Linux/x86 hosts, the host serves as a build machine. For other hosts, only a virtual machine can be a build machine. You can select the build machine for ESbox by selecting <strong>Window > Preferences > ESbox > Build Machines</strong>.</P>
<P> </P>
-<P><img src="../images/buildmachines.png" width="843" height="385"></P>
+<P><img src="../images/buildmachines.png" width="908" height="392"></P>
<P>ESbox will use an SSH connection with the virtual machine to perform builds, launch/debug applications, and configure sb1/sb2 rootstraps.</P>
<P>Projects in Eclipse must be visible to both the host and the virtual machine (VM). This requires some folders to be shared between them.</P>
<h3>Virtual machine configuration </h3>
@@ -35,7 +35,7 @@
<UL>
<LI>An X server is needed to launch the Maemo emulator. The default settings assume you've installed Cygwin/X, with Cygwin at c:\cygwin. Edit <strong>Window > Preferences > ESbox > X Server</strong> preferences to configure.</LI>
</UL>
-<p><img src="../images/xserver.png" width="1099" height="448"></p>
+<p><img src="../images/xserver.png" width="1031" height="367"></p>
<h3>ESbox (virtual) machine configuration </h3>
<UL>
<LI>Configuration is under ESbox > Build Machines. If you navigate here before configuring anything, or try to create a project and launch first, you need to select either VMware or QEMU as a virtual machine and adjust the configuration accordingly.</LI>
@@ -44,13 +44,13 @@
<UL>
<LI>Use the "Apply and Validate" button to run through a series of tests to validate that the machine is configured properly.</LI>
</UL>
-<p><img src="../images/buildmachine_qemu.png" width="1425" height="538"></p>
+<p><img src="../images/buildmachine_qemu.png" width="1324" height="485"></p>
<p> </p>
<h3>ESbox Machine Access </h3>
<P>The Machine Access tab allows you to configure the networking and authentication with the VM.</P>
-<p><img src="../images/buildmachine_qemu_machine.png" width="962" height="538"></p>
+<p><img src="../images/buildmachine_qemu_machine.png" width="824" height="491"></p>
<P> </P>
<P><strong>User</strong> is the account which acts as the agent for all operations with the VM. This must have passwordless "sudo" access. </P>
<P><strong>Password</strong> is the account for the user account. <STRONG>NOTE</STRONG>: the password is saved in preferences but in an encrypted form, but, due to current design quirks, this password can still show up in <EM>plaintext</EM> in SSH filesystem URIs. </P>
@@ -63,7 +63,7 @@
<P>Additionally, the project must be visible to scratchbox. Sbox 1 has some restrictions here, but sbox 2 is looser. A convenient solution is to make the shared folder visible twice, once in a normal location under the user's home folder, and again in the parallel location visible to sbox 1. (The user's home should be shared identically amongst any sbox 1 target to maximize the benefit, else you need to share yet again for every rootstrap.) </P>
<P>Thus, the Shared Folders portion of the VM configuration page will let ESbox know how to map paths. Each mapping is considered in order, so list sbox 1 mappings at the end. </P>
<P>ESbox has some support for automatically mounting shares into the VM, since this is a commonly needed task when the VM is started and stopped. Note, however, ESbox will not configure shares for you or validate whether your settings make any sense -- the provided share must be manually configured.</P>
-<p><img src="../images/buildmachine_qemu_shfold.png" width="871" height="538"></p>
+<p><img src="../images/buildmachine_qemu_shfold.png" width="824" height="491"></p>
<P> </P>
<P><strong>Host</strong> tells the place where a share will be seen on the Eclipse host. </P>
<P><strong>Target</strong> tells the place where a share will be seen on the VM. </P>
Modified: trunk/org.maemo.esbox.help/html/images/buildmachine_qemu.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/buildmachine_qemu_machine.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/buildmachine_qemu_shfold.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/buildmachines.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/debug_python.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/debugperspec.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/maketarget1.jpg
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/pref_images/maemo_pref.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/pref_images/pref_maemo_env.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/pref_images/sbox1.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/pref_images/sbox2.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/pref_images/ssh.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/pref_images/targets.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/pref_images/xserver.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/profiling4.jpg
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/runpython.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/setbreakpoint.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/images/xserver.png
===================================================================
(Binary files differ)
Modified: trunk/org.maemo.esbox.help/html/reference/FAQ.html
===================================================================
--- trunk/org.maemo.esbox.help/html/reference/FAQ.html 2008-12-12 22:13:35 UTC (rev 1066)
+++ trunk/org.maemo.esbox.help/html/reference/FAQ.html 2008-12-12 22:18:34 UTC (rev 1067)
@@ -165,10 +165,8 @@
<h3>Are there complete HowTos for setting up the ESbox?</h3>
<p>
-Yes.
-</p>
+Yes. Integration information is supplied here <a href="http://maemo.org/development/documentation/ide_integration/">http://maemo.org/development/documentation/ide_integration/</a>.</p>
-<div class="h3" id="build" title="build">
<h3>Which ESbox build should I download? </h3>
<p>
@@ -185,7 +183,7 @@
</ul>
</p>
-<p>With all set up, you are able to get the latest version of the ESbox plugin.</p>
+<p>With everything set up, you are able to get the latest version of the ESbox plugin.</p>
<div class="h3" id="uninstall" title="uninstall">
<h3>How do I uninstall ESbox?</h3>
Modified: trunk/org.maemo.esbox.help/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.help/plugin.xml 2008-12-12 22:13:35 UTC (rev 1066)
+++ trunk/org.maemo.esbox.help/plugin.xml 2008-12-12 22:18:34 UTC (rev 1067)
@@ -1,21 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <extension
- point="org.eclipse.help.toc">
-
- <toc file="toc.xml"
- primary="true">
- </toc>
- <toc file="tocconcepts.xml">
- </toc>
- <toc file="tocgettingstarted.xml">
- </toc>
- <toc file="toctasks.xml">
- </toc>
- <toc file="tocreference.xml">
- </toc>
-
- </extension>
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+ <extension
+ point="org.eclipse.help.toc">
+
+ <toc file="toc.xml"
+ primary="true">
+ </toc>
+ <toc file="tocconcepts.xml">
+ </toc>
+ <toc file="tocgettingstarted.xml">
+ </toc>
+ <toc file="toctasks.xml">
+ </toc>
+ <toc file="tocreference.xml">
+ </toc>
+
+ </extension>
+
+ <extension point="org.eclipse.help.contexts" >
+
+ <!-- ==================================================== -->
+ <!-- ESbox DIALOGS AND PREFS -->
+ <!-- XML: esbox_dialogs_help.xml -->
+ <!-- ==================================================== -->
+
+ <!-- ESbox Preferences -->
+ <contexts file="html/context_help/esbox_dialogs_help.xml"
+ plugin="org.maemo.esbox.maemosdk.ui" />
+
+ <!-- Sbox1 Preferences -->
+ <contexts file="html/context_help/esbox_dialogs_help.xml"
+ plugin="org.maemo.esbox.scratchbox.sb1" />
+
+ <!-- Sbox2 Preferences -->
+ <contexts file="html/context_help/esbox_dialogs_help.xml"
+ plugin="org.maemo.esbox.scratchbox.sb2" />
+
+ </extension>
+
+</plugin>
Modified: trunk/org.maemo.esbox.help/tocgettingstarted.xml
===================================================================
--- trunk/org.maemo.esbox.help/tocgettingstarted.xml 2008-12-12 22:13:35 UTC (rev 1066)
+++ trunk/org.maemo.esbox.help/tocgettingstarted.xml 2008-12-12 22:18:34 UTC (rev 1067)
@@ -19,6 +19,8 @@
<topic label="Profiling Maemo Applications" href="html/gettingstarted/ProfilingMaemoApplications.html" />
<topic label="Project Configuration" href="html/gettingstarted/ConfigurationTutorial.html">
<topic label="Setting Preferences" href="html/gettingstarted/SettingPreferences.html" >
+ <topic label="Build Machines" href="html/gettingstarted/SettingPreferences.html#bldmachine"/>
+ <topic label="X Server" href="html/gettingstarted/SettingPreferences.html#xsr"/>
<topic label="Environment" href="html/gettingstarted/SettingPreferences.html#env" />
<topic label="Installed Targets" href="html/gettingstarted/SettingPreferences.html#int">
<topic label="Creating a New Target" href="html/gettingstarted/SettingPreferences.html#newtarget" />
@@ -26,7 +28,6 @@
<topic label="Scratchbox 1" href="html/gettingstarted/SettingPreferences.html#sbox1"/>
<topic label="Scratchbox 2" href="html/gettingstarted/SettingPreferences.html#sbox2"/>
<topic label="SSH" href="html/gettingstarted/SettingPreferences.html#ssh"/>
- <topic label="X Server" href="html/gettingstarted/SettingPreferences.html#xsr"/>
</topic>
<topic label="Setting sbrsh Configuration" href="html/gettingstarted/SettingsSbrshConfiguration.html" />
</topic>
More information about the Esbox-commits
mailing list