[Esbox-commits] r1192 - in trunk: org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards org.maemo.esbox.project.cpp org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards org.maemo.esbox.project.python org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Wed Feb 4 19:33:36 EET 2009
Author: eswartz
Date: 2009-02-04 19:33:35 +0200 (Wed, 04 Feb 2009)
New Revision: 1192
Added:
trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java
trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java
trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java
Removed:
trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java
Modified:
trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java
trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java
trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards/ESboxImportDebianSourcePackageProjectWizard.java
trunk/org.maemo.esbox.project.cpp/plugin.xml
trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppDebianProjectImportConfigurationComposite.java
trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppProjectImportConfigurationComposite.java
trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ConvertToESboxCppProjectWizard.java
trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java
trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java
trunk/org.maemo.esbox.project.python/plugin.xml
trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java
trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
Log:
Merge rev 1191 from work_Ed branch.
Copied: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java (from rev 1191, branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java)
===================================================================
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java (rev 0)
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * 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.maemosdk.core;
+
+import org.maemo.mica.common.core.machine.IBuildMachine;
+import org.maemo.mica.common.core.sdk.ISDK;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+
+/**
+ * This filter passes only SDK targets coming from build machines.
+ * @author eswartz
+ *
+ */
+public class BuildMachineHostedTargetFilter implements IBuildTargetFilter {
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.core.IBuildTargetFilter#accept(org.maemo.mica.common.core.sdk.ISDK)
+ */
+ public boolean accept(ISDK sdk) {
+ return sdk.getMachine() instanceof IBuildMachine;
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.core.IBuildTargetFilter#accept(org.maemo.mica.common.core.sdk.ISDKTarget)
+ */
+ public boolean accept(ISDKTarget sdkTarget) {
+ return accept(sdkTarget.getSDK());
+ }
+
+}
Deleted: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * 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.maemosdk.core;
-
-import org.maemo.mica.common.core.machine.IBuildMachine;
-import org.maemo.mica.common.core.sdk.ISDK;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.common.project.core.IBuildTargetFilter;
-
-/**
- * This filter passes only SDK targets coming from build machines.
- * @author eswartz
- *
- */
-public class ESboxBuildTargetFilter implements IBuildTargetFilter {
-
- /* (non-Javadoc)
- * @see org.maemo.mica.common.project.core.IBuildTargetFilter#accept(org.maemo.mica.common.core.sdk.ISDK)
- */
- public boolean accept(ISDK sdk) {
- return sdk.getMachine() instanceof IBuildMachine;
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.common.project.core.IBuildTargetFilter#accept(org.maemo.mica.common.core.sdk.ISDKTarget)
- */
- public boolean accept(ISDKTarget sdkTarget) {
- return accept(sdkTarget.getSDK());
- }
-
-}
Modified: trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -30,7 +30,9 @@
possibleRootstraps.add("diablo4.1_armel");
possibleRootstraps.add("diablo4.1_i386l");
possibleRootstraps.add("diablo4.1.1_i386");
+ possibleRootstraps.add("diablo4.1.2_i386");
possibleRootstraps.add("diablo4.1.1_armel");
+ possibleRootstraps.add("diablo4.1.2_armel");
possibleRootstraps.add("chinook40_armel");
possibleRootstraps.add("bora31_armel");
possibleRootstraps.add("scirocco2.2_armel");
@@ -45,17 +47,25 @@
public void testInstalledMaemoRootstraps() throws Exception {
List<String> rootstraps =sb2Sdk.getInstalledMaemoRootstraps();
- assertFalse("No rootstraps instaleld", rootstraps.isEmpty());
- for(String rootstrap : rootstraps)
- assertTrue(rootstrap+" is not in possible rootstraps set", possibleRootstraps.contains(rootstrap));
+ assertFalse("No rootstraps installed", rootstraps.isEmpty());
+ // just check that some rootstraps are recognized, not that they are "legal"
+ // or else we have to update this test every month
+ boolean foundLegal = false;
+ for(String rootstrap : rootstraps) {
+ if (possibleRootstraps.contains(rootstrap))
+ foundLegal = true;
+ else {
+ assertNotNull(rootstrap);
+ assertTrue("Empty", rootstrap.length() > 0);
+ }
+ }
+ assertTrue("Found any recognized rootstraps", foundLegal);
+
}
public void testAvailableMaemoRootstraps() throws Exception {
List<MaemoRootstrap> rootstraps = sb2Sdk.getAvailableMaemoRootstraps(sb2Sdk.getMachine());
- // FIXME: tests must not depend so strictly on external state
- //assertTrue("Available rootstrap list is not same as predefined possible rootstraps list.",
- // rootstraps.containsAll(possibleRootstraps) && rootstraps.size()==possibleRootstraps.size());
assertTrue(rootstraps.size() > 2);
}
Modified: trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -26,6 +26,7 @@
import org.maemo.esbox.internal.maemosdk.ui.UIActivator;
import org.maemo.mica.common.core.MicaException;
import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
import org.maemo.mica.common.project.core.ProjectManager;
import org.maemo.mica.common.ui.dialogs.SelectSDKTargetDialog;
@@ -202,8 +203,11 @@
Display.getDefault().syncExec(new Runnable() {
public void run() {
- selected[0] = new SelectSDKTargetDialog(pulldownmenu.getShell(),
- "Select an SDK under which to run maemo:").selectTarget();
+ // TODO: this needs to be a little more specific to scratchbox
+ SelectSDKTargetDialog selectSDKTargetDialog = new SelectSDKTargetDialog(pulldownmenu.getShell(),
+ "Select an SDK under which to run the Maemo Application Framework:",
+ new BuildMachineHostedTargetFilter());
+ selected[0] = selectSDKTargetDialog.selectTarget();
}
});
Modified: trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards/ESboxImportDebianSourcePackageProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards/ESboxImportDebianSourcePackageProjectWizard.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards/ESboxImportDebianSourcePackageProjectWizard.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -12,7 +12,7 @@
package org.maemo.esbox.internal.maemosdk.ui.wizards;
import org.eclipse.ui.IImportWizard;
-import org.maemo.esbox.maemosdk.core.ESboxBuildTargetFilter;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
import org.maemo.mica.common.project.core.IBuildTargetFilter;
import org.maemo.mica.linux.packages.ui.wizards.ImportDebianSourcePackageWizard;
@@ -36,7 +36,7 @@
*/
@Override
protected IBuildTargetFilter createBuildTargetFilter() {
- return new ESboxBuildTargetFilter();
+ return new BuildMachineHostedTargetFilter();
}
}
Modified: trunk/org.maemo.esbox.project.cpp/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.project.cpp/plugin.xml 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.cpp/plugin.xml 2009-02-04 17:33:35 UTC (rev 1192)
@@ -147,9 +147,10 @@
<extension
point="org.eclipse.ui.propertyPages">
+ <!-- old conversion page -->
<page
class="org.maemo.esbox.internal.project.cpp.ui.properties.ESBoxOldCppTargetPropertyPage"
- id="org.maemo.mica.cpp.project.ui.oldESboxProjectPropertyPage"
+ id="org.maemo.esbox.project.cpp.ui.oldESboxProjectPropertyPage"
name="Maemo Build Configurations"
nameFilter="*">
<filter
@@ -161,6 +162,21 @@
</adapt>
</enabledWhen>
</page>
+
+ <!-- new page -->
+ <page
+ class="org.maemo.esbox.internal.project.cpp.ui.properties.ESboxCppBuildConfigurationsPage"
+ id="org.maemo.esbox.project.cpp.ui.BuildConfigurations"
+ name="Maemo Build Configurations">
+ <filter
+ name="nature"
+ value="org.maemo.mica.cpp.project.core.ESboxCppNature">
+ </filter>
+ <enabledWhen>
+ <adapt type="org.eclipse.core.resources.IProject">
+ </adapt>
+ </enabledWhen>
+ </page>
</extension>
<extension
Modified: trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppDebianProjectImportConfigurationComposite.java
===================================================================
--- trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppDebianProjectImportConfigurationComposite.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppDebianProjectImportConfigurationComposite.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -78,5 +78,15 @@
gotIncrRule = true;
}
}
+
+ // as a last resort, use a "clean" rule for configure
+ if (!gotConfigureRule) {
+ for (String rule : rules) {
+ if (!gotConfigureRule && rule.contains("clean")) {
+ setRule(IProjectTypeConfigKeys.KEY_CONFIGURE_BUILD_SETTING, rule, buildConfigureTargetField);
+ gotConfigureRule = true;
+ }
+ }
+ }
}
}
Modified: trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppProjectImportConfigurationComposite.java
===================================================================
--- trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppProjectImportConfigurationComposite.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppProjectImportConfigurationComposite.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -185,7 +185,7 @@
GridData helpLabelGridData = GridDataFactory.swtDefaults().span(2,1).create();
- GridLayoutWrappedTextUtils.setupLabel(getShell(), helpLabel, helpLabelGridData);
+ GridLayoutWrappedTextUtils.setupLabel(getParent(), helpLabel, helpLabelGridData);
Group group = new Group(composite, SWT.NONE);
GridDataFactory.fillDefaults().grab(true, true).indent(6, 6).applyTo(group);
Copied: trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java (from rev 1191, branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java)
===================================================================
--- trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java (rev 0)
+++ trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * 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.project.cpp.ui.properties;
+
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage;
+
+/**
+ * ESbox build configurations page for C/C++ projects.
+ * @author eswartz
+ *
+ */
+public class ESboxCppBuildConfigurationsPage extends MicaBuildConfigurationsPage {
+
+ public ESboxCppBuildConfigurationsPage() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetFilter(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected IBuildTargetFilter createBuildTargetFilter() {
+ return new BuildMachineHostedTargetFilter();
+ }
+
+}
Modified: trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ConvertToESboxCppProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ConvertToESboxCppProjectWizard.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ConvertToESboxCppProjectWizard.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -13,6 +13,8 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.maemo.esbox.internal.project.cpp.Activator;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
import org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard;
/**
@@ -25,6 +27,14 @@
public ConvertToESboxCppProjectWizard() {
super();
}
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard#createBuildTargetFilter()
+ */
+ @Override
+ protected IBuildTargetFilter createBuildTargetFilter() {
+ return new BuildMachineHostedTargetFilter();
+ }
/* (non-Javadoc)
* @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#initializeDefaultPageImageDescriptor()
Modified: trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -13,7 +13,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.maemo.esbox.internal.project.cpp.Activator;
-import org.maemo.esbox.maemosdk.core.ESboxBuildTargetFilter;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
import org.maemo.mica.common.project.core.IBuildTargetFilter;
import org.maemo.mica.cpp.project.core.MicaCppProjectType;
import org.maemo.mica.cpp.project.ui.BaseCppProjectWizard;
@@ -43,7 +43,7 @@
*/
@Override
protected IBuildTargetFilter createBuildTargetFilter() {
- return new ESboxBuildTargetFilter();
+ return new BuildMachineHostedTargetFilter();
}
/* (non-Javadoc)
Modified: trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -13,7 +13,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.maemo.esbox.internal.project.cpp.Activator;
-import org.maemo.esbox.maemosdk.core.ESboxBuildTargetFilter;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
import org.maemo.mica.common.project.core.IBuildTargetFilter;
import org.maemo.mica.cpp.project.core.MicaCppProjectType;
import org.maemo.mica.cpp.project.ui.BaseCppProjectWizard;
@@ -43,7 +43,7 @@
*/
@Override
protected IBuildTargetFilter createBuildTargetFilter() {
- return new ESboxBuildTargetFilter();
+ return new BuildMachineHostedTargetFilter();
}
/* (non-Javadoc)
Modified: trunk/org.maemo.esbox.project.python/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.project.python/plugin.xml 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.python/plugin.xml 2009-02-04 17:33:35 UTC (rev 1192)
@@ -30,7 +30,7 @@
</commonWizard>
</extension>
-
+
<extension
point="org.maemo.mica.linux.packages.core.projectPackageGatherer">
<projectPackageGatherer
Modified: trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java
===================================================================
--- trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -18,7 +18,6 @@
import org.maemo.mica.common.project.core.ProjectConfigHandler;
import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
import org.maemo.mica.python.project.core.MicaPythonProjectType;
-import org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite;
/**
* @author eswartz
Modified: trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
===================================================================
--- trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -34,6 +34,14 @@
MicaBuildConfigurationsPage {
/* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetFilter(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected IBuildTargetFilter createBuildTargetFilter() {
+ return new BuildMachineHostedTargetFilter();
+ }
+
+ /* (non-Javadoc)
* @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#getCurrentConfigurations()
*/
@Override
Copied: trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java (from rev 1191, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java)
===================================================================
--- trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java (rev 0)
+++ trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * 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.project.python.ui.properties;
+
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage;
+
+/**
+ * ESbox Python projects support only build machine targets.
+ * @author eswartz
+ *
+ */
+public class ESboxPythonBuildConfigurationsPage extends MicaBuildConfigurationsPage {
+
+ /**
+ *
+ */
+ public ESboxPythonBuildConfigurationsPage() {
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetFilter(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected IBuildTargetFilter createBuildTargetFilter() {
+ return new BuildMachineHostedTargetFilter();
+ }
+
+}
Modified: trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-02-04 16:31:29 UTC (rev 1191)
+++ trunk/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-02-04 17:33:35 UTC (rev 1192)
@@ -14,7 +14,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.INewWizard;
import org.maemo.esbox.internal.project.python.UIActivator;
-import org.maemo.esbox.maemosdk.core.ESboxBuildTargetFilter;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
import org.maemo.mica.common.project.core.IBuildTargetFilter;
import org.maemo.mica.python.project.core.MicaPythonProjectType;
import org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard;
@@ -52,7 +52,7 @@
*/
@Override
protected IBuildTargetFilter createBuildTargetFilter() {
- return new ESboxBuildTargetFilter();
+ return new BuildMachineHostedTargetFilter();
}
/* (non-Javadoc)
More information about the Esbox-commits
mailing list