[Esbox-commits] r1191 - in branches/work_Ed: 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.product org.maemo.esbox.product-feature org.maemo.esbox.product.supplement-feature 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 18:31:29 EET 2009
Author: eswartz
Date: 2009-02-04 18:31:29 +0200 (Wed, 04 Feb 2009)
New Revision: 1191
Added:
branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java
branches/work_Ed/org.maemo.esbox.product/cleanup-merged-product-build.py
branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java
Removed:
branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java
Modified:
branches/work_Ed/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java
branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java
branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards/ESboxImportDebianSourcePackageProjectWizard.java
branches/work_Ed/org.maemo.esbox.product-feature/feature.xml
branches/work_Ed/org.maemo.esbox.product.supplement-feature/feature.xml
branches/work_Ed/org.maemo.esbox.product/ESbox.product
branches/work_Ed/org.maemo.esbox.project.cpp/plugin.xml
branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppDebianProjectImportConfigurationComposite.java
branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppProjectImportConfigurationComposite.java
branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ConvertToESboxCppProjectWizard.java
branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java
branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java
branches/work_Ed/org.maemo.esbox.project.python/plugin.xml
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
Log:
Bugfixes and improvements for RC1 build:
-- filter the build target list so RSE connections don't show up in nonsensical places
-- make Maemo Build Configurations panels project specific too (moving extension points around) (note, can't do this for Python yet)
-- move (new) "Build settings" page to top level as C/C++ Build Settings
-- add timeout option for apt wizards
-- add update/upgrade options for validate packages wizard
-- pick "clean" target as default for apt "configure" target
-- properly handle "default" build for apt projects
-- fix bug detecting source type in apt import
-- fix bug initializing package manager for RSE target
-- make an SB2 test less sensitive to change
-- fix some exceptions in Debian export wizard
-- fix display of dialog when removing sbox targets
Merge revs 411:433 from trunk
Copied: branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java (from rev 1187, branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/BuildMachineHostedTargetFilter.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/maemosdk/core/ESboxBuildTargetFilter.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.tests/src/org/maemo/esbox/scratchbox/tests/commands/TestScratchbox2SDK.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/actions/MaemoDropdownMenuAction.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards/ESboxImportDebianSourcePackageProjectWizard.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards/ESboxImportDebianSourcePackageProjectWizard.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/wizards/ESboxImportDebianSourcePackageProjectWizard.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.product/ESbox.product
===================================================================
--- branches/work_Ed/org.maemo.esbox.product/ESbox.product 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.product/ESbox.product 2009-02-04 16:31:29 UTC (rev 1191)
@@ -1,163 +1,145 @@
-<?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-I20090114" useFeatures="true">
-
- <aboutInfo>
- <image path="/org.maemo.esbox.product/icons/esbox_64.png"/>
- <text>
- %productBlurb
- </text>
- </aboutInfo>
-
- <configIni use="default">
- </configIni>
-
- <launcherArgs>
+<?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">
+
+ <aboutInfo>
+ <image path="/org.maemo.esbox.product/icons/esbox_64.png"/>
+ <text>
+ %productBlurb
+ </text>
+ </aboutInfo>
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
<vmArgs>-Xms40m
-Xmx800m
--XX:MaxPermSize=128m</vmArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
- </launcherArgs>
-
- <windowImages i16="/org.maemo.esbox.product/icons/esbox_16.png" i32="/org.maemo.esbox.product/icons/esbox_32.png" i48="/org.maemo.esbox.product/icons/esbox_48.png" i64="/org.maemo.esbox.product/icons/esbox_64.png" i128="/org.maemo.esbox.product/icons/esbox_128.png"/>
-
- <splash
- location="org.maemo.esbox.product"
- startupProgressRect="0,176,467,16"
- startupMessageRect="32,160,398,16"
- startupForegroundColor="000000" />
- <launcher name="esbox">
- <solaris/>
- <win useIco="false">
- <bmp/>
- </win>
- </launcher>
-
- <intro introId="org.maemo.esbox.product.intro"/>
-
- <vm>
- </vm>
-
- <plugins>
- <plugin id="com.ibm.icu"/>
- <plugin id="com.jcraft.jsch"/>
- <plugin id="com.redhat.eclipse.cdt.autotools"/>
- <plugin id="org.eclipse.cdt.core"/>
- <plugin id="org.eclipse.cdt.core.aix"/>
+-XX:MaxPermSize=128m</vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ </launcherArgs>
+
+ <windowImages i16="/org.maemo.esbox.product/icons/esbox_16.png" i32="/org.maemo.esbox.product/icons/esbox_32.png" i48="/org.maemo.esbox.product/icons/esbox_48.png" i64="/org.maemo.esbox.product/icons/esbox_64.png" i128="/org.maemo.esbox.product/icons/esbox_128.png"/>
+
+ <splash
+ location="org.maemo.esbox.product"
+ startupProgressRect="0,176,467,16"
+ startupMessageRect="32,160,398,16"
+ startupForegroundColor="000000" />
+ <launcher name="esbox">
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <intro introId="org.maemo.esbox.product.intro"/>
+
+ <vm>
+ </vm>
+
+ <plugins>
+ <plugin id="com.ibm.icu"/>
+ <plugin id="com.jcraft.jsch"/>
+ <plugin id="com.redhat.eclipse.cdt.autotools"/>
+ <plugin id="org.eclipse.cdt.core"/>
+ <plugin id="org.eclipse.cdt.core.aix"/>
<plugin id="org.eclipse.cdt.core.linux" fragment="true"/>
- <plugin id="org.eclipse.cdt.core.linux.ia64"/>
- <plugin id="org.eclipse.cdt.core.linux.ppc"/>
+ <plugin id="org.eclipse.cdt.core.linux.ia64"/>
+ <plugin id="org.eclipse.cdt.core.linux.ppc"/>
<plugin id="org.eclipse.cdt.core.linux.x86" fragment="true"/>
- <plugin id="org.eclipse.cdt.core.linux.x86_64"/>
- <plugin id="org.eclipse.cdt.core.macosx"/>
- <plugin id="org.eclipse.cdt.core.qnx"/>
- <plugin id="org.eclipse.cdt.core.solaris"/>
+ <plugin id="org.eclipse.cdt.core.linux.x86_64"/>
+ <plugin id="org.eclipse.cdt.core.macosx"/>
+ <plugin id="org.eclipse.cdt.core.qnx"/>
+ <plugin id="org.eclipse.cdt.core.solaris"/>
<plugin id="org.eclipse.cdt.core.win32"/>
- <plugin id="org.eclipse.cdt.debug.core"/>
- <plugin id="org.eclipse.cdt.debug.mi.core"/>
- <plugin id="org.eclipse.cdt.debug.mi.ui"/>
- <plugin id="org.eclipse.cdt.debug.ui"/>
- <plugin id="org.eclipse.cdt.launch"/>
- <plugin id="org.eclipse.cdt.make.core"/>
- <plugin id="org.eclipse.cdt.make.ui"/>
- <plugin id="org.eclipse.cdt.managedbuilder.core"/>
- <plugin id="org.eclipse.cdt.managedbuilder.gnu.ui"/>
- <plugin id="org.eclipse.cdt.managedbuilder.ui"/>
- <plugin id="org.eclipse.cdt.ui"/>
- <plugin id="org.eclipse.compare"/>
- <plugin id="org.eclipse.core.commands"/>
- <plugin id="org.eclipse.core.contenttype"/>
- <plugin id="org.eclipse.core.databinding"/>
- <plugin id="org.eclipse.core.expressions"/>
- <plugin id="org.eclipse.core.filebuffers"/>
- <plugin id="org.eclipse.core.filesystem"/>
+ <plugin id="org.eclipse.cdt.debug.core"/>
+ <plugin id="org.eclipse.cdt.debug.mi.core"/>
+ <plugin id="org.eclipse.cdt.debug.mi.ui"/>
+ <plugin id="org.eclipse.cdt.debug.ui"/>
+ <plugin id="org.eclipse.cdt.launch"/>
+ <plugin id="org.eclipse.cdt.make.core"/>
+ <plugin id="org.eclipse.cdt.make.ui"/>
+ <plugin id="org.eclipse.cdt.managedbuilder.core"/>
+ <plugin id="org.eclipse.cdt.managedbuilder.gnu.ui"/>
+ <plugin id="org.eclipse.cdt.managedbuilder.ui"/>
+ <plugin id="org.eclipse.cdt.ui"/>
+ <plugin id="org.eclipse.compare"/>
+ <plugin id="org.eclipse.core.commands"/>
+ <plugin id="org.eclipse.core.contenttype"/>
+ <plugin id="org.eclipse.core.databinding"/>
+ <plugin id="org.eclipse.core.expressions"/>
+ <plugin id="org.eclipse.core.filebuffers"/>
+ <plugin id="org.eclipse.core.filesystem"/>
<plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true"/>
- <plugin id="org.eclipse.core.jobs"/>
- <plugin id="org.eclipse.core.net"/>
+ <plugin id="org.eclipse.core.jobs"/>
+ <plugin id="org.eclipse.core.net"/>
<plugin id="org.eclipse.core.net.linux.x86" fragment="true"/>
- <plugin id="org.eclipse.core.resources"/>
- <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>
- <plugin id="org.eclipse.core.runtime"/>
- <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
- <plugin id="org.eclipse.core.variables"/>
- <plugin id="org.eclipse.dd.dsf"/>
- <plugin id="org.eclipse.dd.dsf.debug"/>
- <plugin id="org.eclipse.dd.dsf.debug.ui"/>
- <plugin id="org.eclipse.dd.dsf.ui"/>
- <plugin id="org.eclipse.dd.gdb"/>
- <plugin id="org.eclipse.dd.gdb.ui"/>
- <plugin id="org.eclipse.dd.mi"/>
- <plugin id="org.eclipse.debug.core"/>
- <plugin id="org.eclipse.debug.ui"/>
- <plugin id="org.eclipse.equinox.app"/>
- <plugin id="org.eclipse.equinox.common"/>
- <plugin id="org.eclipse.equinox.preferences"/>
- <plugin id="org.eclipse.equinox.registry"/>
- <plugin id="org.eclipse.equinox.security"/>
- <plugin id="org.eclipse.help"/>
- <plugin id="org.eclipse.jface"/>
- <plugin id="org.eclipse.jface.databinding"/>
- <plugin id="org.eclipse.jface.text"/>
- <plugin id="org.eclipse.jsch.core"/>
- <plugin id="org.eclipse.ltk.core.refactoring"/>
- <plugin id="org.eclipse.ltk.ui.refactoring"/>
- <plugin id="org.eclipse.osgi"/>
- <plugin id="org.eclipse.search"/>
- <plugin id="org.eclipse.swt"/>
+ <plugin id="org.eclipse.core.resources"/>
+ <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>
+ <plugin id="org.eclipse.core.runtime"/>
+ <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
+ <plugin id="org.eclipse.core.variables"/>
+ <plugin id="org.eclipse.dd.dsf"/>
+ <plugin id="org.eclipse.dd.dsf.debug"/>
+ <plugin id="org.eclipse.dd.dsf.debug.ui"/>
+ <plugin id="org.eclipse.dd.dsf.ui"/>
+ <plugin id="org.eclipse.dd.gdb"/>
+ <plugin id="org.eclipse.dd.gdb.ui"/>
+ <plugin id="org.eclipse.dd.mi"/>
+ <plugin id="org.eclipse.debug.core"/>
+ <plugin id="org.eclipse.debug.ui"/>
+ <plugin id="org.eclipse.equinox.app"/>
+ <plugin id="org.eclipse.equinox.common"/>
+ <plugin id="org.eclipse.equinox.preferences"/>
+ <plugin id="org.eclipse.equinox.registry"/>
+ <plugin id="org.eclipse.equinox.security"/>
+ <plugin id="org.eclipse.help"/>
+ <plugin id="org.eclipse.jface"/>
+ <plugin id="org.eclipse.jface.databinding"/>
+ <plugin id="org.eclipse.jface.text"/>
+ <plugin id="org.eclipse.jsch.core"/>
+ <plugin id="org.eclipse.ltk.core.refactoring"/>
+ <plugin id="org.eclipse.ltk.ui.refactoring"/>
+ <plugin id="org.eclipse.osgi"/>
+ <plugin id="org.eclipse.search"/>
+ <plugin id="org.eclipse.swt"/>
<plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
- <plugin id="org.eclipse.team.core"/>
- <plugin id="org.eclipse.team.ui"/>
- <plugin id="org.eclipse.text"/>
- <plugin id="org.eclipse.ui"/>
- <plugin id="org.eclipse.ui.browser"/>
- <plugin id="org.eclipse.ui.console"/>
- <plugin id="org.eclipse.ui.editors"/>
- <plugin id="org.eclipse.ui.forms"/>
- <plugin id="org.eclipse.ui.ide"/>
- <plugin id="org.eclipse.ui.ide.application"/>
- <plugin id="org.eclipse.ui.intro"/>
- <plugin id="org.eclipse.ui.navigator"/>
- <plugin id="org.eclipse.ui.navigator.resources"/>
- <plugin id="org.eclipse.ui.net"/>
- <plugin id="org.eclipse.ui.views"/>
- <plugin id="org.eclipse.ui.views.properties.tabbed"/>
- <plugin id="org.eclipse.ui.workbench"/>
- <plugin id="org.eclipse.ui.workbench.texteditor"/>
- <plugin id="org.eclipse.update.configurator"/>
- <plugin id="org.eclipse.update.core"/>
+ <plugin id="org.eclipse.team.core"/>
+ <plugin id="org.eclipse.team.ui"/>
+ <plugin id="org.eclipse.text"/>
+ <plugin id="org.eclipse.ui"/>
+ <plugin id="org.eclipse.ui.browser"/>
+ <plugin id="org.eclipse.ui.console"/>
+ <plugin id="org.eclipse.ui.editors"/>
+ <plugin id="org.eclipse.ui.forms"/>
+ <plugin id="org.eclipse.ui.ide"/>
+ <plugin id="org.eclipse.ui.ide.application"/>
+ <plugin id="org.eclipse.ui.intro"/>
+ <plugin id="org.eclipse.ui.navigator"/>
+ <plugin id="org.eclipse.ui.navigator.resources"/>
+ <plugin id="org.eclipse.ui.net"/>
+ <plugin id="org.eclipse.ui.views"/>
+ <plugin id="org.eclipse.ui.views.properties.tabbed"/>
+ <plugin id="org.eclipse.ui.workbench"/>
+ <plugin id="org.eclipse.ui.workbench.texteditor"/>
+ <plugin id="org.eclipse.update.configurator"/>
+ <plugin id="org.eclipse.update.core"/>
<plugin id="org.eclipse.update.core.linux" fragment="true"/>
- <plugin id="org.indt.esbox.core"/>
- <plugin id="org.indt.esbox.debug"/>
- <plugin id="org.indt.esbox.help"/>
- <plugin id="org.indt.esbox.launch"/>
- <plugin id="org.indt.esbox.python.debug"/>
- <plugin id="org.indt.esbox.python.launch"/>
- <plugin id="org.indt.esbox.python.ui"/>
- <plugin id="org.indt.esbox.ui"/>
- <plugin id="org.maemo.esbox.debug.dsf.gdb"/>
- <plugin id="org.maemo.esbox.product"/>
- <plugin id="org.maemo.esbox.project.core"/>
- <plugin id="org.maemo.esbox.project.ui"/>
- <plugin id="org.python.pydev"/>
- <plugin id="org.python.pydev.ast"/>
- <plugin id="org.python.pydev.core"/>
- <plugin id="org.python.pydev.debug"/>
- <plugin id="org.python.pydev.jython"/>
- <plugin id="org.python.pydev.parser"/>
- </plugins>
-
- <features>
- <feature id="org.maemo.esbox.product" version="0.0.0"/>
- <feature id="org.maemo.esbox.product.supplement" version="0.0.0"/>
- <feature id="com.redhat.eclipse.cdt.autotools.feature" version="0.0.0"/>
- <feature id="org.eclipse.dd.dsf.gdb" version="0.0.0"/>
- <feature id="org.eclipse.dd.dsf.gdb_launch" version="0.0.0"/>
- <feature id="org.eclipse.dd.dsf.sdk" version="0.0.0"/>
- <feature id="org.python.pydev.feature" version="0.0.0"/>
- <feature id="org.eclipse.platform" version="0.0.0"/>
- <feature id="org.eclipse.cdt" version="0.0.0"/>
- <feature id="org.eclipse.rse" version="0.0.0"/>
- </features>
-
-</product>
+ </plugins>
+
+ <features>
+ <feature id="org.maemo.esbox.product" version="0.0.0"/>
+ <feature id="org.maemo.esbox.product.supplement" version="0.0.0"/>
+ <feature id="com.redhat.eclipse.cdt.autotools.feature" version="0.0.0"/>
+ <feature id="org.eclipse.dd.dsf.gdb" version="0.0.0"/>
+ <feature id="org.eclipse.dd.dsf.gdb_launch" version="0.0.0"/>
+ <feature id="org.eclipse.dd.dsf.sdk" version="0.0.0"/>
+ <feature id="org.python.pydev.feature" version="0.0.0"/>
+ <feature id="org.eclipse.platform" version="0.0.0"/>
+ <feature id="org.eclipse.cdt" version="0.0.0"/>
+ <feature id="org.eclipse.rse" version="0.0.0"/>
+ </features>
+
+</product>
Copied: branches/work_Ed/org.maemo.esbox.product/cleanup-merged-product-build.py (from rev 1189, trunk/org.maemo.esbox.product/cleanup-merged-product-build.py)
===================================================================
--- branches/work_Ed/org.maemo.esbox.product/cleanup-merged-product-build.py (rev 0)
+++ branches/work_Ed/org.maemo.esbox.product/cleanup-merged-product-build.py 2009-02-04 16:31:29 UTC (rev 1191)
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+"""
+This script allows for cleaning up a directory structure in which
+several product builds have been extracted, by deleting duplicate
+plugins and features (which arise from exporting a product
+multiple times, where the timestamp differs).
+
+Run as cleanup-merged-product-build.py <path-to-merged-root> <version>
+
+e.g. cleanup-merged-product-build.py /tmp/esbox 20090204
+"""
+
+import os, os.path, sys
+
+def deltree(top):
+ for root, dirs, files in os.walk(top, topdown=False):
+ for name in files:
+ os.remove(os.path.join(root, name))
+ for name in dirs:
+ os.rmdir(os.path.join(root, name))
+ os.rmdir(dupe)
+
+def remove_dupes(topdir, vers):
+ for (dirname, dirs, names) in os.walk(topdir):
+ # map of basename+version -> list of versions with same timestamp
+ namemap = {}
+ for name in names+dirs:
+ versidx = name.find("."+vers)
+ if versidx >= 0:
+ seg = name[0:versidx]
+ namemap[seg] = namemap.get(seg, []) + [name[versidx:]]
+
+ for (name, versions) in namemap.iteritems():
+ if len(versions) > 1:
+ print "Duplicate: " + name
+ # assume last build is most correct
+ versions.sort()
+ for version in versions[0:-1]:
+ dupe = os.path.join(dirname, name+version)
+ print dupe
+ if os.path.isdir(dupe):
+ deltree(dupe)
+ else:
+ os.remove(dupe)
+
+
+ for dir in dirs:
+ remove_dupes(os.path.join(topdir, dir), vers)
+
+if __name__=="__main__":
+ if len(sys.argv) < 3:
+ print "Run as cleanup dir buildversion -- e.g. /foo/bar/esbox 20090204"
+ else:
+ remove_dupes(sys.argv[1], sys.argv[2])
+ print "Done"
Modified: branches/work_Ed/org.maemo.esbox.product-feature/feature.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.product-feature/feature.xml 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.product-feature/feature.xml 2009-02-04 16:31:29 UTC (rev 1191)
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.maemo.esbox.product"
- label="ESbox Product Feature"
- version="2.0.0.qualifier"
- provider-name="INdT / NOKIA"
- plugin="org.maemo.esbox.product">
-
- <description>
- Top-level ESbox product feature that includes all ESbox and Mica components.
- </description>
-
- <copyright>
- Copyright (c) 2007-2008 INdT, (c) 2007-2008 Nokia. All rights
-reserved.
- </copyright>
-
- <license url="http://www.eclipse.org/legal/epl-v10.html">
- For legal terms, see the Eclipse Public License.
- </license>
-
- <url>
- <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update"/>
- </url>
-
- <includes
- id="org.maemo.mica.common"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.mica.linux"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.mica.maemosdk"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.mica.protocol"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.mica.cpp"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.mica.python"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.mica.protocol.rse"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.mica.linux.autotools"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.esbox"
- version="0.0.0"/>
-
- <includes
- id="org.maemo.esbox.scratchbox"
- version="0.0.0"/>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- </requires>
-
- <plugin
- id="org.maemo.esbox.product"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.maemo.esbox.help"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.maemo.esbox.product"
+ label="ESbox Product Feature"
+ version="2.0.0.qualifier"
+ provider-name="INdT / NOKIA"
+ plugin="org.maemo.esbox.product">
+
+ <description>
+ Top-level ESbox product feature that includes all ESbox and Mica components.
+ </description>
+
+ <copyright>
+ Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights
+reserved.
+ </copyright>
+
+ <license url="http://www.eclipse.org/legal/epl-v10.html">
+ For legal terms, see the Eclipse Public License.
+ </license>
+
+ <url>
+ <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update"/>
+ </url>
+
+ <includes
+ id="org.maemo.mica.common"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.mica.linux"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.mica.maemosdk"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.mica.protocol"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.mica.cpp"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.mica.python"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.mica.protocol.rse"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.mica.linux.autotools"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.esbox"
+ version="0.0.0"/>
+
+ <includes
+ id="org.maemo.esbox.scratchbox"
+ version="0.0.0"/>
+
+ <requires>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ </requires>
+
+ <plugin
+ id="org.maemo.esbox.product"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.maemo.esbox.help"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
Modified: branches/work_Ed/org.maemo.esbox.product.supplement-feature/feature.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.product.supplement-feature/feature.xml 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.product.supplement-feature/feature.xml 2009-02-04 16:31:29 UTC (rev 1191)
@@ -1,58 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.maemo.esbox.product.supplement"
- label="ESbox Supplement Feature"
- version="2.0.0.qualifier"
- provider-name="NOKIA">
-
- <description>
- Supplemental plugins as a subset of standard Eclipse features required by ESbox.
- </description>
-
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
- <url>
- <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update"/>
- </url>
-
- <plugin
- id="org.eclipse.sdk"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.ui.views.log"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.ecore.xmi"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.maemo.esbox.product.supplement"
+ label="ESbox Supplement Feature"
+ version="2.0.0.qualifier"
+ provider-name="NOKIA">
+
+ <description>
+ Supplemental plugins as a subset of standard Eclipse features
+required by ESbox.
+ </description>
+
+ <copyright>
+ (c) Copyright Eclipse contributors and others. 2000-2008. All rights reserved.
+ </copyright>
+
+ <license url="http://www.eclipse.org/legal/epl-v10.html">
+ For legal terms, see the Eclipse Public License.
+ </license>
+
+ <url>
+ <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update"/>
+ </url>
+
+ <plugin
+ id="org.eclipse.sdk"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.ui.views.log"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.ecore"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.ecore.xmi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.tml.protocol"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.tml.vncviewer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.tml.vncviewer.vncviews"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
Modified: branches/work_Ed/org.maemo.esbox.project.cpp/plugin.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.cpp/plugin.xml 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.project.cpp/plugin.xml 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppDebianProjectImportConfigurationComposite.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppDebianProjectImportConfigurationComposite.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppDebianProjectImportConfigurationComposite.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppProjectImportConfigurationComposite.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppProjectImportConfigurationComposite.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/core/CppProjectImportConfigurationComposite.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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);
Added: branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/properties/ESboxCppBuildConfigurationsPage.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ConvertToESboxCppProjectWizard.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ConvertToESboxCppProjectWizard.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/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)
@@ -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: branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCCProjectWizard.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/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)
@@ -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: branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.cpp/src/org/maemo/esbox/internal/project/cpp/ui/wizards/ESboxCProjectWizard.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/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)
@@ -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: branches/work_Ed/org.maemo.esbox.project.python/plugin.xml
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/plugin.xml 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.project.python/plugin.xml 2009-02-04 16:31:29 UTC (rev 1191)
@@ -30,7 +30,7 @@
</commonWizard>
</extension>
-
+
<extension
point="org.maemo.mica.linux.packages.core.projectPackageGatherer">
<projectPackageGatherer
Modified: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/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)
@@ -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
Added: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxPythonBuildConfigurationsPage.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-02-03 21:29:58 UTC (rev 1190)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-02-04 16:31:29 UTC (rev 1191)
@@ -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