[Esbox-commits] r2310 - in trunk: org.maemo.esbox.help org.maemo.esbox.help/html org.maemo.esbox.help/html/concepts org.maemo.esbox.help/html/context_help org.maemo.esbox.help/html/gettingstarted org.maemo.esbox.help/html/images/pref_images org.maemo.esbox.help/html/images/vnc org.maemo.esbox.help/html/tasks org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core org.maemo.esbox.scratchbox.core org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters org.maemo.esbox.tests/src/org/maemo/esbox/tests/cpp org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards
fabricioepa at garage.maemo.org
fabricioepa at garage.maemo.org
Thu Oct 15 00:58:24 EEST 2009
Author: fabricioepa
Date: 2009-10-15 00:58:23 +0300 (Thu, 15 Oct 2009)
New Revision: 2310
Added:
trunk/org.maemo.esbox.help/html/concepts/Environment.html
trunk/org.maemo.esbox.help/html/concepts/Sbrsh.html
trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-sbrsh.png
trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png
trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png
trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png
trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png
trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png
trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml
trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.html
trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml
trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html
trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java
Removed:
trunk/org.maemo.esbox.help/html/concepts/Environment.xhtml
trunk/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml
trunk/org.maemo.esbox.help/html/images/pref_images/interpreter.png
trunk/org.maemo.esbox.help/html/images/pref_images/prefs-sbrsh.png
trunk/org.maemo.esbox.help/html/images/vnc/vnc-1.png
trunk/org.maemo.esbox.help/html/images/vnc/vnc-2.png
trunk/org.maemo.esbox.help/html/images/vnc/vnc-3.png
trunk/org.maemo.esbox.help/html/images/vnc/vnc-4.png
trunk/org.maemo.esbox.help/html/images/vnc/vnc-5.png
trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml
trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml
trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml
trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml
Modified:
trunk/org.maemo.esbox.help/html/concepts/MaemoBuilder.html
trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html
trunk/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
trunk/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html
trunk/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html
trunk/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html
trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html
trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html
trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html
trunk/org.maemo.esbox.help/html/tasks/LocalRunDebug.html
trunk/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html
trunk/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html
trunk/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html
trunk/org.maemo.esbox.help/html/tocconcepts.html
trunk/org.maemo.esbox.help/html/tocgettingstarted.html
trunk/org.maemo.esbox.help/html/toctasks.html
trunk/org.maemo.esbox.help/tocconcepts.xml
trunk/org.maemo.esbox.help/tocgettingstarted.xml
trunk/org.maemo.esbox.help/toctasks.xml
trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/ESboxPythonProjectPackageGatherer.java
trunk/org.maemo.esbox.scratchbox.core/plugin.xml
trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESBoxSBRSHLaunchAdapter.java
trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/cpp/TestCppBuildConfigProjectConverter.java
trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMUncompressInfoWizardPage.java
trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java
Log:
undoing changes from rev 2309
Copied: trunk/org.maemo.esbox.help/html/concepts/Environment.html (from rev 2308, trunk/org.maemo.esbox.help/html/concepts/Environment.html)
===================================================================
--- trunk/org.maemo.esbox.help/html/concepts/Environment.html (rev 0)
+++ trunk/org.maemo.esbox.help/html/concepts/Environment.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+ <meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Environment Variables</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2 class="style1">Environment Variables</h2>
+
+<p>In ESbox, programs may launch in a variety of contexts (host, Scratchbox,
+device). ESbox assumes a standard working environment for all of these. If you
+have special development needs, you can modify the variables made visible to
+these contexts through the <em>Maemo > Environment</em> panel.</p>
+
+<p>Variables specified here will be added, replace, or remove variables present
+in the environment. Currently, no variable substitution is performed.</p>
+
+
+<p>A similar UI appears in Launch Configurations and in C/C++ Maemo Build Configurations
+UI. This allows you to control variables exposed during application run/debug or during the
+project build.</p>
+
+
+<p><b>On Windows hosts</b>, you can configure access to a Cygwin installation
+by specifying <em>CYGWIN_HOME</em> in the <em>Maemo > Environment</em> panel.
+This will allow interaction with
+Cygwin tools like the X server, (native) sbrsh, and process listing to operate
+more effectively.</p>
+
+
+</body>
+</html>
\ No newline at end of file
Deleted: trunk/org.maemo.esbox.help/html/concepts/Environment.xhtml
===================================================================
--- trunk/org.maemo.esbox.help/html/concepts/Environment.xhtml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/concepts/Environment.xhtml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="../help.css"/>
-<title>Environment Variables</title>
-</head>
-<body>
- <include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Environment.xhtml/environment"/>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/concepts/MaemoBuilder.html
===================================================================
--- trunk/org.maemo.esbox.help/html/concepts/MaemoBuilder.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/concepts/MaemoBuilder.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -93,7 +93,7 @@
<h3>Related Topics</h3>
<ul>
- <li><a href="../concepts/Environment.xhtml">Environment Variables</a></li>
+ <li><a href="../concepts/Environment.html">Environment Variables</a></li>
</ul>
</body>
Modified: trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html
===================================================================
--- trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -66,7 +66,7 @@
<li><a href="../tasks/InstallingScratchbox1.html">Installing Scratchbox 1</a></li>
<li><a href="../tasks/InstallingScratchbox1Targets.html">Installing Scratchbox 1 Targets</a></li>
<li><a href="../tasks/InstallingScratchbox2Targets.html">Installing Scratchbox 2 Targets</a></li>
- <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Maemo > Installed Targets Preference Settings</a></li>
+ <li><a href="../tasks/SettingPreferences.html#installed_targets">Maemo > Installed Targets Preference Settings</a></li>
</ul>
</body>
</html>
\ No newline at end of file
Copied: trunk/org.maemo.esbox.help/html/concepts/Sbrsh.html (from rev 2308, trunk/org.maemo.esbox.help/html/concepts/Sbrsh.html)
===================================================================
--- trunk/org.maemo.esbox.help/html/concepts/Sbrsh.html (rev 0)
+++ trunk/org.maemo.esbox.help/html/concepts/Sbrsh.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+ <meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Scratchbox Remote Shell (SBRSH)</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2 class="style1">Scratchbox Remote Shell (SBRSH)</h2>
+
+<h3>Background</h3>
+
+<p>The Scratchbox Remote Shell (SBRSH) is a remote command execution system similar to rsh and
+ ssh. It is designed with slow devices and Scratchbox's special requirements in mind.
+ It supports common types of program execution (including terminal emulation), but it
+ is optimized for non-interactive usage.
+ </p>
+ <p>
+ SBRSH works by allowing the host to run programs on the device by <b>mounting</b>
+ filesystems from the host onto the device. Usually these mounts hide the device's
+ own filesystem (for the duration of an SBRSH session), so that programs can run
+ as if they are installed onto the device, but without compromising the actual
+ device filesystem.
+ </p>
+
+ <h3>ESbox and SBRSH</h3>
+ <p>
+ In ESbox, SBRSH is used as one download model for launching remote programs during Run/Debug sessions.
+ The other option is copying programs to the device.
+ </p>
+ <p>
+ SBRSH may be used in a "sandbox" model, where the entire root
+ filesystem from a Scratchbox rootstrap, excluding essential system directories,
+ replaces the root filesystem on the device.
+ This allows a program to run as if it and all its libraries were installed.
+ (Of course, SBRSH cannot emulate the devices or daemons already running on the
+ device, so this metaphor goes only so far.)
+ </p>
+ <p>Unfortunately, sandbox mode can be quite slow
+since all the files referenced by an application (libraries, data)
+must be transferred over the wire to the device. Additionally, the cache for
+these files uses up memory on the device.</p>
+
+ <p>
+ SBRSH may also be used in "non-sandbox" mode. Here, only the
+ project directory is mounted onto the device. The original libraries and
+ binaries from the device are still visible to your program. This may lead
+ to problems when you are building against a newer platform than is installed
+ on your device; you may encounter runtime errors, failures to launch, etc.
+ <i>Currently, ESbox does not validate that the project is compatible with
+ the device.</i>
+ </p>
+
+ <h3>SBRSH launch configuration setup</h3>
+ <p>Currently you must edit a launch configuration to control the interesting
+ aspects of SBRSH communication, such as the Sandbox option, as well as the
+ mounting options.</p>
+ <p>ESbox can automatically create an SBRSH configuration for launching your
+ project. Depending on whether the Sandbox option is enabled, it will expose
+ the rootstrap for the active build configuration. It will also expose the
+ project directory. Both directories will be exposed as SSHFS mounts.</p>
+ <p>You can supply your own manually-written SBRSH configuration as well.
+ The configuration file must live in a location visible to Scratchbox.
+ </p>
+
+ <h3>SBRSH authentication setup</h3>
+ <p>SBRSH requires a bit of work to set up properly.
+ See the <a href="http://pc-connectivity.garage.maemo.org/documentation_sbrsh.html">PC Connectivity documentation</a>
+ for details.
+
+ If you have already added your host IP address or range in the
+ <tt>/etc/sbrshd.conf</tt> file, you can use the <em>Exchange SSH Keys</em> button
+ in an SBRSH launch configuration
+ to do the SSH passwordless authentication.</p>
+
+ <h3>Warning</h3>
+
+ <p> The communication between sbrsh and the device happens on a TCP/IP
+ connection and is not encrypted. Sbrsh is meant to be used only on trusted networks,
+such as a company's LAN or an USB network between a PC and a handheld device.</p>
+
+<h3>Related Topic</h3>
+<ul>
+ <li><a href="../gettingstarted/SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
+ <li><a href="BuildMachine.html">Build Machines</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file
Deleted: trunk/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml
===================================================================
--- trunk/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/concepts/Sbrsh.xhtml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="../help.css"/>
-<title>Scratchbox Remote Shell (SBRSH)</title>
-</head>
-
-<body>
-
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Sbrsh.xhtml/title"/>
-
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Sbrsh.xhtml/background"/>
-
-<h3>ESbox and SBRSH</h3>
- <p>
- In ESbox, SBRSH is used as one download model for launching remote programs during Run/Debug sessions.
- The other option is copying programs to the device.
- </p>
- <p>
- SBRSH may be used in a "sandbox" model, where the entire root
- filesystem from a Scratchbox rootstrap, excluding essential system directories,
- replaces the root filesystem on the device.
- This allows a program to run as if it and all its libraries were installed.
- (Of course, SBRSH cannot emulate the devices or daemons already running on the
- device, so this metaphor goes only so far.)
- </p>
- <p>Unfortunately, sandbox mode can be quite slow
-since all the files referenced by an application (libraries, data)
-must be transferred over the wire to the device. Additionally, the cache for
-these files uses up memory on the device.</p>
-
- <p>
- SBRSH may also be used in "non-sandbox" mode. Here, only the
- project directory is mounted onto the device. The original libraries and
- binaries from the device are still visible to your program. This may lead
- to problems when you are building against a newer platform than is installed
- on your device; you may encounter runtime errors, failures to launch, etc.
- <i>Currently, ESbox does not validate that the project is compatible with
- the device.</i>
- </p>
-
- <h3>SBRSH launch configuration setup</h3>
- <p>Currently you must edit a launch configuration to control the interesting
- aspects of SBRSH communication, such as the Sandbox option, as well as the
- mounting options.</p>
- <p>ESbox can automatically create an SBRSH configuration for launching your
- project. Depending on whether the Sandbox option is enabled, it will expose
- the rootstrap for the active build configuration. It will also expose the
- project directory. Both directories will be exposed as SSHFS mounts.</p>
- <p>You can supply your own manually-written SBRSH configuration as well.
- The configuration file must live in a location visible to Scratchbox.
- </p>
-
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Sbrsh.xhtml/authentication_setup"/>
-
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/concepts/Sbrsh.xhtml/warning"/>
-
-<h3>Related Topic</h3>
-<ul>
- <li><a href="../gettingstarted/SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
- <li><a href="BuildMachine.html">Build Machines</a></li>
-</ul>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
===================================================================
--- trunk/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -13,18 +13,18 @@
<!-- ESbox preferences -->
<context id="global_pref_esbox_buildmachines" >
<description>Select the build machine for ESbox.</description>
- <topic label="Build Machines" href="html/tasks/SettingPreferences.xhtml#build_machines" />
+ <topic label="Build Machines" href="html/tasks/SettingPreferences.html#build_machines" />
<topic href="html/tasks/UsingVirtualMachines.html" label="Using Virtual Machines with ESbox"/>
</context>
<context id="global_pref_esbox_xserver" >
<description>Display settings for X server</description>
- <topic label="X server" href="html/tasks/SettingPreferences.xhtml#x_server" />
+ <topic label="X server" href="html/tasks/SettingPreferences.html#x_server" />
</context>
<!-- PLUGIN: org.maemo.esbox.scratchbox.sb1 -->
<context id="global_pref_esbox_scratchbox_1" >
<description>Options to configure scratchbox 1.</description>
- <topic label="Scratchbox 1" href="html/tasks/SettingPreferences.xhtml#sbox1" />
+ <topic label="Scratchbox 1" href="html/tasks/SettingPreferences.html#sbox1" />
</context>
<context id="wizard_install_scratchbox_1" >
<description>Install Scratchbox 1 on the build machine.</description>
@@ -38,7 +38,7 @@
<!-- PLUGIN: org.maemo.esbox.scratchbox.sb2 -->
<context id="global_pref_esbox_scratchbox_2" >
<description>Options to configure scratchbox 2.</description>
- <topic label="Scratchbox 2" href="html/tasks/SettingPreferences.xhtml#sbox2" />
+ <topic label="Scratchbox 2" href="html/tasks/SettingPreferences.html#sbox2" />
</context>
<context id="wizard_install_scratchbox_2_target" >
<description>Install Scratchbox 2 targets on the build machine.</description>
@@ -50,7 +50,7 @@
<context id="global_pref_esbox_sbrsh" >
<description>Scratchbox Remote Shell connection settings</description>
- <topic label="SBRSH settings" href="html/tasks/SettingPreferences.xhtml#sbrsh" />
+ <topic label="SBRSH settings" href="html/tasks/SettingPreferences.html#sbrsh" />
<topic label="Remotely Launching Maemo Projects" href="html/tasks/RemoteRunDebug.html" />
</context>
@@ -114,7 +114,7 @@
<!-- Global preference => Maemo => ssh -->
<context id="global_pref_maemo_ssh" >
<description>Secure shell connection settings</description>
- <topic label="SSH settings" href="html/tasks/SettingPreferences.xhtml#ssh" />
+ <topic label="SSH settings" href="html/tasks/SettingPreferences.html#ssh" />
<topic label="Remotely Launching Maemo Projects" href="html/tasks/RemoteRunDebug.html" />
</context>
@@ -159,19 +159,19 @@
<!-- Global preference => Maemo -->
<context id="global_pref_maemo" >
<description>General options for Maemo Eclipse integration</description>
- <topic label="Maemo Preferences" href="html/gettingstarted/SettingPreferences.xhtml#maemo" />
+ <topic label="Maemo Preferences" href="html/gettingstarted/SettingPreferences.html#maemo" />
</context>
<!-- Global preference => Maemo => Environment -->
<context id="global_pref_maemo_environment" >
<description>Environment variables passed to programs</description>
- <topic label="Environment variables preferences" href="html/gettingstarted/SettingPreferences.xhtml#environment" />
+ <topic label="Environment variables preferences" href="html/gettingstarted/SettingPreferences.html#environment" />
</context>
<!-- Global preference => Maemo => Installed Targets -->
<context id="global_pref_maemo_installed_targets" >
<description>Configure, add, or remove targets for use with the Maemo IDE Common Architecture</description>
- <topic label="Installed targets Preferences" href="html/gettingstarted/SettingPreferences.xhtml#installed_targets" />
+ <topic label="Installed targets Preferences" href="html/gettingstarted/SettingPreferences.html#installed_targets" />
</context>
Modified: trunk/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html
===================================================================
--- trunk/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -26,7 +26,7 @@
Installing Scratchbox 2 Targets
</a></strong></li>
-<li><strong><a href="../tasks/SettingPreferences.xhtml">
+<li><strong><a href="../tasks/SettingPreferences.html">
Setting Up Preferences
</a></strong></li>
Modified: trunk/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html
===================================================================
--- trunk/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -71,7 +71,6 @@
</ul>
<h3>Related Topics</h3>
<ul>
- <li><a href="../tasks/ConfigurePythonInterpreter.xhtml">Configure Python Interpreter</a></li>
<li><a href="../tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a></li>
<li><a href="../tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></li>
</ul>
Modified: trunk/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html
===================================================================
--- trunk/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -50,7 +50,6 @@
<h3>Related Topics</h3>
<ul>
- <li><a href="../tasks/ConfigurePythonInterpreter.xhtml">Configure Python Interpreter</a></li>
<li><a href="../tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a></li>
<li><a href="../tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></li>
</ul>
Deleted: trunk/org.maemo.esbox.help/html/images/pref_images/interpreter.png
===================================================================
(Binary files differ)
Copied: trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-sbrsh.png (from rev 2308, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-sbrsh.png)
===================================================================
(Binary files differ)
Deleted: trunk/org.maemo.esbox.help/html/images/pref_images/prefs-sbrsh.png
===================================================================
(Binary files differ)
Copied: trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png (from rev 2308, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png)
===================================================================
(Binary files differ)
Copied: trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png (from rev 2308, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png)
===================================================================
(Binary files differ)
Copied: trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png (from rev 2308, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png)
===================================================================
(Binary files differ)
Copied: trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png (from rev 2308, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png)
===================================================================
(Binary files differ)
Copied: trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png (from rev 2308, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png)
===================================================================
(Binary files differ)
Deleted: trunk/org.maemo.esbox.help/html/images/vnc/vnc-1.png
===================================================================
(Binary files differ)
Deleted: trunk/org.maemo.esbox.help/html/images/vnc/vnc-2.png
===================================================================
(Binary files differ)
Deleted: trunk/org.maemo.esbox.help/html/images/vnc/vnc-3.png
===================================================================
(Binary files differ)
Deleted: trunk/org.maemo.esbox.help/html/images/vnc/vnc-4.png
===================================================================
(Binary files differ)
Deleted: trunk/org.maemo.esbox.help/html/images/vnc/vnc-5.png
===================================================================
(Binary files differ)
Deleted: trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="../help.css"/>
-<title>Configuring Python Interpreter</title>
-</head>
-<body>
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/ConfigurePythonInterpreter.xhtml/configure_python_interpreter"/>
-</body>
-</html>
\ No newline at end of file
Copied: trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml (from rev 2308, trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml)
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml (rev 0)
+++ trunk/org.maemo.esbox.help/html/tasks/ConfigurePythonInterpreter.xhtml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Configuring Python Interpreter</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/ConfigurePythonInterpreter.xhtml/configure_python_interpreter"/>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -63,7 +63,7 @@
<h3>Related Topics</h3>
<ul>
<li><a href="../tasks/InstallingScratchbox1Targets.html">Installing Scratchbox 1 Targets</a></li>
- <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Setting Up Installed Target Preferences</a></li>
+ <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
</ul>
</body>
</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -59,7 +59,7 @@
<h3>Related Topics</h3>
<ul>
<li><a href="../tasks/InstallingScratchbox1.html">Installing Scratchbox 1</a></li>
- <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Setting Up Installed Target Preferences</a></li>
+ <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
</ul>
</body>
</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -39,7 +39,7 @@
<h3>Related Topics</h3>
<ul>
- <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Setting Up Installed Target Preferences</a></li>
+ <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
</ul>
</body>
</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/tasks/LocalRunDebug.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/LocalRunDebug.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/LocalRunDebug.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -64,7 +64,7 @@
<h3>Related Topics</h3>
<ul>
<li><a href="../concepts/LocalLaunching.html">Local Launching</a></li>
- <li><a href="../concepts/Environment.xhtml">Environment Variables</a></li>
+ <li><a href="../concepts/Environment.html">Environment Variables</a></li>
<li><a href="LocalDebugging.html">Local Debugging</a> </li>
<li><a href="RemoteLaunching.html">Remote Launching</a></li>
<li><a href="../concepts/MaemoBuild.html">Maemo Builder</a> </li>
Modified: trunk/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -71,7 +71,7 @@
<h3>Related Topics</h3>
<ul>
<li><a href="../tasks/UsingVirtualMachines.html">Using Virtual Machines with ESbox</a></li>
- <li><a href="../tasks/SettingPreferences.xhtml#installed_targets">Maemo > Installed Targets Preference Settings</a></li>
+ <li><a href="../tasks/SettingPreferences.html#installed_targets">Maemo > Installed Targets Preference Settings</a></li>
</ul>
</body>
</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -71,8 +71,8 @@
<h3>Related Topics</h3>
<ul>
<li><a href="../concepts/RemoteLaunching.html">Local Launching</a></li>
- <li><a href="../concepts/Environment.xhtml">Environment Variables</a></li>
- <li><a href="../concepts/UsingVNCViewer.xhtml">Using the VNC Viewer</a> </li>
+ <li><a href="../concepts/Environment.html">Environment Variables</a></li>
+ <li><a href="../concepts/UsingVNCViewer.html">Using the VNC Viewer</a> </li>
<li><a href="LocalRunDebug.html">Running/Debugging a Local Program</a> </li>
<li><a href="../concepts/MaemoBuild.html">Maemo Builder</a> </li>
</ul>
Copied: trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.html (from rev 2308, trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.html)
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.html (rev 0)
+++ trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -0,0 +1,128 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+ <meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Setting Up Preferences</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+ <style type="text/css">
+<!--
+.style1 {font-weight: bold}
+-->
+ </style>
+</head>
+
+<body>
+
+<h1>Setting Up Preferences</h1>
+<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 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="build_machines"></a>Build Machines</h2>
+<p>The Build Machines page allows you to select a build machine for ESbox.
+If you select VMware, VirtualBox, or QEMU Linux Build Machine then
+additional tabs will appear for further setup. Additional information about
+virtual build machines is provided in the topic
+<a href="UsingVirtualMachines.html">Running ESbox on other operating systems</a>.</p>
+<p> </p>
+<p><img src="../images/pref_images/prefs-esbox-build-machines.png" alt="build machines"></p>
+<h2><a name="sbox1"></a>Scratchbox 1</h2>
+<p>This page controls where Scratchbox 1 is located and how it is invoked.</p>
+<p>The <em>Scratchbox Search path</em> is a colon-separated
+list of paths on the current Build Machine where Scratchbox installations exist.</p>
+<p>The <em>Command template</em> defines the pattern for the command line that
+controls any program launched inside Scratchbox 1. Usually this does not need
+to be edited.</p>
+<p><img src="../images/pref_images/prefs-esbox-scratchbox1.png" alt="sbox1"></p>
+<p> </p>
+<h2><a name="sbox2"></a>Scratchbox 2</h2>
+<p>This page controls the way Scratchbox 2 is invoked. Usually none of these items
+need to be modified, unless you are debugging or developing the Maemo SDK+.
+</p>
+<p><img src="../images/pref_images/prefs-esbox-scratchbox2.png" alt="sbox2"></p>
+<p> </p>
+<h2><a name="sbrsh"></a>SBRSH</h2>
+<p>The SBRSH page controls the defaults for the Remote Launches which use the <em>Mount via SBRSH</em>
+download method.</p>
+<p>The <em>Launch Command</em> tells where the sbrsh binary is located. This is
+relative to the current Build Machine.</p>
+<p>The <em>Remote User</em> tells under which device user programs are launched.</p>
+<p>Set <em>Use Sandbox Mode as Default</em> to control the corresponding setting
+which is applied to new SBRSH Remote Launches. </p>
+<p>See <a href="../concepts/Sbrsh.html">SBRSH concepts</a> for more information.</p>
+<p><img src="../images/pref_images/prefs-esbox-sbrsh.png" alt="sbrsh"></p>
+<p> </p>
+
+
+<h2><a name="x_server"></a>X Server</h2>
+<p>The X Server page contains commands for starting the X Server.</p>
+<p>The server is launched on the host machine.</p>
+<p><b>NOTE:</b> The variables <tt>${RESOLUTION}</tt> and <tt>${PLATFORM_PARAMETERS}</tt> automatically take specific values for X extension and resolution <br>
+ parameters (e.g.: <tt>800x480x16</tt>, <tt>-extension Composite</tt>) depending on target platform. But you can have complete control<br>
+ if you wish, by removing the variable and manually defining the parameters values.</p>
+<p><img src="../images/pref_images/prefs-esbox-xserver.png" alt="xserver"></p>
+<p> </p>
+
+<h2><a name="maemo"></a>Maemo</h2>
+<p>The Maemo page controls some miscellanous settings.</p>
+<p>The <em>'Launch shell' command pattern</em> controls how the <em>Launch Terminal Here</em>
+command will run.</p>
+<p>The <em>Log commands</em> setting tells whether an entry will be recorded for every
+program invoked by ESbox or Mica. The log is invaluable for diagnosing some problems
+with commands invoked by various wizards and build commands.</p>
+<p>The <em>Path for command log</em> specifies a file to which entries are appended
+when <em>Log commands</em> is enabled.</p>
+<p>The <em>Suppress warning when build platform and device platform do not match</em>
+setting disables notifications during a remote launch of a program when it was
+built or developed against a platform which is newer or older than that of the device.
+</p>
+<p>
+Such mismatches may result in programs that fail to launch, due to
+illegal instructions used in newer platforms, or due to libraries which are
+not available in the device.
+</p>
+<p>If you select the checkbox labeled "Do not tell me again", this preference is set.
+</p>
+<p></p>
+<img src="../images/pref_images/prefs-maemo.png" alt="maemo">
+<p/>
+
+<h2><a name="environment"></a>Environment</h2>
+<p>The Environment page allows you to define and control environment variables
+applied during any command launched by ESbox or Mica.
+Variables may be replaced/added or undefined.</p>
+<p>See <a href="../concepts/Environment.html">Environment Variables</a> concepts for more information.</p>
+<p><img src="../images/pref_images/prefs-maemo-environment.png" alt="environment"></p>
+<p> </p>
+
+<h2><a name="installed_targets"></a>Installed Targets</h2>
+<p>The Installed Targets page allows you to see, add/remove, and configure targets. </p>
+<p><strong>CAUTION:</strong> If you select an existing target and click <strong>Remove</strong>, the complete installation of the SDK target will be removed from your filesystem!</p>
+<p>See the <a href="../concepts/MaemoTargets.html">Maemo Targets</a> concepts for more information.</p>
+<p>In this page, or anywhere else a selection of targets appears,
+ you can <a href="../tasks/UsingTargetContextMenus.html">use a context menu to perform operations
+on the SDKs or targets</a>.
+ </p>
+<p><img src="../images/pref_images/prefs-maemo-installed-targets.png" alt="installed targets"></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,
+primarily when using the SSH or RSE download methods in Remote Launch Configurations.</p>
+<p>The <em>Username for device access</em> controls under which account the executable is
+executed. <strong>user</strong> is the typical account for the Nokia Internet Tablet.</p>
+<p>The <em>Destination folder for executable</em> controls the base directory where files
+will be copied. The <tt>./</tt> default value corresponds to the HOME of the given user name.</p>
+<p>The <em>Connection timeout</em> controls how many seconds' delay ESbox or Mica will
+wait before considering a connection to the device to have failed.</p>
+<p><img src="../images/pref_images/prefs-maemo-ssh.png" alt="ssh"></p>
+
+
+<p> </p>
+<p> </p>
+</body>
+</html>
\ No newline at end of file
Deleted: trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.xhtml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="../help.css"/>
-<title>Setting Up Preferences</title>
-</head>
-<body>
-
-<h1>Setting Up Preferences</h1>
-<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 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="build_machines"></a>Build Machines</h2>
-<p>The Build Machines page allows you to select a build machine for ESbox.
-If you select VMware, VirtualBox, or QEMU Linux Build Machine then
-additional tabs will appear for further setup. Additional information about
-virtual build machines is provided in the topic
-<a href="UsingVirtualMachines.html">Running ESbox on other operating systems</a>.</p>
-<p> </p>
-<p><img src="../images/pref_images/prefs-esbox-build-machines.png" alt="build machines"/></p>
-
-
-<h2><a name="sbox1"></a>Scratchbox 1</h2>
-<p>This page controls where Scratchbox 1 is located and how it is invoked.</p>
-<p>The <em>Scratchbox Search path</em> is a colon-separated
-list of paths on the current Build Machine where Scratchbox installations exist.</p>
-<p>The <em>Command template</em> defines the pattern for the command line that
-controls any program launched inside Scratchbox 1. Usually this does not need
-to be edited.</p>
-<p><img src="../images/pref_images/prefs-esbox-scratchbox1.png" alt="sbox1"/></p>
-<p> </p>
-
-
-<h2><a name="sbox2"></a>Scratchbox 2</h2>
-<p>This page controls the way Scratchbox 2 is invoked. Usually none of these items
-need to be modified, unless you are debugging or developing the Maemo SDK+.
-</p>
-<p><img src="../images/pref_images/prefs-esbox-scratchbox2.png" alt="sbox2"/></p>
-<p> </p>
-
-
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/SettingPreferences.xhtml/sbrsh"/>
-
-<h2><a name="x_server"></a>X Server</h2>
-<p>The X Server page contains commands for starting the X Server.</p>
-<p>The server is launched on the host machine.</p>
-<p><b>NOTE:</b> The variables <tt>${RESOLUTION}</tt> and <tt>${PLATFORM_PARAMETERS}</tt> automatically take specific values for X extension and resolution <br/>
- parameters (e.g.: <tt>800x480x16</tt>, <tt>-extension Composite</tt>) depending on target platform. But you can have complete control<br/>
- if you wish, by removing the variable and manually defining the parameters values.</p>
-<p><img src="../images/pref_images/prefs-esbox-xserver.png" alt="xserver"/></p>
-<p> </p>
-
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/SettingPreferences.xhtml/maemo"/>
-
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/SettingPreferences.xhtml/environment"/>
-
-<h2><a name="installed_targets"></a>Installed Targets</h2>
-<p>The Installed Targets page allows you to see, add/remove, and configure targets. </p>
-<p><strong>CAUTION:</strong> If you select an existing target and click <strong>Remove</strong>, the complete installation of the SDK target will be removed from your filesystem!</p>
-<p>See the <a href="../concepts/MaemoTargets.html">Maemo Targets</a> concepts for more information.</p>
-<p>In this page, or anywhere else a selection of targets appears,
- you can <a href="../tasks/UsingTargetContextMenus.html">use a context menu to perform operations
-on the SDKs or targets</a>.
- </p>
-<p><img src="../images/pref_images/prefs-maemo-installed-targets.png" alt="installed targets"/></p>
-
-<p> </p>
-
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/SettingPreferences.xhtml/ssh"/>
-
-<p> </p>
-<p> </p>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -155,8 +155,8 @@
<h3>Related Topics</h3>
<ul>
- <li><a href="../concepts/Sbrsh.xhtml">Scratchbox Remote Shell (SBRSH)</a></li>
- <li><a href="../tasks/SettingPreferences.xhtml#sbrsh">Setting Up SBRSH Preferences</a></li>
+ <li><a href="../concepts/Sbrsh.html">Scratchbox Remote Shell (SBRSH)</a></li>
+ <li><a href="../tasks/SettingPreferences.html#sbrsh">Setting Up SBRSH Preferences</a></li>
</ul>
</body>
Copied: trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html (from rev 2308, trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html)
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html (rev 0)
+++ trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -0,0 +1,297 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+ <meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Using the Flasher Wizard</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+
+ <style type="text/css">
+ img {
+ margin: 0.7em;
+ }
+
+ img.inline {
+ margin: 0em;
+ }
+
+ h2, h3 {
+ margin-bottom: 1.5em;
+ }
+ </style>
+
+</head>
+
+<body>
+ <h2>Using the Flasher Wizard</h2>
+
+ <p>
+ The Maemo IDE Common Architecture includes a wizard which you can use to flash updated
+ kernels and rootstraps onto your Nokia Internet Tablet. You should use this to
+ ensure your tablet software is up-to-date before starting serious development,
+ as bugs may have fixed and features added.
+ </p>
+ <p>
+ The wizard uses the same flasher tools and process as you may have done manually
+ from various <b>maemo.org</b> tutorials, but it provides a friendlier and more
+ easily repeatable UI.
+ </p>
+ <p>
+ <b>NOTE:</b> The flasher requires special drivers and software to talk
+ to the device and flash images to it. The wizard will automatically locate and install these for you.
+ </p>
+ <p>
+ All you need to do to prepare is to back up any personal settings and
+ files on your device which may be overwritten by the new image.
+ </p>
+ <p>
+ The wizard is accessible from <strong>File > New > Other > Maemo Installers
+ > Flash Images to Device</strong> or from the
+ <img class="inline" src="../images/flash/flasher-icon.png" /> icon on the toolbar.
+ </p>
+
+ <ul>
+ <li>
+ <p>
+ On the first page, prepare for the flashing session:
+ </p>
+
+ <img src="../images/flash/wiz-flash-1.png" />
+
+ <p>
+ Please read the instructions carefully. Flashing the device will usually overwrite the
+ filesystem, including your home directory. Back up anything important first.
+ </p>
+
+ <p>
+ <b>NOTE:</b> If you are using <b>build machine</b> to flash the device then the USB connection to
+ the device will need to be "attached" to the virtual machine. VirtualBox and VMWare support USB,
+ but QEMU 0.9.x does not support USB at all.
+ </p>
+
+ </li>
+
+ <li>
+ <p>
+ Click <strong>Next</strong>. Select the way you will configure the flashing session.
+ <p/>
+
+ <img src="../images/flash/wiz-flash-1b.png" />
+
+ <ul>
+ <li>
+ In the Basic mode, the wizard will find the newest rootstrap image
+ for the device for you.
+ </li>
+
+ <li>
+ In the Advanced mode, you can configure a flashing session, fully controlling
+ which images to flash and what flasher options to use.
+ <p>
+ <em>
+ In this release of the Maemo IDE Common Architecture, this mode allows
+ you to run a custom flasher binary, including one on a non-Linux host.
+ </em>
+ </p>
+ </li>
+
+ <li>
+ <p>
+ The Predefined tasks lists a convenient task for installing a kernel
+ image for Diablo which fixes a bug with USB networking with Windows. (Without
+ the fix, Windows will not be able to properly configure the RNDIS driver for
+ the Nokia Internet Tablet.)
+ </p>
+ <p>
+ See
+ <a href="http://pc-connectivity.garage.maemo.org/documentation_usbnet.html#Setup_USB_Network_on_Windows">
+ the PC Connectivity page
+ </a>
+ for information about setting up Windows networking after using the
+ flasher wizard.
+ </p>
+ <p>
+ See <a href="https://bugs.maemo.org/show_bug.cgi?id=3243">the original bug report</a> as well.
+ </p>
+
+ <ul>
+ <li>
+ Basic Mode
+ <p>
+ If you select the Basic mode, you will see the Product ID page next.
+ </p>
+ </li>
+
+ <li>
+ Advanced Mode
+ <p>
+ If you select the Advanced mode, you will see the Session configuration page next.
+ See below.
+ </p>
+ </li>
+ <li>
+ Predefined Tasks > Update Diablo Kernel
+ <p>
+ If you select this task, a predefined session will be used, and you
+ will see the Product ID page next.
+ </p>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+
+ <li>
+ <p>
+ Click <strong>Next</strong>. On the next page, provide the Product ID
+ (WLAN MAC ID). This will be remembered between sessions.
+ <p/>
+ <img src="../images/flash/wiz-flash-2.png"/>
+ </li>
+
+ <li>
+ <p>
+ Click <strong>Next</strong>. Accept the license for using the flasher
+ and device binaries.
+ <p/>
+ <img src="../images/flash/wiz-flash-3.png" />
+ </li>
+
+ <li>
+ <p>
+ Click <strong>Next</strong>. The wizard will now download the flasher binary (once)
+ and also install any driver software required for communicating with
+ the device in flashing mode. This may install additional software,
+ such as the <a href="http://pc-connectivity.garage.maemo.org/">Host PC Connectivity software</a>.
+ <p/>
+ <img src="../images/flash/dialog-flash-get-flasher.png" />
+ </li>
+
+ <li>
+ <p>
+ The <strong>Retry</strong> button will let you start over if you need
+ to restart the device or adjust settings.
+ <p/>
+
+ <img src="../images/flash/wiz-flash-4.png"/>
+ <br />
+ <img src="../images/flash/wiz-flash-4b.png"/>
+ </li>
+
+ <li>
+ <p>
+ Select <strong>Next</strong>. You will see a summary of the changes
+ that will be made to the software on the device.
+ <p/>
+ <img src="../images/flash/wiz-flash-5.png" />
+ <p>
+ By default,
+ the device will be configured for R&D mode and rebooted once the flashing
+ is complete. You can configure this behavior in an Advanced session.
+ </p>
+ </li>
+
+ <li>
+ <p>
+ Once you hit <strong>Finish</strong>, the wizard will download the
+ image(s) and invoke the flasher.
+ <p/>
+
+ <img src="../images/flash/wiz-flash-6.png"/>
+ <img src="../images/flash/wiz-flash-7.png"/>
+ <img src="../images/flash/wiz-flash-8.png"/>
+ </li>
+ </ul>
+
+ <h3>Session Configurations</h3>
+
+ <p>
+ If you use the <strong>Advanced</strong> configuration mode, you may define
+ a set of <strong>sessions</strong> for particular images or options with which
+ you flash your device.
+ </p>
+
+ <img src="../images/flash/wiz-flash-sessions.png" />
+
+ <ul>
+ <li>
+ <p>
+ On the <strong>OS Images</strong> tab, select the kinds of images to flash.
+ <p/>
+ <img src="../images/flash/wiz-flash-session-osimage.png" />
+
+ <ul>
+ <li>
+ <strong>FIASCO</strong> images are combined images which update all the
+ standard boot files, kernel, and filesystems contributing to a platform
+ release. This is the standard "*.bin" format distributed by Nokia.
+ </li>
+
+ <li>
+ <strong>kernel</strong> images are the Linux kernel (in zImage format).
+ </li>
+ <li>
+ <strong>initfs</strong>, <strong>rootfs</strong>, <strong>NOLO</strong>,
+ <strong>X-Loader</strong>, <strong>NOLO Secondary</strong>, and <strong>2nd</strong>
+ images control more advanced portions of the filesystem.
+ </li>
+ </ul>
+ </li>
+
+ <li>
+ <p>
+ On the <strong>Modes</strong> tab, select how the flashing will be performed.
+ <p/>
+ <img src="../images/flash/wiz-flash-session-modes.png" />
+
+ <ul>
+ <li>
+ In <strong>Components which will be flashed</strong>, you can control whether
+ selected portions of a FIASCO image will be flashed, or the whole image.
+ </li>
+
+ <li>
+ <strong>Reboot after flashing</strong> controls whether the device is automatically
+ rebooted once flashing is finished.
+ </li>
+
+ <li>
+ <strong>Enable R&D mode</strong> controls whether the device will allow you
+ to log in as <tt>root</tt> using <tt>sudo gainroot</tt> and have more
+ control over the package manager in the <strong>Application Manager</strong>.
+ If not, you will need third-party tools to enable root access.
+ <p>
+ <b>NOTE:</b> Mica generally requires R&D mode to be set, since several
+ operations like Validating Packages and Installing Debian Packages requires
+ root access.
+ </p>
+ </li>
+ </ul>
+ </li>
+
+ <li>
+ <p>
+ On the <strong>Options</strong> tab, control how the flasher is launched.
+ <p/>
+ <img src="../images/flash/wiz-flash-session-options.png" />
+ <ul>
+ <li>
+ The <strong>Flasher tool location</strong> will override the location
+ of the flasher binary. If not set, the flasher will be downloaded from
+ the Internet.
+ </li>
+
+ <li>
+ <strong>Additional command line arguments</strong> will be passed on the
+ flasher command line, in addition to those derived from settings on other
+ tabs.
+ </li>
+ </ul>
+ </li>
+ </ul>
+
+ <br />
+ <br />
+</body>
+</html>
Deleted: trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="../help.css"/>
-<title>Using the Flasher Wizard</title>
-</head>
-<body>
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/UsingFlasherWizard.xhtml/using_flasher_wizard"/>
-</body>
-</html>
\ No newline at end of file
Copied: trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml (from rev 2308, trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml)
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml (rev 0)
+++ trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.xhtml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
+<link rel="stylesheet" type="text/css" href="../help.css"/>
+<title>Using the Flasher Wizard</title>
+</head>
+<body>
+<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/UsingFlasherWizard.xhtml/using_flasher_wizard"/>
+</body>
+</html>
\ No newline at end of file
Copied: trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html (from rev 2308, trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html)
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html (rev 0)
+++ trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+ <meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Using the VNC Viewer</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2>Using the VNC Viewer</h2>
+
+<p>
+ESbox includes a VNC viewer from the Eclipse Target Management project.
+You can use this to see the Tablet screen on your desktop.
+</p>
+<p>
+The VNC Viewer is a view in the default ESbox perspective.
+</p>
+<img src="../images/vnc/esbox-vnc-1.png"/>
+<p>
+Click the Maemo icon to launch the viewer with one of the remote connections:
+</p>
+<img src="../images/vnc/esbox-vnc-2.png"/>
+<p>
+The viewer will connect, possibly asking for a password to launch programs
+on the tablet, and then show up in the view:
+</p>
+<img src="../images/vnc/esbox-vnc-3.png"/>
+<p>
+You can detach the view for easier viewing:
+</p>
+<img src="../images/vnc/esbox-vnc-4.png"/>
+<p/>
+<img src="../images/vnc/esbox-vnc-5.png"/>
+
+<p>You can use the Zoom icons to shrink or grow the view, the Close icon to
+disconnect, and the Open Connection icon to open a custom connection.
+</p>
+<p>
+<b>NOTE:</b> Only one connection may be open at a time.
+</p>
+</body>
+</html>
Deleted: trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml
===================================================================
--- trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.xhtml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="../help.css"/>
-<title>Using the VNC Viewer</title>
-</head>
-<body>
-<h2>Using the VNC Viewer</h2>
-<p>
-ESbox includes a VNC viewer from the Eclipse Target Management project.
-You can use this to see the Tablet screen on your desktop.
-</p>
-<include path="PLUGINS_ROOT/org.maemo.mica.common.help/html/tasks/UsingVNCViewer.xhtml/using_vnc_viewer"/>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/org.maemo.esbox.help/html/tocconcepts.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tocconcepts.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tocconcepts.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -18,7 +18,7 @@
</h3><li><h3><a href="../html/concepts/DebianPackage.xhtml">Debian Package Management</a>
</h3><li><h3><a href="../html/concepts/LocalLaunching.html">Local Launching</a>
</h3><li><h3><a href="../html/concepts/RemoteLaunching.html">Remote Launching</a>
-</h3><li><h3><a href="../html/concepts/Sbrsh.xhtml">Scratchbox Remote Shell (SBRSH)</a>
+</h3><li><h3><a href="../html/concepts/Sbrsh.html">Scratchbox Remote Shell (SBRSH)</a>
</h3><li><h3><a href="../html/concepts/StringExternalization.xhtml">String Externalization</a>
</h3><li><h3><a href="../html/concepts/ProfilingApplications.xhtml">Profiling Applications</a>
</h3></ul>
Modified: trunk/org.maemo.esbox.help/html/tocgettingstarted.html
===================================================================
--- trunk/org.maemo.esbox.help/html/tocgettingstarted.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/tocgettingstarted.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -23,12 +23,11 @@
</li>
<li><a href="../html/tasks/InstallingScratchbox2Targets.html">Installing Scratchbox 2 Targets</a>
</li>
-<li><a href="../html/tasks/UsingFlasherWizard.xhtml">Using the Flasher Wizard</a>
+<li><a href="../html/tasks/UsingFlasherWizard.html">Using the Flasher Wizard</a>
</li>
<li><a href="../html/tasks/InstallingPCConnectivity.xhtml">Installing PC Connectivity</a>
</li>
-</ul><li><h3><a href="../html/tasks/SettingPreferences.xhtml">Configuring Settings</a>
-</h3><li><h3><a href="../html/tasks/ConfigurePythonInterpreter.xhtml">Configuring Python Interpreter</a>
+</ul><li><h3><a href="../html/tasks/SettingPreferences.html">Configuring Settings</a>
</h3><li><h3><a href="../html/concepts/MaemoTargets.html">Understanding Maemo Targets</a>
</h3><li><h3><a href="../html/concepts/MaemoProjects.html">Understanding Maemo Projects</a>
</h3><li><h3><a href="../html/tasks/CreatingCProject.html">Creating a C Maemo Project</a>
Modified: trunk/org.maemo.esbox.help/html/toctasks.html
===================================================================
--- trunk/org.maemo.esbox.help/html/toctasks.html 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/html/toctasks.html 2009-10-14 21:58:23 UTC (rev 2310)
@@ -18,8 +18,7 @@
</h3><li><h3><a href="../html/tasks/InstallingScratchbox1Targets.html">Install Scratchbox 1 Targets</a>
</h3><li><h3><a href="../html/tasks/InstallingScratchbox2Targets.html">Install Scratchbox 2 Targets</a>
</h3><li><h3><a href="../html/tasks/InstallingMaemoSDKVMImage.html">Install Maemo SDK Virtual Image</a>
-</h3><li><h3><a href="../html/tasks/SettingPreferences.xhtml">Setting Up Preferences</a>
-</h3><li><h3><a href="../html/tasks/ConfigurePythonInterpreter.xhtml">Configuring Python Interpreter</a>
+</h3><li><h3><a href="../html/tasks/SettingPreferences.html">Setting Up Preferences</a>
</h3><li><h3><a href="../html/tasks/MakingProjectsVisible.html">Making Projects Visible to Multiple Targets</a>
</h3><li><h3><a href="../html/tasks/CreatingCProject.html">Create a Maemo C Project</a>
</h3><li><h3><a href="../html/tasks/CreatingCppProject.html">Create a Maemo C++ Project</a>
@@ -32,11 +31,11 @@
</h3><li><h3><a href="../html/tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a>
</h3><li><h3><a href="../html/tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></h3>
<ul>
-<li><a href="../html/tasks/UsingFlasherWizard.xhtml">Using the Flasher Wizard</a>
+<li><a href="../html/tasks/UsingFlasherWizard.html">Using the Flasher Wizard</a>
</li>
<li><a href="../html/tasks/SettingsSbrshConfiguration.html">Setting Up an SBRSH Launch</a>
</li>
-<li><a href="../html/tasks/UsingVNCViewer.xhtml">Using the VNC Viewer</a>
+<li><a href="../html/tasks/UsingVNCViewer.html">Using the VNC Viewer</a>
</li>
</ul>
<li><h3><a href="../html/tasks/DebianPackage.html">Debian Package Management</a>
Modified: trunk/org.maemo.esbox.help/tocconcepts.xml
===================================================================
--- trunk/org.maemo.esbox.help/tocconcepts.xml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/tocconcepts.xml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -16,13 +16,13 @@
</topic>
<topic label="Remote Launching" href="html/concepts/RemoteLaunching.html">
</topic>
- <topic label="Scratchbox Remote Shell (SBRSH)" href="html/concepts/Sbrsh.xhtml">
+ <topic label="Scratchbox Remote Shell (SBRSH)" href="html/concepts/Sbrsh.html">
</topic>
<topic label="String Externalization" href="html/concepts/StringExternalization.xhtml">
</topic>
<topic label="Profiling Applications" href="html/concepts/ProfilingApplications.xhtml">
</topic>
- <topic label="Environment Variables" href="html/concepts/Environment.xhtml">
+ <topic label="Environment Variables" href="html/concepts/Environment.html">
</topic>
<topic href="html/concepts/RSEConnection.xhtml" label="RSE Connections">
</topic>
Modified: trunk/org.maemo.esbox.help/tocgettingstarted.xml
===================================================================
--- trunk/org.maemo.esbox.help/tocgettingstarted.xml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/tocgettingstarted.xml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -10,12 +10,12 @@
</topic>
<topic href="html/tasks/InstallingScratchbox2Targets.html" label="Installing Scratchbox 2 Targets">
</topic>
- <topic href="html/tasks/UsingFlasherWizard.xhtml" label="Using the Flasher Wizard">
+ <topic href="html/tasks/UsingFlasherWizard.html" label="Using the Flasher Wizard">
</topic>
<topic href="html/tasks/InstallingPCConnectivity.xhtml" label="Installing PC Connectivity">
</topic>
</topic>
- <topic href="html/tasks/SettingPreferences.xhtml" label="Configuring Settings">
+ <topic href="html/tasks/SettingPreferences.html" label="Configuring Settings">
</topic>
<topic href="html/concepts/MaemoTargets.html" label="Understanding Maemo Targets">
</topic>
Modified: trunk/org.maemo.esbox.help/toctasks.xml
===================================================================
--- trunk/org.maemo.esbox.help/toctasks.xml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.help/toctasks.xml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -10,7 +10,7 @@
</topic>
<topic href="html/tasks/InstallingScratchbox2Targets.html" label="Install Scratchbox 2 Targets">
</topic>
- <topic href="html/tasks/SettingPreferences.xhtml" label="Setting Up Preferences">
+ <topic href="html/tasks/SettingPreferences.html" label="Setting Up Preferences">
</topic>
<topic href="html/tasks/MakingProjectsVisible.html" label="Making Projects Visible to Multiple Targets">
</topic>
@@ -33,15 +33,11 @@
<topic label="Locally Launching a Maemo Application" href="html/tasks/LocalRunDebug.html">
</topic>
<topic label="Remotely Launching a Maemo Application" href="html/tasks/RemoteRunDebug.html">
-
- <topic href="html/tasks/ConfigurePythonInterpreter.xhtml" label="Configuring Python Interpreter">
- </topic>
-
- <topic href="html/tasks/UsingFlasherWizard.xhtml" label="Using the Flasher Wizard">
+ <topic href="html/tasks/UsingFlasherWizard.html" label="Using the Flasher Wizard">
</topic>
<topic href="html/tasks/SettingsSbrshConfiguration.html" label="Setting Up an SBRSH Launch">
</topic>
- <topic href="html/tasks/UsingVNCViewer.xhtml" label="Using the VNC Viewer">
+ <topic href="html/tasks/UsingVNCViewer.html" label="Using the VNC Viewer">
</topic>
</topic>
<topic label="Debian Package Management" href="html/tasks/DebianPackage.html">
Modified: trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java 2009-10-14 21:58:23 UTC (rev 2310)
@@ -339,8 +339,6 @@
machineConfigStackLayout.topControl = noMachineConfigUI;
selectedMachine = null;
selectedMachinePage = null;
- launchButton.setEnabled(false);
-
setErrorMessage(null);
setMessage(null, NONE);
setValid(true);
@@ -385,12 +383,12 @@
IComposablePreferencePage page = machineConfigPages.get(selectedMachine.getName());
if (page != null && !page.isValid())
return false;
+
+ if (launchButton != null) {
+ IMachineController machineController = ((IMachineImpl) selectedMachine).getMachineController();
+ launchButton.setEnabled(machineController instanceof ILaunchableMachineController);
+ }
}
-
- if (launchButton != null) {
- IMachineController machineController = ((IMachineImpl) selectedMachine).getMachineController();
- launchButton.setEnabled(machineController instanceof ILaunchableMachineController);
- }
return true;
}
@@ -597,12 +595,19 @@
*/
@Override
public String getErrorMessage() {
+ String msg = null;
if (selectedMachine != null) {
IComposablePreferencePage pref = machineConfigPages.get(selectedMachine.getName());
if (pref != null)
- return pref.getErrorMessage();
+ msg = pref.getErrorMessage();
}
- return super.getErrorMessage();
+ if (msg == null)
+ msg = super.getErrorMessage();
+
+ if (msg != null) {
+ msg = msg.replaceAll("&(?!&)", "");
+ }
+ return msg;
}
/* (non-Javadoc)
@@ -610,12 +615,19 @@
*/
@Override
public String getMessage() {
+ String msg = null;
if (selectedMachine != null) {
IComposablePreferencePage pref = machineConfigPages.get(selectedMachine.getName());
if (pref != null)
- return pref.getMessage();
+ msg = pref.getMessage();
}
- return super.getMessage();
+ if (msg == null)
+ msg = super.getMessage();
+
+ if (msg != null) {
+ msg = msg.replaceAll("&(?!&)", "");
+ }
+ return msg;
}
/* (non-Javadoc)
Modified: trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/ESboxPythonProjectPackageGatherer.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/ESboxPythonProjectPackageGatherer.java 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/ESboxPythonProjectPackageGatherer.java 2009-10-14 21:58:23 UTC (rev 2310)
@@ -11,16 +11,11 @@
package org.maemo.esbox.internal.python.project.core;
-import java.util.HashSet;
-import java.util.Set;
-
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
-import org.maemo.esbox.internal.python.project.Activator;
import org.maemo.esbox.internal.python.project.ESboxPythonProjectNature;
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.common.project.core.NatureUtils;
@@ -28,8 +23,6 @@
import org.maemo.mica.internal.api.linux.packages.core.ProjectPackageInfo;
import org.maemo.mica.internal.api.python.project.core.MicaPythonImportScanner;
-import com.nokia.cpp.internal.api.utils.core.TextUtils;
-
/**
* Provide the maemo-specific Python development packages for a project.
* @author eswartz
@@ -56,14 +49,8 @@
if (NatureUtils.isNatureInProject(project, ESboxPythonProjectNature.NATURE_ID)) {
ProjectPackageInfo info = new ProjectPackageInfo();
if (sdkTarget != null) {
- Set<String> notFound = new HashSet<String>();
info.getSystemPackages().addAll(MicaPythonImportScanner.getSystemPackages(project,
- sdkTarget, notFound, new SubProgressMonitor(monitor, 0)));
-
- if (!notFound.isEmpty()) {
- Activator.getErrorLogger().log(IStatus.WARNING, "No package mappings for "
- + TextUtils.catenateStrings(notFound.toArray(new String[]{}), ", "), null);
- }
+ sdkTarget, null, new SubProgressMonitor(monitor, 0)));
}
return info;
}
Modified: trunk/org.maemo.esbox.scratchbox.core/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.scratchbox.core/plugin.xml 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.scratchbox.core/plugin.xml 2009-10-14 21:58:23 UTC (rev 2310)
@@ -42,7 +42,6 @@
type="org.maemo.mica.internal.api.cpp.launch.adapters.IGdbServerSupportAdapter">
</adapter>
</factory>
- <!-- specific to sbox -->
<factory
adaptableType="org.maemo.esbox.internal.api.scratchbox.core.sdk.AbstractScratchboxSDKTarget"
class="org.maemo.esbox.internal.scratchbox.adapters.ESBoxSBRSHLaunchAdapterFactory">
@@ -50,7 +49,6 @@
type="org.maemo.mica.internal.api.protocol.launch.sbrsh.ISBRSHLaunchAdapter">
</adapter>
</factory>
- <!-- specific to sbox -->
<factory
adaptableType="org.maemo.esbox.internal.api.scratchbox.core.sdk.AbstractScratchboxSDKTarget"
class="org.maemo.esbox.internal.scratchbox.adapters.ESboxMaemoTargetEnvironmentModifierAdapterFactory">
@@ -58,7 +56,6 @@
type="org.maemo.mica.common.launch.adapters.ITargetEnvironmentModifierAdapter">
</adapter>
</factory>
- <!-- specific to sbox -->
<factory
adaptableType="org.maemo.esbox.internal.api.scratchbox.core.sdk.AbstractScratchboxSDKTarget"
class="org.maemo.esbox.internal.scratchbox.adapters.ESboxMaemoEmulatorExecutionEnvironmentProviderAdapterFactory">
@@ -66,6 +63,14 @@
type="org.maemo.mica.common.core.adapters.IExecutionEnvironmentProviderAdapter">
</adapter>
</factory>
+ <factory
+ adaptableType="org.maemo.esbox.internal.api.scratchbox.core.sdk.AbstractScratchboxSDKTarget"
+ class="org.maemo.esbox.internal.scratchbox.adapters.ESboxDebianDeploySupportAdapterFactory">
+ <adapter
+ type="org.maemo.mica.internal.api.linux.packages.core.adapters.IDebianDeploySupportAdapter">
+ </adapter>
+ </factory>
+
</extension>
<extension
Modified: trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESBoxSBRSHLaunchAdapter.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESBoxSBRSHLaunchAdapter.java 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESBoxSBRSHLaunchAdapter.java 2009-10-14 21:58:23 UTC (rev 2310)
@@ -25,7 +25,6 @@
import org.maemo.mica.common.core.machine.MachineRegistry;
import org.maemo.mica.common.core.preferences.CorePreferenceManager;
import org.maemo.mica.common.core.process.ShellTemplateSubstitutor;
-import org.maemo.mica.common.core.sdk.IDeviceSDKTarget;
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.internal.api.protocol.launch.sbrsh.ISBRSHLaunchAdapter;
import org.maemo.mica.internal.api.protocol.launch.sbrsh.SBRSHLaunchProtocolType;
@@ -278,42 +277,34 @@
/* (non-Javadoc)
* @see org.maemo.mica.internal.api.protocol.launch.sbrsh.ISBRSHLaunchAdapter#getHostIPAddressForDeviceNetwork(org.maemo.mica.protocol.ssh.ISSHMachine)
*/
- public String getHostIPAddressForDeviceConnection(IDeviceSDKTarget deviceTarget)
+ public String getHostIPAddressForDeviceConnection(ISSHMachine sshMachine)
throws MicaException {
- //HACK: ESbox should use the build machine host IP instead the "local machine" address.
-
+ // HACK: ESbox should use the build machine host IP instead the
+ // "local machine" address.
+
String hostAddress = null;
-
- if (deviceTarget.getMachine() instanceof ISSHMachine) {
- if (buildMachine instanceof ISSHMachine) {
- hostAddress = ((ISSHMachine) deviceTarget.getMachine())
- .getSshConfiguration().getHostAddress();
- String ts = ((ISSHMachine) deviceTarget.getMachine())
- .getSshConfiguration().getTargetAddress();
+ if (buildMachine instanceof ISSHMachine) {
+ hostAddress = sshMachine.getSshConfiguration().getHostAddress();
- ISSHMachine buildMachine = (ISSHMachine) this.buildMachine;
+ ISSHMachine buildMachine = (ISSHMachine) this.buildMachine;
- String machineHostingESboxIP = buildMachine
- .getSshConfiguration().getHostAddress();
- String esboxBuildMachineIP = buildMachine.getSshConfiguration()
- .getTargetAddress();
+ String machineHostingESboxIP = buildMachine.getSshConfiguration()
+ .getHostAddress();
+ String esboxBuildMachineIP = buildMachine.getSshConfiguration()
+ .getTargetAddress();
- // if device tries to access the local machine on the same
- // network of build machine
- if (hostAddress.equals(machineHostingESboxIP)) {
- hostAddress = esboxBuildMachineIP; // switch to ESbox Build
- // Machine address
- // In the case of a Virtual machine, this only works if
- // the user rightly configured the Bridge Network
- }
- } else {
- hostAddress = ((ISSHMachine) deviceTarget.getMachine())
- .getSshConfiguration().getHostAddress();
+ // if device tries to access the local machine on the same
+ // network of build machine
+ if (hostAddress.equals(machineHostingESboxIP)) {
+ hostAddress = esboxBuildMachineIP; // switch to ESbox Build
+ // Machine address
+ // In the case of a Virtual machine, this only works if
+ // the user rightly configured the Bridge Network
}
+ } else {
+ hostAddress = sshMachine.getSshConfiguration().getHostAddress();
}
-
-
return hostAddress;
}
Copied: trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java (from rev 2308, trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java 2009-10-14 21:58:23 UTC (rev 2310)
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.scratchbox.adapters;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
+import org.maemo.mica.internal.api.linux.packages.core.adapters.IDebianDeploySupportAdapter;
+
+/**
+ * Scratchbox targets support Debian package installation.
+ * @author eswartz
+ *
+ */
+public class ESboxDebianDeploySupportAdapterFactory implements IAdapterFactory {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
+ */
+ public Object getAdapter(Object adaptableObject, Class adapterType) {
+ if (adapterType.equals(IDebianDeploySupportAdapter.class)
+ && adaptableObject instanceof IScratchboxSDKTarget) {
+ return new IDebianDeploySupportAdapter() {
+
+ public boolean supportsDebianInstallation() {
+ return true;
+ }
+
+ };
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
+ */
+ public Class[] getAdapterList() {
+ return new Class[] { IDebianDeploySupportAdapter.class };
+ }
+
+}
Modified: trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/cpp/TestCppBuildConfigProjectConverter.java
===================================================================
--- trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/cpp/TestCppBuildConfigProjectConverter.java 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/cpp/TestCppBuildConfigProjectConverter.java 2009-10-14 21:58:23 UTC (rev 2310)
@@ -134,7 +134,7 @@
int kindMask = languageData.getSupportedEntryKinds();
assertTrue((kindMask & ICLanguageSettingEntry.INCLUDE_PATH) != 0);
ICLanguageSettingEntry[] entries = languageData.getEntries(ICLanguageSettingEntry.INCLUDE_PATH);
- assertEquals("no indexer data?", 12, entries.length);
+ assertTrue("indexer data = " +entries.length, entries.length >= 12);
assertEquals("no indexer data?", ICLanguageSettingEntry.INCLUDE_PATH, entries[1].getKind());
assertTrue("no indexer data for /project",
Modified: trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java
===================================================================
--- trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/api/vm/core/BaseVirtualMachineController.java 2009-10-14 21:58:23 UTC (rev 2310)
@@ -274,14 +274,14 @@
if (BaseVirtualMachineController.this instanceof BaseLaunchableVirtualMachineController) {
choices = new String[] {
"Launch now",
- "I launched it",
+ "It's running",
IDialogConstants.CANCEL_LABEL
};
launchIndex = 0;
retryIndex = 1;
} else {
choices = new String[] {
- "I launched it",
+ "It's running",
IDialogConstants.CANCEL_LABEL
};
launchIndex = -1;
Modified: trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMUncompressInfoWizardPage.java
===================================================================
--- trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMUncompressInfoWizardPage.java 2009-10-14 21:34:58 UTC (rev 2309)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/internal/vm/vmware/ui/wizards/MaemoSDKVMUncompressInfoWizardPage.java 2009-10-14 21:58:23 UTC (rev 2310)
@@ -177,7 +177,7 @@
public void setVisible(boolean visible) {
super.setVisible(visible);
//set Defaults
- if(uncompressToolTextField.getText().isEmpty()){
+ if(uncompressToolTextField.getText().length() <= 0){
uncompressToolTextField.setText(getDefault7zPath());
validatePage();
}
More information about the Esbox-commits
mailing list