[Esbox-commits] r1218 - in trunk: org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands org.maemo.esbox.product org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Thu Feb 12 16:19:48 EET 2009
Author: eswartz
Date: 2009-02-12 16:19:48 +0200 (Thu, 12 Feb 2009)
New Revision: 1218
Modified:
trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java
trunk/org.maemo.esbox.product/ESbox.product
trunk/org.maemo.esbox.product/plugin.properties
trunk/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/Activator.java
trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware/Activator.java
trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java
Log:
Merge rev 1217 from work_Ed branch
Modified: trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java 2009-02-12 14:06:22 UTC (rev 1217)
+++ trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/BaseTest.java 2009-02-12 14:19:48 UTC (rev 1218)
@@ -13,6 +13,7 @@
import org.junit.Before;
import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
import org.maemo.esbox.internal.scratchbox.sb2.core.Scratchbox2SDK;
+import org.maemo.esbox.scratchbox.core.scratchbox.ScratchboxException;
import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
@@ -46,9 +47,13 @@
public void setUp() throws Exception {
SDKFactory.getInstance().waitForRefreshComplete(null);
this.sb1Sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(IScratchbox1SDK.class).get(0);
- this.sb1Command = ((Scratchbox1SDK) sb1Sdk).getCommandAbstractor();
- this.sb2Sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(IScratchbox2SDK.class).get(0);
- this.sb2Command = ((Scratchbox2SDK) sb2Sdk).getCommandAbstractor();
+ this.sb1Command = ((Scratchbox1SDK) sb1Sdk).getCommandAbstractor();
+ try {
+ this.sb2Sdk = ScratchboxSDKFacade.getInstance().getScratchboxSDK(IScratchbox2SDK.class).get(0);
+ this.sb2Command = ((Scratchbox2SDK) sb2Sdk).getCommandAbstractor();
+ } catch (ScratchboxException e) {
+ // no sb2, fine
+ }
if (sb2Sdk != null) {
for (ISDKTarget target : sb2Sdk.getSDKTargets()) {
if (!TestUtils.isSupportedBuildableSDKTarget(target))
Modified: trunk/org.maemo.esbox.product/ESbox.product
===================================================================
--- trunk/org.maemo.esbox.product/ESbox.product 2009-02-12 14:06:22 UTC (rev 1217)
+++ trunk/org.maemo.esbox.product/ESbox.product 2009-02-12 14:19:48 UTC (rev 1218)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.4"?>
-<product name="ESbox" id="org.maemo.esbox.product.esbox" application="org.eclipse.ui.ide.workbench" version="2.0.0-I20090204" useFeatures="true">
+<product name="ESbox" id="org.maemo.esbox.product.esbox" application="org.eclipse.ui.ide.workbench" version="2.0.0-I20090210" useFeatures="true">
<aboutInfo>
<image path="/org.maemo.esbox.product/icons/esbox_64.png"/>
Modified: trunk/org.maemo.esbox.product/plugin.properties
===================================================================
--- trunk/org.maemo.esbox.product/plugin.properties 2009-02-12 14:06:22 UTC (rev 1217)
+++ trunk/org.maemo.esbox.product/plugin.properties 2009-02-12 14:19:48 UTC (rev 1218)
@@ -13,7 +13,7 @@
productName=ESbox
productBlurb=ESbox\n\
-version: 2.0.0-I20090204\n\
+version: 2.0.0-I20090210\n\
Eclipse build id: {0}\n\
\n\
Copyright (c)2007-2009 INdT, 2007-2009 Nokia Corporation. All rights reserved.\n\
@@ -28,7 +28,7 @@
shortcut.samples.tooltip = Samples
shortcut.whatsnew.tooltip = What's New
-productIntroTitle = Welcome to ESbox 2.0.0-I20090204
+productIntroTitle = Welcome to ESbox 2.0.0-I20090210
productIntroBrandingText = ESbox
introDescription-overview = ESbox is an Eclipse plug-in that helps programmers to develop applications for maemo platform on Scratchbox Apophis.
introDescription-tutorials = Learn how to be productive using ESbox by completing end-to-end tutorials that will guide you along the way.
Modified: trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java
===================================================================
--- trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java 2009-02-12 14:06:22 UTC (rev 1217)
+++ trunk/org.maemo.esbox.vm/src/org/maemo/esbox/internal/vm/Activator.java 2009-02-12 14:19:48 UTC (rev 1218)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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.vm;
import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
Modified: trunk/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/Activator.java
===================================================================
--- trunk/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/Activator.java 2009-02-12 14:06:22 UTC (rev 1217)
+++ trunk/org.maemo.esbox.vm.qemu/src/org/maemo/esbox/internal/vm/qemu/Activator.java 2009-02-12 14:19:48 UTC (rev 1218)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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.vm.qemu;
import org.eclipse.core.runtime.*;
Modified: trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware/Activator.java
===================================================================
--- trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware/Activator.java 2009-02-12 14:06:22 UTC (rev 1217)
+++ trunk/org.maemo.esbox.vm.vmware/src/org/maemo/esbox/vm/vmware/Activator.java 2009-02-12 14:19:48 UTC (rev 1218)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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.vm.vmware;
import org.eclipse.core.runtime.*;
More information about the Esbox-commits
mailing list