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