[Esbox-commits] r1536 - in trunk: org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Tue May 5 05:25:20 EEST 2009
Author: eswartz
Date: 2009-05-05 05:25:18 +0300 (Tue, 05 May 2009)
New Revision: 1536
Modified:
trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java
trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java
trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleLicenseAgreementPage.java
trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java
trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListCommands.java
Log:
Merge revs 1508:1535 from work_Ed branch
Modified: trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java 2009-05-04 20:41:53 UTC (rev 1535)
+++ trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/sdk/AbstractScratchboxSDK.java 2009-05-05 02:25:18 UTC (rev 1536)
@@ -51,6 +51,8 @@
public AbstractScratchboxSDK(IMachine machine, IPath location, String version, String name,
int versionNumber) {
super(machine, version, name);
+ if (location == null)
+ throw new IllegalArgumentException();
this.installLocation = location;
this.versionNumberKey = versionNumber;
setCache(ScratchboxCacheUtils.getCache(this));
@@ -102,16 +104,6 @@
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see org.maemo.esbox.common.core.sdk.ISDK#refresh()
- */
- public void refresh() {
- getCache().clear();
- super.refresh();
- }
-
/* (non-Javadoc)
* @see org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK#getInstallLocation()
*/
Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java 2009-05-04 20:41:53 UTC (rev 1535)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java 2009-05-05 02:25:18 UTC (rev 1536)
@@ -41,7 +41,7 @@
* @see org.maemo.mica.common.core.adapters.ISDKManageTargetAdapter#prepareRefresh()
*/
public void prepareRefresh() {
- sdk.getCache().clear();
+ // TODO: remove; this is already done in BaseSDK#refresh()
}
/*
Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java 2009-05-04 20:41:53 UTC (rev 1535)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java 2009-05-05 02:25:18 UTC (rev 1536)
@@ -79,6 +79,7 @@
private ComboViewer sboxCombo;
protected IScratchbox1SDK sdk;
private ISDKFactoryListener sdkListener;
+ private Button forceRemove;
/**
* @param sdk
@@ -294,7 +295,7 @@
//Label label = new Label(composite, SWT.NONE);
//GridDataFactory.swtDefaults().span(2, 1).align(SWT.LEFT, SWT.CENTER).applyTo(label);
- final Button forceRemove = new Button(composite, SWT.CHECK);
+ forceRemove = new Button(composite, SWT.CHECK);
GridDataFactory.swtDefaults().span(2, 1).align(SWT.LEFT, SWT.CENTER).applyTo(forceRemove);
forceRemove.setText("Remove existing targets");
forceRemove.setToolTipText("If checked, remove existing targets if they already exist.");
@@ -583,6 +584,8 @@
// pick one
cpuTranspCombo.setSelection(new StructuredSelection(choices[0]));
}
+
+ forceRemove.setSelection(data.isForceRemove());
}
}
Modified: trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleLicenseAgreementPage.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleLicenseAgreementPage.java 2009-05-04 20:41:53 UTC (rev 1535)
+++ trunk/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/nokiabin/FremantleLicenseAgreementPage.java 2009-05-05 02:25:18 UTC (rev 1536)
@@ -62,7 +62,7 @@
protected FremantleLicenseAgreementPage(NokiaBinariesInstallWizard wizard) {
super("fremantle_license_agreement");
setTitle("License Agreement");
- setDescription("End User License Agreement PAge");
+ setDescription("End User License Agreement Page");
setPageComplete(false);
setWizard(wizard);
this.next = new FremantleWorkPage(wizard);
Modified: trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java 2009-05-04 20:41:53 UTC (rev 1535)
+++ trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestGdbQemuCommand.java 2009-05-05 02:25:18 UTC (rev 1536)
@@ -34,7 +34,9 @@
assertTrue(pattern, pattern.contains("qemu-arm"));
if (pattern.contains("qemu-arm-0.7"))
assertFalse(pattern, pattern.contains("${PORT}"));
- else if (pattern.contains("qemu-arm-0.8"))
+ else if (pattern.contains("qemu-arm-0.8")
+ || pattern.contains("qemu-arm-cvs")
+ || pattern.contains("qemu-arm-sb"))
assertTrue(pattern, pattern.contains("${PORT}"));
}
System.out.println("pattern of gdb-qemu for " + sdkTarget + " is " + pattern);
Modified: trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListCommands.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListCommands.java 2009-05-04 20:41:53 UTC (rev 1535)
+++ trunk/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestListCommands.java 2009-05-05 02:25:18 UTC (rev 1536)
@@ -137,6 +137,15 @@
.add("/scratchbox/devkits/cputransp/bin/qemu-sparc-0.8.2-sb2");
cputranspExpected.add("/scratchbox/devkits/cputransp/bin/sbrsh");
+ // new in Fremantle
+ cputranspExpected.add("/scratchbox/devkits/qemu/bin/qemu-arm-sb");
+ cputranspExpected.add("/scratchbox/devkits/qemu/bin/qemu-armeb-sb");
+ cputranspExpected.add("/scratchbox/devkits/qemu/bin/qemu-i386-sb");
+ cputranspExpected.add("/scratchbox/devkits/qemu/bin/qemu-mips-sb");
+ cputranspExpected.add("/scratchbox/devkits/qemu/bin/qemu-mipsel-sb");
+ cputranspExpected.add("/scratchbox/devkits/qemu/bin/qemu-ppc-sb");
+ cputranspExpected.add("/scratchbox/devkits/qemu/bin/qemu-sparc-sb");
+
ListCputranspCommand listCputranspCommand = new ListCputranspCommand(sb1Command);
List<String> cputransps = null;
@@ -182,6 +191,10 @@
devkitsExpected.add("debian-sarge");
devkitsExpected.add("doctools");
devkitsExpected.add("perl");
+ devkitsExpected.add("qemu");
+ devkitsExpected.add("apt-https");
+ devkitsExpected.add("svn");
+ devkitsExpected.add("git");
ListDevkitsCommand listDevkitsCommand = new ListDevkitsCommand(sb1Command);
List<String> devkits = null;
More information about the Esbox-commits
mailing list