[Esbox-commits] r2004 - in branches/work_Raul: org.maemo.esbox.help/html/tasks org.maemo.esbox.maemosdk.core/conf org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard org.maemo.esbox.vm.vmware
raul at garage.maemo.org
raul at garage.maemo.org
Wed Aug 26 05:30:43 EEST 2009
Author: raul
Date: 2009-08-26 05:30:42 +0300 (Wed, 26 Aug 2009)
New Revision: 2004
Modified:
branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
branches/work_Raul/org.maemo.esbox.help/html/tasks/ValidatingPackages.html
branches/work_Raul/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml
branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetCurrentTargetCommand.java
branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java
branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java
branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java
branches/work_Raul/org.maemo.esbox.vm.vmware/build.properties
Log:
merged with trunk 1986:1999
Modified: branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html 2009-08-26 01:51:05 UTC (rev 2003)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html 2009-08-26 02:30:42 UTC (rev 2004)
@@ -170,8 +170,6 @@
<li>
<p>
- If you have not already done so, ensure the device is connected via USB,
- "attached" to the virtual machine if you use one, and ready to go.
The <strong>Retry</strong> button will let you start over if you need
to restart the device or adjust settings.
<p/>
@@ -285,11 +283,6 @@
</li>
<li>
- If <strong>Use from host machine</strong> is set, the flasher binary
- may be used on Windows or Mac OS X with an appropriate port of the flasher.
- </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.
Modified: branches/work_Raul/org.maemo.esbox.help/html/tasks/ValidatingPackages.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/ValidatingPackages.html 2009-08-26 01:51:05 UTC (rev 2003)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/ValidatingPackages.html 2009-08-26 02:30:42 UTC (rev 2004)
@@ -61,6 +61,36 @@
<p/>
<img src="../images/validate/wiz-validate-4-log.png"></p>
</li>
+ <li><b>Troubleshooting:</b>
+ <ul>
+ <li>"The following build packages could not be mapped to known runtime or development packages"
+ <p>Build packages are <strong>pkg-config</strong> package entries which reference
+ the compile-time and link-time flags for a package. These are not the same as
+ Debian apt packages (which are called "system", "runtime", or "development" packages).
+ </p>
+ <p>Mica has a database, created at some point before release, containing a
+ mapping so it can accurately define which Debian package will provide the <strong>pkg-config</strong>
+ package. So "known" only relates to the knowledge encoded there.
+ </p>
+ <p>This message primarily means that the database inside Mica is out of date, or that the
+ repositories did not contain information about these packages at the time the database
+ was created.
+ </p>
+ <p>There's no way to easily update this database without modifying Mica
+ (at this time), so these messages indicate that the package validator does not
+ know whether or not the necessary build-time support is installed.
+ </p>
+ <p>
+ To find the necessary package, use <tt>apt-cache search <basename></tt> in the Scratchbox console, where
+ <strong>basename</strong> is the part of the name without "lib" or "-<version>", etc.
+ to find likely development packages. Usually these are named "...-dev". Then use
+ <tt>fakeroot apt-get install ...<basename>...-dev</tt> to install the necessary
+ development headers and libraries.
+ </p>
+ </li>
+ </ul>
+ </li>
+
</ol>
</body>
Modified: branches/work_Raul/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml 2009-08-26 01:51:05 UTC (rev 2003)
+++ branches/work_Raul/org.maemo.esbox.maemosdk.core/conf/maemo_prefs.xml 2009-08-26 02:30:42 UTC (rev 2004)
@@ -7,7 +7,7 @@
<!-- others commands -->
<entry key="DISPLAY_X_COMMAND_UNIX">Xephyr ${DISPLAY} -host-cursor -dpi 96 -ac -screen ${RESOLUTION} ${PLATFORM_PARAMETERS}</entry>
- <entry key="DISPLAY_X_COMMAND_OSX">Xephyr ${DISPLAY} -host-cursor -dpi 96 -ac -screen ${RESOLUTION} ${PLATFORM_PARAMETERS}</entry>
+ <entry key="DISPLAY_X_COMMAND_OSX">Xephyr ${DISPLAY} -host-cursor -dpi 96 -ac -extension MIT-SHM -screen ${RESOLUTION} ${PLATFORM_PARAMETERS}</entry>
<entry key="DISPLAY_X_COMMAND_WIN32">c:/cygwin/bin/Xwin ${DISPLAY} -lesspointer -swcursor -dpi 96 -ac -screen 0 ${RESOLUTION} ${PLATFORM_PARAMETERS}</entry>
<!-- this is initialized dynamically <entry key="DISPLAY_X_COMMAND"></entry> -->
Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetCurrentTargetCommand.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetCurrentTargetCommand.java 2009-08-26 01:51:05 UTC (rev 2003)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/command/GetCurrentTargetCommand.java 2009-08-26 02:30:42 UTC (rev 2004)
@@ -55,8 +55,9 @@
Process process = createProcess(currentTargetCommand, null);
- String currentTarget = getInputFromProcessAndWait(process, false, 0);
-
+ // allow errors due to ESbox #4386
+ String currentTarget = getInputFromProcessAndWait(process, true, 0);
+
return currentTarget;
}
Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java 2009-08-26 01:51:05 UTC (rev 2003)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/core/Scratchbox1SDK.java 2009-08-26 02:30:42 UTC (rev 2004)
@@ -83,9 +83,9 @@
*/
@SuppressWarnings("unchecked")
public List<String> getTargets() throws MicaException {
- String[] targetsArray = (String[]) getCache().get(TARGETS_KEY, String[].class);
- if (targetsArray != null)
- return Arrays.asList(targetsArray);
+ List<String> cachedTargetsList = getCachedTargets();
+ if (cachedTargetsList != null)
+ return cachedTargetsList;
// no, this call itself is invoked as part of initialization
//ensureInitialized();
@@ -104,6 +104,17 @@
return targets;
}
+ /**
+ * @return
+ */
+ private List<String> getCachedTargets() {
+ String[] targetsArray = (String[]) getCache().get(TARGETS_KEY, String[].class);
+ if (targetsArray != null)
+ return Arrays.asList(targetsArray);
+ else
+ return null;
+ }
+
/* (non-Javadoc)
* @see org.maemo.esbox.internal.api.scratchbox.core.sdk.AbstractScratchboxSDK#init()
*/
@@ -335,6 +346,18 @@
currentTarget = (String) wrapCommand(getCurrentTargetCommand, EMPTY_ARGS);
+ // be more defensive in case there is garbage here
+ List<String> cachedTargets = getCachedTargets();
+ if (cachedTargets != null) {
+ String[] words = currentTarget.split("\\s+");
+ for (String word : words) {
+ if (cachedTargets.contains(word)) {
+ currentTarget = word;
+ break;
+ }
+ }
+ }
+
getCache().set(CURRENT_TARGET_KEY, currentTarget);
return currentTarget;
}
Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java 2009-08-26 01:51:05 UTC (rev 2003)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1SDKInstallerDataContentLabelProvider.java 2009-08-26 02:30:42 UTC (rev 2004)
@@ -73,30 +73,6 @@
"scratchbox-devkit-apt-https"
));
}
- //Fremantle Beta 1
- urls = fetchScriptsFromUrl(
- "http://repository.maemo.org/unstable/5.0beta/",
- "maemo-scratchbox-install.*\\.sh");
-
- for (URL url : urls) {
- contents.add(new Scratchbox1SDKInstallerData(
- "Maemo 5 Series (Fremantle) (Beta 1 Release)",5, url,
- ((IBuildMachine) newInput),
- "deb http://scratchbox.org/debian/ maemo5-sdk main",
- "scratchbox-core", "scratchbox-libs",
- "scratchbox-devkit-qemu",
- "scratchbox-devkit-debian",
- "scratchbox-devkit-doctools",
- "scratchbox-devkit-perl",
- "scratchbox-toolchain-host-gcc",
- "scratchbox-toolchain-cs2007q3-glibc2.5-arm7",
- "scratchbox-toolchain-cs2007q3-glibc2.5-i486",
- "scratchbox-devkit-svn",
- "scratchbox-devkit-git",
- "scratchbox-devkit-apt-https"
- ));
- }
-
}
}
Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java 2009-08-26 01:51:05 UTC (rev 2003)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerDataContentLabelProvider.java 2009-08-26 02:30:42 UTC (rev 2004)
@@ -70,22 +70,6 @@
));
}
- // Fremantle Beta release support
- urls = fetchScriptsFromUrl(
- "http://repository.maemo.org/unstable/5.0beta/",
- "maemo-sdk-install.*\\.sh");
-
- for (URL url : urls) {
- contents.add(new Scratchbox1TargetInstallerData(
- "Maemo 5.0 Fremantle (Beta 1 Release)",
- url,
- sdks.size() > 0 ? sdks.get(0) : null,
- "FREMANTLE",
- new String[] { "qemu-arm-sb" },
- new String[] { "cs2007q3-glibc2.5-arm7", "cs2007q3-glibc2.5-i486" },
- new String[] { "qemu", "perl", "debian-etch", "doctools", "svn", "git", "apt-https" }
- ));
- }
}
}
private Image platformImage;
Modified: branches/work_Raul/org.maemo.esbox.vm.vmware/build.properties
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.vmware/build.properties 2009-08-26 01:51:05 UTC (rev 2003)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/build.properties 2009-08-26 02:30:42 UTC (rev 2004)
@@ -6,4 +6,5 @@
conf/,\
about_files/,\
about.html,\
- data/
+ data/,\
+ icons/
More information about the Esbox-commits
mailing list