<b>Merged with ESbox <u>r942.</u></b><br><br><div class="gmail_quote">On Mon, Nov 17, 2008 at 6:07 PM, <span dir="ltr"><<a href="mailto:raul@garage.maemo.org">raul@garage.maemo.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Author: raul<br>
Date: 2008-11-17 23:07:20 +0200 (Mon, 17 Nov 2008)<br>
New Revision: 944<br>
<br>
Modified:<br>
trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java<br>
trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/MaemoTargetEnvironmentModifierAdapter.java<br>
trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestOProfileValgrindSupport.java<br>
trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java<br>
trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java<br>
trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java<br>
trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDKTarget.java<br>
trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java<br>
trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java<br>
trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java<br>
trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java<br>
trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java<br>
trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java<br>
Log:<br>
Merged with changes sent by Ed as a patch. These changes provide a machine for ISDKTarget (ISDKTarget#getMachine()). Those places where ISDK#getMachine() were changed to use ISDKTarget#getMachine() instead.<br>
<br>
Modified: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoLauncher.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -62,7 +62,7 @@<br>
IProcessLauncherFactory processLauncherFactory = sdkTarget.getProcessLauncherFactory();<br>
<br>
IEnvironmentModifierBlock envBlock = processLauncherFactory.defaultEnvironmentModifierBlock();<br>
- MaemoEnvironmentUtils.defineEmulatorXDisplayVariable(sdkTarget.getSDK().getMachine(), envBlock);<br>
+ MaemoEnvironmentUtils.defineEmulatorXDisplayVariable(sdkTarget.getMachine(), envBlock);<br>
<br>
IProcessLauncher processLauncher = ProcessLauncherCreator.createProcessLauncher(processLauncherFactory, null,<br>
Collections.singletonList(maemoCommand), envBlock);<br>
@@ -172,8 +172,7 @@<br>
*/<br>
private boolean testMaemoLauncher(ISDKTarget sdkTarget)<br>
throws MicaException {<br>
- List<IProcess> runningProcesses = getMaemoLaunchers(sdkTarget.getSDK()<br>
- .getMachine());<br>
+ List<IProcess> runningProcesses = getMaemoLaunchers(sdkTarget.getMachine());<br>
return runningProcesses.size() > 0;<br>
}<br>
<br>
@@ -248,7 +247,7 @@<br>
* @throws MicaException<br>
*/<br>
public void killMaemo(ISDKTarget sdkTarget) throws MicaException {<br>
- List<IProcess> pids = getMaemoLaunchers(sdkTarget.getSDK().getMachine());<br>
+ List<IProcess> pids = getMaemoLaunchers(sdkTarget.getMachine());<br>
if (pids.size() == 0)<br>
return;<br>
<br>
@@ -261,7 +260,7 @@<br>
}<br>
<br>
// try again<br>
- pids = getMaemoLaunchers(sdkTarget.getSDK().getMachine());<br>
+ pids = getMaemoLaunchers(sdkTarget.getMachine());<br>
if (pids.size() == 0)<br>
return;<br>
<br>
<br>
Modified: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/MaemoTargetEnvironmentModifierAdapter.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/MaemoTargetEnvironmentModifierAdapter.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/maemosdk/core/adapters/MaemoTargetEnvironmentModifierAdapter.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -45,7 +45,7 @@<br>
envBlock.define("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/session_bus_socket");<br>
<br>
if (launchProxy instanceof AbstractLocalLaunchProxy) {<br>
- MaemoEnvironmentUtils.defineEmulatorXDisplayVariable(sdkTarget.getSDK().getMachine(), envBlock);<br>
+ MaemoEnvironmentUtils.defineEmulatorXDisplayVariable(sdkTarget.getMachine(), envBlock);<br>
<br>
} else {<br>
// remote launches need DISPLAY for its own machine<br>
<br>
Modified: trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestOProfileValgrindSupport.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestOProfileValgrindSupport.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestOProfileValgrindSupport.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -43,7 +43,7 @@<br>
assertNotNull(sdkTarget.getName(), oprofileSupport);<br>
assertNotNull(sdkTarget.getName(), valgrindSupportAdapter);<br>
<br>
- IMachine machine = sdkTarget.getSDK().getMachine();<br>
+ IMachine machine = sdkTarget.getMachine();<br>
if (sdkTarget.getArchitecture().equals(IScratchboxSDKTarget.ARCHITECTURE_ARMEL)) {<br>
armelTarget = sdkTarget;<br>
assertNotNull(oprofileSupport.validateSupport(machine)); // not a device<br>
<br>
Modified: trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestProcessLauncher.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -71,7 +71,7 @@<br>
|| target.getName().contains("REMOVE")<br>
|| target.getName().contains("bora"))<br>
continue;<br>
- if (!validateMachine(target.getSDK().getMachine()))<br>
+ if (!validateMachine(target.getMachine()))<br>
continue;<br>
if (--count < 0)<br>
break;<br>
@@ -232,7 +232,7 @@<br>
private IPath createStockScript(ISDKTarget target, String cmdText)<br>
throws Exception {<br>
<br>
- IPath scriptPath = target.getSDK().getMachine().getUserHome().append(".tmp").append("foo.sh");<br>
+ IPath scriptPath = target.getMachine().getUserHome().append(".tmp").append("foo.sh");<br>
IPath targetPath = target.getMachineToSDKTargetFileSystemMapping().convertTargetToHostPath(scriptPath);<br>
target.getTargetFileSystemAccess().getFileStore(targetPath.removeLastSegments(1)).mkdir(0, null);<br>
<br>
@@ -430,7 +430,7 @@<br>
// make an overridden environment that has the script directory in its PATH<br>
String scriptDir = scriptPath.removeLastSegments(1).toPortableString();<br>
IEnvironmentModifierBlock envVarBlock =<br>
- ProcessLauncherUtils.addToPATH(target.getSDK().getMachine(),<br>
+ ProcessLauncherUtils.addToPATH(target.getMachine(),<br>
target.getProcessLauncherFactory(),<br>
scriptDir, true);<br>
<br>
<br>
Modified: trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB1SDKProvider.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -146,7 +146,7 @@<br>
assertTrue(target + " @" + sbPath.toString(), store.fetchInfo().exists());<br>
<br>
// if we happen to be running locally, verify sanity<br>
- if (target.getSDK().getMachine() instanceof ILocalMachine) {<br>
+ if (target.getMachine() instanceof ILocalMachine) {<br>
try {<br>
hostPath = target.convertTargetToHostPath(sbPath);<br>
assertTrue(hostPath.toFile().toString(),<br>
<br>
Modified: trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/TestSB2SDKProvider.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -120,7 +120,7 @@<br>
<br>
// these tests only work on machine<br>
IPath hostPath = new Path("/");<br>
- if (target.getSDK().getMachine() instanceof ILocalMachine) {<br>
+ if (target.getMachine() instanceof ILocalMachine) {<br>
try {<br>
sbPath = target.convertHostToTargetPath(hostPath);<br>
} catch (MicaException e) {<br>
<br>
Modified: trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDKTarget.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDKTarget.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDKTarget.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -50,7 +50,7 @@<br>
*/<br>
public ICommandAbstractor getCommandAbstractor() throws MicaException {<br>
// ensure machine is alive<br>
- MachineUtils.acquireMachine(this.getSDK().getMachine());<br>
+ MachineUtils.acquireMachine(this.getMachine());<br>
<br>
return new ICommandAbstractor() {<br>
<br>
<br>
Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1EnvironmentProvider.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -65,8 +65,7 @@<br>
.logError(<br>
"Failed to read scratchbox environment; using system environment",<br>
e);<br>
- standardEnv = sdkTarget.getSDK().getMachine()<br>
- .getStandardEnvironment();<br>
+ standardEnv = sdkTarget.getMachine().getStandardEnvironment();<br>
}<br>
<br>
cachedStdEnvMap.put(sdkTarget, standardEnv);<br>
<br>
Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/launcher/Scratchbox1ProcessLauncher.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -215,7 +215,7 @@<br>
*/<br>
@Override<br>
protected Process doCreateProcess() throws Exception {<br>
- return sdkTarget.getSDK().getMachine().createProcess(<br>
+ return sdkTarget.getMachine().createProcess(<br>
getLaunchCurrentWorkingDirectory(),<br>
getLaunchCommandArguments(),<br>
getLaunchEnvironmentModifierBlock(), isUsePTY());<br>
<br>
Modified: trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -355,8 +355,7 @@<br>
IScratchboxSDKTarget sdkTarget, List<IPath> hostPaths)<br>
throws MicaException {<br>
// find cached value<br>
- CacheUtils.getInstance().ensureCurrentMachine(SB2_MACHINE, sdkTarget.getSDK()<br>
- .getMachine());<br>
+ CacheUtils.getInstance().ensureCurrentMachine(SB2_MACHINE, sdkTarget.getMachine());<br>
Map<String, Map<String, String>> targetToPathMappingsMap = null;<br>
Map<String, String> storedPathMappings = null;<br>
targetToPathMappingsMap = (Map<String, Map<String, String>>) CacheUtils<br>
@@ -464,8 +463,7 @@<br>
private synchronized IPath getMaemoRootstrapPath(<br>
Scratchbox2SDKTarget sdkTarget) throws MicaException {<br>
// find cached value<br>
- CacheUtils.getInstance().ensureCurrentMachine(SB_MACHINE, sdkTarget.getSDK()<br>
- .getMachine());<br>
+ CacheUtils.getInstance().ensureCurrentMachine(SB_MACHINE, sdkTarget.getMachine());<br>
Map<String, String> targetToRootstrapMap = null;<br>
targetToRootstrapMap = (Map<String, String>) CacheUtils.getInstance()<br>
.getCachedValue(SB2_TARGET_TO_ROOTSTRAP_MAP);<br>
<br>
Modified: trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2EnvironmentProvider.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -75,8 +75,7 @@<br>
.logError(<br>
"Failed to read scratchbox environment; using system environment",<br>
e);<br>
- standardEnv = sdkTarget.getSDK().getMachine()<br>
- .getStandardEnvironment();<br>
+ standardEnv = sdkTarget.getMachine().getStandardEnvironment();<br>
}<br>
<br>
cachedStdEnvMap.put(sdkTarget, standardEnv);<br>
<br>
Modified: trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/launcher/Scratchbox2ProcessLauncher.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -107,7 +107,7 @@<br>
*/<br>
@Override<br>
protected Process doCreateProcess() throws Exception {<br>
- return sdkTarget.getSDK().getMachine().createProcess(<br>
+ return sdkTarget.getMachine().createProcess(<br>
getLaunchCurrentWorkingDirectory(),<br>
getLaunchCommandArguments(),<br>
getLaunchEnvironmentModifierBlock(), isUsePTY());<br>
<br>
Modified: trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java<br>
===================================================================<br>
--- trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java 2008-11-17 21:02:53 UTC (rev 943)<br>
+++ trunk/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java 2008-11-17 21:07:20 UTC (rev 944)<br>
@@ -99,8 +99,7 @@<br>
// see if a rootstrap -- possibly disconnected from the target --<br>
// exists<br>
List<MaemoRootstrap> rootstraps = sdk<br>
- .getAvailableMaemoRootstraps(selectedTarget.getSDK()<br>
- .getMachine());<br>
+ .getAvailableMaemoRootstraps(selectedTarget.getMachine());<br>
for (MaemoRootstrap rootstrap : rootstraps) {<br>
if (rootstrap.getName().equals(selectedTarget.getName())) {<br>
rootstrapUsed_ = true;<br>
<br>
_______________________________________________<br>
Esbox-commits mailing list<br>
<a href="mailto:Esbox-commits@garage.maemo.org">Esbox-commits@garage.maemo.org</a><br>
<a href="https://garage.maemo.org/mailman/listinfo/esbox-commits" target="_blank">https://garage.maemo.org/mailman/listinfo/esbox-commits</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>Raul Fernandes Herbster<br>Embedded and Pervasive Computing Laboratory - <a href="http://embedded.ufcg.edu.br">embedded.ufcg.edu.br</a><br>Electrical Engineering and Informatics Center - CEEI<br>
Federal University of Campina Grande - UFCG - <a href="http://www.ufcg.edu.br">www.ufcg.edu.br</a><br>Caixa Postal 10105<br>58109-970 Campina Grande - PB - Brasil<br>