gmane.linux.embedded.yocto.general http://blog.gmane.org/gmane.linux.embedded.yocto.general hourly 1 1901-01-01T00:00+00:00 Gmane http://gmane.org/img/gmane-25t.png http://gmane.org How can I remove packages from rootfs file ? http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13751 <pre>Hi, I maked a fsl-image-minaml rootfs file and customized it with adding particular packages. For example, I added IMAGE_INSTALL_append_pn-fsl-image-minimal = " task-core-ssh-openssh task-core-nfs-server" in local.conf file. The problem is that, the rootfs file has 6-7 MB capacity but this capacity of file is very high and not acceptable to me. So how can I remove some packages from rootfs file that I do not want ? For example, remove packages like ar, arping, basename, telnet, beep, ..... Thanks, Js </pre> Jack 2013-05-25T13:58:46 Re: [PATCH v3 0/2] Yocto SDK IDE cleanup http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13750 <pre>The remote tools related changes are merged to eclipse-poky master plus the following patch: http://git.yoctoproject.org/cgit/cgit.cgi/eclipse-poky/commit/?id=ff4ccb4d65243f2a28eb89c72e9b425702b6c3aa For headless build. Thanks, Jessica -----Original Message----- From: yocto-bounces-EtnWKYl6rD/WsZ/bQMPhNw&lt; at &gt;public.gmane.org [mailto:yocto-bounces-EtnWKYl6rD/WsZ/bQMPhNw&lt; at &gt;public.gmane.org] On Behalf Of Ioana Grigoropol Sent: Friday, May 24, 2013 1:45 AM To: yocto-EtnWKYl6rD/WsZ/bQMPhNw&lt; at &gt;public.gmane.org Subject: [yocto] [PATCH v3 0/2] Yocto SDK IDE cleanup - org.yocto.sdk.ide clean up - remove unused classes Ioana Grigoropol (2): Remove unused TCFTerminalConnectors Remove all plugin dependencies to RSE APi from remote tools plugin .../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 10 +- .../remotetools/views/TCFTerminalConnector.java | 49 ---------- .../views/TCFTerminalConnectorImpl.java | 98 -------------------- 3 files changed, 4 insertions(+), 153 deletions(-) delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java -- 1.7.9.5 _______________________________________________ yocto mailing list yocto-EtnWKYl6rD/WsZ/bQMPhNw&lt; at &gt;public.gmane.org https://lists.yoctoproject.org/listinfo/yocto </pre> Zhang, Jessica 2013-05-24T20:36:21 Re: [eclipse-poky][PATCH 0/7] IntroducingaYoctoSDKCMakeProjectNature http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13749 <pre>Hi Atanas, All the cmake related patches have been merged to eclipse-poky master. Also, can you provide some detailed information regarding how to test the feature so QA can add adequate test cases in the existing eclipse plug-in testing. Thanks, Jessica -----Original Message----- From: yocto-bounces-EtnWKYl6rD/WsZ/bQMPhNw&lt; at &gt;public.gmane.org [mailto:yocto-bounces-EtnWKYl6rD/WsZ/bQMPhNw&lt; at &gt;public.gmane.org] On Behalf Of Atanas Gegov Sent: Friday, May 24, 2013 5:03 AM To: yocto-EtnWKYl6rD/WsZ/bQMPhNw&lt; at &gt;public.gmane.org Subject: [yocto] [eclipse-poky][PATCH 0/7] Introducing a YoctoSDKCMakeProjectNature From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; Hi, This patch series introduces a YoctoSDKCMakeProjectNature as a new nature for CMake-based Yocto Projects in the IDE. It requires the basic YoctoSDKProjectNature and is an alternative to the YoctoSDKAutotoolsProjectNature. This does not affect the currently existing Autotools template projects. Upcoming patch series will add the last missing parts for having CMake projects in the IDE: a ManagedBuilder for CMake (CMake toolchain for building in Eclipse) and some template projects. Cheers, Atanas P.S: This patch series apply on the current master "Fix the issue introduced by code refactoring since DialogHandler inherit IHandler, execute expect to return an object" (dd7ab69282f7c9cc18ff06fffaa9681e4b297cfa). Atanas Gegov (7): plugins/sdk.ide: Prepared templates for CMake nature plugins/sdk.ide: Added a new YoctoSDKCMakeProjectNature plugins/sdk.ide: Enable the creation of CMake projects plugins/sdk.ide: Update CMake projects on Yocto settings change plugins/sdk.ide: Renamed template process plugins/sdk.ide: Fixed whitespace issues plugins/sdk.ide: Extracted member variables .../OSGI-INF/l10n/bundle.properties | 1 + plugins/org.yocto.sdk.ide/plugin.xml | 25 +- .../ide/natures/YoctoSDKCMakeProjectNature.java | 92 +++++++ .../src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java | 7 +- .../sdk/ide/wizard/NewYoctoCProjectTemplate.java | 245 ------------------ .../ide/wizard/NewYoctoProjectTemplateProcess.java | 267 ++++++++++++++++++++ .../EmptyCAutotoolsProject/template.xml | 1 + .../EmptyCPPAutotoolsProject/template.xml | 1 + .../HelloWorldCAutotoolsProject/template.xml | 1 + .../HelloWorldCGTKAutotoolsProject/template.xml | 1 + .../HelloWorldCPPAutotoolsProject/template.xml | 1 + 11 files changed, 395 insertions(+), 247 deletions(-) create mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java delete mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java create mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java -- 1.7.9.5 _______________________________________________ yocto mailing list yocto-EtnWKYl6rD/WsZ/bQMPhNw&lt; at &gt;public.gmane.org https://lists.yoctoproject.org/listinfo/yocto </pre> Zhang, Jessica 2013-05-24T18:55:25 Re: [yocto-autobuilder][PATCH] buildsteps: fix passing timeout arg for two steps http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13748 <pre>merged. Thanks! -b On Fri, May 24, 2013 at 8:52 AM, Stefan Stanacar &lt;stefanx.stanacar-ral2JQCrhuEAvxtiuMwx3w&lt; at &gt;public.gmane.org&gt; wrote: </pre> Flanagan, Elizabeth 2013-05-24T17:04:06 [yocto-autobuilder][PATCH] buildsteps: fix passing timeoutarg for two steps http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13747 <pre>RunSanityTests and RunPreamble weren't passing kwargs to ShellCommand so timeout was ignored. For RunSanityTests I've changed the default to 1200 which should be enough in most cases, but I've updated one build where two images are actually tested (btrfs and ext4) Signed-off-by: Stefan Stanacar &lt;stefanx.stanacar-ral2JQCrhuEAvxtiuMwx3w&lt; at &gt;public.gmane.org&gt; --- buildset-config/nightly-qa-extras.conf | 2 +- lib/python2.7/site-packages/autobuilder/buildsteps/RunPreamble.py | 2 +- lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/buildset-config/nightly-qa-extras.conf b/buildset-config/nightly-qa-extras.conf index 1846764..1bdb0f0 100644 --- a/buildset-config/nightly-qa-extras.conf +++ b/buildset-config/nightly-qa-extras.conf &lt; at &gt;&lt; at &gt; -11,7 +11,7 &lt; at &gt;&lt; at &gt; steps: [{'SetDest':{}}, {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'i686', 'distro': 'poky', 'atextappend' : '\nROOT_HOME = "/root"\nIMAGE_FSTYPES = "btrfs"\nKERNEL_FEATURES_append = " cfg/fs/btrfs"\n'}}, {'CreateBBLayersConf': {'buildprovider' : 'yocto'}}, {'BuildImages': {'images': 'core-image-sato'}}, - {'RunSanityTests': {'images': 'core-image-sato'}}, + {'RunSanityTests': {'images': 'core-image-sato', 'timeout' : '2400'}}, {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'i686', 'distro': 'poky', 'atextappend' : '\nIMAGE_FEATURES_append = " read-only-rootfs"\n'}}, {'BuildImages': {'images': 'core-image-sato'}}, {'RunSanityTests': {'images': 'core-image-sato', 'scene' : 'sanity:boot sanity:ssh'}}] diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/RunPreamble.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunPreamble.py index d6476d6..5df2a7c 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunPreamble.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunPreamble.py &lt; at &gt;&lt; at &gt; -30,7 +30,7 &lt; at &gt;&lt; at &gt; class RunPreamble(ShellCommand): # Timeout needs to be passed to LoggingBuildStep as a kwarg self.timeout = 100000 kwargs['timeout']=self.timeout - ShellCommand.__init__(self) + ShellCommand.__init__(self, **kwargs) def describe(self, done=False): description = ShellCommand.describe(self,done) diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py index 1a428be..82fb044 100644 --- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunSanityTests.py &lt; at &gt;&lt; at &gt; -24,6 +24,8 &lt; at &gt;&lt; at &gt; class RunSanityTests(ShellCommand): self.factory = factory self.images="" self.scene=None + # the default of 1200 seconds is enough for running sanity tests in most cases + self.timeout = 1200 for k, v in argdict.iteritems(): setattr(self, k, v) self.description = "Running Sanity Tests" &lt; at &gt;&lt; at &gt; -36,10 +38,9 &lt; at &gt;&lt; at &gt; class RunSanityTests(ShellCommand): command = command + "echo 'TEST_SCEN = \"" + self.scene + "\"'" + " &gt;&gt; ./conf/auto.conf;" command = command + "DISPLAY=localhost:1 bitbake " + self.images + " -c qemuimagetest_standalone" # Timeout needs to be passed to LoggingBuildStep as a kwarg - self.timeout = 100000 kwargs['timeout']=self.timeout self.command = command - ShellCommand.__init__(self) + ShellCommand.__init__(self, **kwargs) def describe(self, done=False): description = ShellCommand.describe(self,done) </pre> Stefan Stanacar 2013-05-24T15:52:20 [PATCH 7/7] plugins/sdk.ide: Extracted member variables http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13746 <pre>From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; Simplified the calling of the addNatures(...) method. Variables describing the nature of the project are not more local for the process(...) method, but private object members. --- .../ide/wizard/NewYoctoProjectTemplateProcess.java | 29 ++++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java index 2ac52e5..9c6dca4 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java &lt; at &gt;&lt; at &gt; -70,8 +70,18 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { protected List&lt;Character&gt; illegalChars = Arrays.asList('$', '"','#','%','&amp;','\'','(',')','*', '+', ',','.','/',':',';','&lt;','=','&gt;','?','&lt; at &gt;','[','\\',']','^','`','{','|','}','~'); private static final String PROJECT_NAME_ERROR = "Wizard.SDK.Error.ProjectName"; +private boolean isCProject; +private boolean isEmptyProject; +private boolean isAutotoolsProject; +private boolean isCMakeProject; + public NewYoctoProjectTemplateProcess() { pca = new ProjectCreatedActions(); + +isCProject = false; +isEmptyProject = false; +isAutotoolsProject = false; +isCMakeProject = false; } private String printIllegalChars(){ &lt; at &gt;&lt; at &gt; -81,6 +91,7 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { print = print.substring(0, print.length() - 2); return print; } + public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { String projectName = args[0].getSimpleValue(); &lt; at &gt;&lt; at &gt; -90,10 +101,11 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { String isEmptyProjetValue = args[4].getSimpleValue(); String isAutotoolsProjectValue = args[5].getSimpleValue(); String isCMakeProjectValue = args[6].getSimpleValue(); -boolean isCProject = Boolean.valueOf(isCProjectValue).booleanValue(); -boolean isEmptyProject = Boolean.valueOf(isEmptyProjetValue).booleanValue(); -boolean isAutotoolsProject = Boolean.valueOf(isAutotoolsProjectValue).booleanValue(); -boolean isCMakeProject = Boolean.valueOf(isCMakeProjectValue).booleanValue(); + +isCProject = Boolean.valueOf(isCProjectValue).booleanValue(); +isEmptyProject = Boolean.valueOf(isEmptyProjetValue).booleanValue(); +isAutotoolsProject = Boolean.valueOf(isAutotoolsProjectValue).booleanValue(); +isCMakeProject = Boolean.valueOf(isCMakeProjectValue).booleanValue(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); try { &lt; at &gt;&lt; at &gt; -132,7 +144,7 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { pca.setArtifactExtension(artifactExtension); info = pca.createProject(monitor, CCorePlugin.DEFAULT_INDEXER, isCProject); -addNatures(project, false, isEmptyProject, isAutotoolsProject, isCMakeProject, monitor); +addNatures(project, false, monitor); info.setValid(true); ManagedBuildManager.saveBuildInfo(project, true); &lt; at &gt;&lt; at &gt; -145,7 +157,7 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { YoctoSDKChecker.checkIfGloballySelectedYoctoProfileIsValid(); -addNatures(project, true, isEmptyProject, isAutotoolsProject, isCMakeProject, monitor); +addNatures(project, true, monitor); //restoreAutoBuild(workspace); IDiscoveredPathManager manager = MakeCorePlugin.getDefault().getDiscoveryManager(); &lt; at &gt;&lt; at &gt; -186,9 +198,8 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { return matcher.find(); } -private void addNatures(IProject project, boolean projectExists, boolean isEmptyProject, -boolean isAutotoolsProject, boolean isCMakeProject, IProgressMonitor monitor) -throws CoreException, YoctoGeneralException { +private void addNatures(IProject project, boolean projectExists, IProgressMonitor monitor) +throws CoreException, YoctoGeneralException { YoctoSDKNatureUtils.addNature(project, YoctoSDKProjectNature.YoctoSDK_NATURE_ID, monitor); YoctoSDKChecker.checkIfGloballySelectedYoctoProfileIsValid(); </pre> Atanas Gegov 2013-05-24T12:03:25 [PATCH 6/7] plugins/sdk.ide: Fixed whitespace issues http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13745 <pre>From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; Resolved whitespace issues which popped up while renaming the NewYoctoProjectTemplateProcess. Also added some missing "//$NON-NLS-1$" declarations. --- .../ide/wizard/NewYoctoProjectTemplateProcess.java | 37 +++++++++++--------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java index bf89488..2ac52e5 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java &lt; at &gt;&lt; at &gt; -62,7 +62,6 &lt; at &gt;&lt; at &gt; import org.yocto.sdk.ide.natures.YoctoSDKNatureUtils; import org.yocto.sdk.ide.natures.YoctoSDKProjectNature; import org.yocto.sdk.ide.utils.YoctoSDKUtils; - &lt; at &gt;SuppressWarnings("restriction") public class NewYoctoProjectTemplateProcess extends ProcessRunner { protected boolean savedAutoBuildingValue; &lt; at &gt;&lt; at &gt; -70,10 +69,11 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { protected IManagedBuildInfo info; protected List&lt;Character&gt; illegalChars = Arrays.asList('$', '"','#','%','&amp;','\'','(',')','*', '+', ',','.','/',':',';','&lt;','=','&gt;','?','&lt; at &gt;','[','\\',']','^','`','{','|','}','~'); private static final String PROJECT_NAME_ERROR = "Wizard.SDK.Error.ProjectName"; - + public NewYoctoProjectTemplateProcess() { pca = new ProjectCreatedActions(); } + private String printIllegalChars(){ String print = ""; for (Character ch : illegalChars) &lt; at &gt;&lt; at &gt; -98,7 +98,7 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); try { if (!isValidProjectName(projectName)) { - + IWizardPage[] pages = MBSCustomPageManager.getPages(); if(pages != null &amp;&amp; pages.length &gt; 0) { CDTMainWizardPage cdtMainPage = (CDTMainWizardPage)pages[0]; &lt; at &gt;&lt; at &gt; -110,6 +110,7 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { } throw new ProcessFailureException(YoctoSDKMessages.getFormattedString(PROJECT_NAME_ERROR, new Object[]{projectName, printIllegalChars()})); } + if (!project.exists()) { IWorkspace workspace = ResourcesPlugin.getWorkspace(); turnOffAutoBuild(workspace); &lt; at &gt;&lt; at &gt; -120,6 +121,7 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { } List&lt;?&gt; configs = template.getTemplateInfo().getConfigurations(); + if (configs == null || configs.size() == 0) { throw new ProcessFailureException(Messages.getString("NewManagedProject.4") + projectName); //$NON-NLS-1$ } &lt; at &gt;&lt; at &gt; -137,7 +139,7 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { restoreAutoBuild(workspace); } else { - + IWorkspace workspace = ResourcesPlugin.getWorkspace(); turnOffAutoBuild(workspace); &lt; at &gt;&lt; at &gt; -148,19 +150,20 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { //restoreAutoBuild(workspace); IDiscoveredPathManager manager = MakeCorePlugin.getDefault().getDiscoveryManager(); IDiscoveredPathInfo pathInfo = manager.getDiscoveredInfo(project); + if (pathInfo instanceof IPerProjectDiscoveredPathInfo) { - IPerProjectDiscoveredPathInfo projectPathInfo = - (IPerProjectDiscoveredPathInfo) pathInfo; - projectPathInfo.setIncludeMap(new LinkedHashMap&lt;String, Boolean&gt;()); - projectPathInfo.setSymbolMap(new LinkedHashMap&lt;String, SymbolEntry&gt;()); - manager.removeDiscoveredInfo(project); +IPerProjectDiscoveredPathInfo projectPathInfo = +(IPerProjectDiscoveredPathInfo) pathInfo; +projectPathInfo.setIncludeMap(new LinkedHashMap&lt;String, Boolean&gt;()); +projectPathInfo.setSymbolMap(new LinkedHashMap&lt;String, SymbolEntry&gt;()); +manager.removeDiscoveredInfo(project); } } } catch (CoreException e) { throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage(), e); //$NON-NLS-1$ -} +} catch (BuildException e) { throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage()); //$NON-NLS-1$ &lt; at &gt;&lt; at &gt; -170,16 +173,18 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { try { project.delete(true, monitor); } catch (CoreException err) { -throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage() + " " + err.getMessage()); +throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage() //$NON-NLS-1$ ++ " " + err.getMessage()); //$NON-NLS-1$ } -throw new OperationCanceledException(Messages.getString("NewManagedProject.3") + e.getMessage()); +throw new OperationCanceledException(Messages.getString("NewManagedProject.3") + e.getMessage()); //$NON-NLS-1$ } } + private boolean isValidProjectName(String projectName) { -Pattern pattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_\\-]*$"); +Pattern pattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_\\-]*$"); //$NON-NLS-1$ Matcher matcher = pattern.matcher(projectName); return matcher.find(); -} +} private void addNatures(IProject project, boolean projectExists, boolean isEmptyProject, boolean isAutotoolsProject, boolean isCMakeProject, IProgressMonitor monitor) &lt; at &gt;&lt; at &gt; -224,13 +229,13 &lt; at &gt;&lt; at &gt; public class NewYoctoProjectTemplateProcess extends ProcessRunner { workspaceDesc.setAutoBuilding(false); workspace.setDescription(workspaceDesc); } - + protected final void restoreAutoBuild(IWorkspace workspace) throws CoreException { IWorkspaceDescription workspaceDesc = workspace.getDescription(); workspaceDesc.setAutoBuilding(savedAutoBuildingValue); workspace.setDescription(workspaceDesc); } - + /** * setOptionValue * &lt; at &gt;param config </pre> Atanas Gegov 2013-05-24T12:03:24 [PATCH 5/7] plugins/sdk.ide: Renamed template process http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13744 <pre>From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; The original name of the class had two drawbacks: firstly, it suggested that it applies only for C projects and secondly, it did not state that this is a process. --- plugins/org.yocto.sdk.ide/plugin.xml | 2 +- .../sdk/ide/wizard/NewYoctoCProjectTemplate.java | 251 -------------------- .../ide/wizard/NewYoctoProjectTemplateProcess.java | 251 ++++++++++++++++++++ 3 files changed, 252 insertions(+), 252 deletions(-) delete mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java create mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java diff --git a/plugins/org.yocto.sdk.ide/plugin.xml b/plugins/org.yocto.sdk.ide/plugin.xml index 2d6b941..7ea55c7 100644 --- a/plugins/org.yocto.sdk.ide/plugin.xml +++ b/plugins/org.yocto.sdk.ide/plugin.xml &lt; at &gt;&lt; at &gt; -156,7 +156,7 &lt; at &gt;&lt; at &gt; point="org.eclipse.cdt.core.templateProcessTypes"&gt; &lt;processType name="NewYoctoProject" - processRunner="org.yocto.sdk.ide.wizard.NewYoctoCProjectTemplate"&gt; + processRunner="org.yocto.sdk.ide.wizard.NewYoctoProjectTemplateProcess"&gt; &lt;simple name="name"&gt; &lt;/simple&gt; diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java deleted file mode 100644 index dc9bca5..0000000 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java +++ /dev/null &lt; at &gt;&lt; at &gt; -1,251 +0,0 &lt; at &gt;&lt; at &gt; -/******************************************************************************* - * Copyright (c) 2010 Intel 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: - * Intel - initial API and implementation - *******************************************************************************/ -package org.yocto.sdk.ide.wizard; - -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.cdt.autotools.core.AutotoolsNewProjectNature; -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.core.templateengine.TemplateCore; -import org.eclipse.cdt.core.templateengine.process.ProcessArgument; -import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; -import org.eclipse.cdt.core.templateengine.process.ProcessRunner; -import org.eclipse.cdt.core.templateengine.process.processes.Messages; -import org.eclipse.cdt.internal.autotools.core.configure.AutotoolsConfigurationManager; -import org.eclipse.cdt.make.core.MakeCorePlugin; -import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager; -import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo; -import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerProjectDiscoveredPathInfo; -import org.eclipse.cdt.make.internal.core.scannerconfig.util.SymbolEntry; -import org.eclipse.cdt.managedbuilder.core.BuildException; -import org.eclipse.cdt.managedbuilder.core.IConfiguration; -import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; -import org.eclipse.cdt.managedbuilder.core.IOption; -import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; -import org.eclipse.cdt.managedbuilder.templateengine.ProjectCreatedActions; -import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.cdt.ui.wizards.CDTMainWizardPage; -import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.IWorkspaceDescription; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.preference.IPreferenceStore; -import org.yocto.sdk.ide.YoctoGeneralException; -import org.yocto.sdk.ide.YoctoProfileElement; -import org.yocto.sdk.ide.YoctoSDKChecker; -import org.yocto.sdk.ide.YoctoSDKMessages; -import org.yocto.sdk.ide.YoctoSDKPlugin; -import org.yocto.sdk.ide.YoctoUIElement; -import org.yocto.sdk.ide.natures.YoctoSDKAutotoolsProjectNature; -import org.yocto.sdk.ide.natures.YoctoSDKCMakeProjectNature; -import org.yocto.sdk.ide.natures.YoctoSDKEmptyProjectNature; -import org.yocto.sdk.ide.natures.YoctoSDKNatureUtils; -import org.yocto.sdk.ide.natures.YoctoSDKProjectNature; -import org.yocto.sdk.ide.utils.YoctoSDKUtils; - - -&lt; at &gt;SuppressWarnings("restriction") -public class NewYoctoCProjectTemplate extends ProcessRunner { -protected boolean savedAutoBuildingValue; -protected ProjectCreatedActions pca; -protected IManagedBuildInfo info; -protected List&lt;Character&gt; illegalChars = Arrays.asList('$', '"','#','%','&amp;','\'','(',')','*', '+', ',','.','/',':',';','&lt;','=','&gt;','?','&lt; at &gt;','[','\\',']','^','`','{','|','}','~'); -private static final String PROJECT_NAME_ERROR = "Wizard.SDK.Error.ProjectName"; - -public NewYoctoCProjectTemplate() { -pca = new ProjectCreatedActions(); -} -private String printIllegalChars(){ -String print = ""; -for (Character ch : illegalChars) -print += ch + ", "; -print = print.substring(0, print.length() - 2); -return print; -} -public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { - -String projectName = args[0].getSimpleValue(); -String location = args[1].getSimpleValue(); -String artifactExtension = args[2].getSimpleValue(); -String isCProjectValue = args[3].getSimpleValue(); -String isEmptyProjetValue = args[4].getSimpleValue(); -String isAutotoolsProjectValue = args[5].getSimpleValue(); -String isCMakeProjectValue = args[6].getSimpleValue(); -boolean isCProject = Boolean.valueOf(isCProjectValue).booleanValue(); -boolean isEmptyProject = Boolean.valueOf(isEmptyProjetValue).booleanValue(); -boolean isAutotoolsProject = Boolean.valueOf(isAutotoolsProjectValue).booleanValue(); -boolean isCMakeProject = Boolean.valueOf(isCMakeProjectValue).booleanValue(); - -IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); -try { -if (!isValidProjectName(projectName)) { - -IWizardPage[] pages = MBSCustomPageManager.getPages(); -if(pages != null &amp;&amp; pages.length &gt; 0) { -CDTMainWizardPage cdtMainPage = (CDTMainWizardPage)pages[0]; -cdtMainPage.setPageComplete(false); -ICDTCommonProjectWizard wizard = (ICDTCommonProjectWizard) pages[0].getWizard(); -wizard.performCancel(); - -project.delete(true, null); -} -throw new ProcessFailureException(YoctoSDKMessages.getFormattedString(PROJECT_NAME_ERROR, new Object[]{projectName, printIllegalChars()})); -} -if (!project.exists()) { -IWorkspace workspace = ResourcesPlugin.getWorkspace(); -turnOffAutoBuild(workspace); - -IPath locationPath = null; -if (location != null &amp;&amp; !location.trim().equals("")) { //$NON-NLS-1$ -locationPath = Path.fromPortableString(location); -} - -List&lt;?&gt; configs = template.getTemplateInfo().getConfigurations(); -if (configs == null || configs.size() == 0) { -throw new ProcessFailureException(Messages.getString("NewManagedProject.4") + projectName); //$NON-NLS-1$ -} - -pca.setProject(project); -pca.setProjectLocation(locationPath); -pca.setConfigs((IConfiguration[]) configs.toArray(new IConfiguration[configs.size()])); -pca.setArtifactExtension(artifactExtension); -info = pca.createProject(monitor, CCorePlugin.DEFAULT_INDEXER, isCProject); - -addNatures(project, false, isEmptyProject, isAutotoolsProject, isCMakeProject, monitor); - -info.setValid(true); -ManagedBuildManager.saveBuildInfo(project, true); - -restoreAutoBuild(workspace); -} else { - -IWorkspace workspace = ResourcesPlugin.getWorkspace(); -turnOffAutoBuild(workspace); - -YoctoSDKChecker.checkIfGloballySelectedYoctoProfileIsValid(); - -addNatures(project, true, isEmptyProject, isAutotoolsProject, isCMakeProject, monitor); - -//restoreAutoBuild(workspace); -IDiscoveredPathManager manager = MakeCorePlugin.getDefault().getDiscoveryManager(); -IDiscoveredPathInfo pathInfo = manager.getDiscoveredInfo(project); -if (pathInfo instanceof IPerProjectDiscoveredPathInfo) { - IPerProjectDiscoveredPathInfo projectPathInfo = - (IPerProjectDiscoveredPathInfo) pathInfo; - projectPathInfo.setIncludeMap(new LinkedHashMap&lt;String, Boolean&gt;()); - projectPathInfo.setSymbolMap(new LinkedHashMap&lt;String, SymbolEntry&gt;()); - manager.removeDiscoveredInfo(project); -} -} -} -catch (CoreException e) -{ -throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage(), e); //$NON-NLS-1$ -} -catch (BuildException e) -{ -throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage()); //$NON-NLS-1$ -} -catch (YoctoGeneralException e) -{ -try { -project.delete(true, monitor); -} catch (CoreException err) { -throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage() + " " + err.getMessage()); -} -throw new OperationCanceledException(Messages.getString("NewManagedProject.3") + e.getMessage()); -} -} -private boolean isValidProjectName(String projectName) { -Pattern pattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_\\-]*$"); -Matcher matcher = pattern.matcher(projectName); -return matcher.find(); -} - -private void addNatures(IProject project, boolean projectExists, boolean isEmptyProject, -boolean isAutotoolsProject, boolean isCMakeProject, IProgressMonitor monitor) -throws CoreException, YoctoGeneralException { -YoctoSDKNatureUtils.addNature(project, YoctoSDKProjectNature.YoctoSDK_NATURE_ID, monitor); - -YoctoSDKChecker.checkIfGloballySelectedYoctoProfileIsValid(); - -YoctoProfileElement profileElement = YoctoSDKUtils.getProfilesFromDefaultStore(); -YoctoSDKUtils.saveProfilesToProjectPreferences(profileElement, project); - -IPreferenceStore selecteProfileStore = YoctoSDKPlugin.getProfilePreferenceStore(profileElement.getSelectedProfile()); -YoctoUIElement elem = YoctoSDKUtils.getElemFromStore(selecteProfileStore); -YoctoSDKUtils.setEnvironmentVariables(project, elem); - -if (isEmptyProject) { -YoctoSDKNatureUtils.addNature(project, YoctoSDKEmptyProjectNature.YoctoSDK_EMPTY_NATURE_ID, monitor); -} - -if (isAutotoolsProject) { -AutotoolsNewProjectNature.addAutotoolsNature(project, monitor); - -if (!projectExists) { -// For each IConfiguration, create a corresponding Autotools Configuration -for (IConfiguration cfg : pca.getConfigs()) { -AutotoolsConfigurationManager.getInstance().getConfiguration(project, cfg.getName(), true); -} -AutotoolsConfigurationManager.getInstance().saveConfigs(project); -} - -YoctoSDKNatureUtils.addNature(project, YoctoSDKAutotoolsProjectNature.YoctoSDK_AUTOTOOLS_NATURE_ID, monitor); -YoctoSDKAutotoolsProjectNature.configureAutotoolsOptions(project); -} else if (isCMakeProject) { -YoctoSDKNatureUtils.addNature(project, YoctoSDKCMakeProjectNature.YoctoSDK_CMAKE_NATURE_ID, monitor); -YoctoSDKCMakeProjectNature.extendProjectEnvironmentForCMake(project); -} -} - -protected final void turnOffAutoBuild(IWorkspace workspace) throws CoreException { -IWorkspaceDescription workspaceDesc = workspace.getDescription(); -savedAutoBuildingValue = workspaceDesc.isAutoBuilding(); -workspaceDesc.setAutoBuilding(false); -workspace.setDescription(workspaceDesc); -} - -protected final void restoreAutoBuild(IWorkspace workspace) throws CoreException { -IWorkspaceDescription workspaceDesc = workspace.getDescription(); -workspaceDesc.setAutoBuilding(savedAutoBuildingValue); -workspace.setDescription(workspaceDesc); -} - -/** - * setOptionValue - * &lt; at &gt;param config - * &lt; at &gt;param option - * &lt; at &gt;param val - * &lt; at &gt;throws BuildException - */ -protected void setOptionValue(IConfiguration config, IOption option, String val) throws BuildException { -if (val != null) { -if (!option.isExtensionElement()) { -option.setValue(val); -} else { -IOption newOption = config.getToolChain().createOption(option, option.getId() + "." + ManagedBuildManager.getRandomNumber(), option.getName(), false); //$NON-NLS-1$ -newOption.setValue(val); -} -} -} -} diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java new file mode 100644 index 0000000..bf89488 --- /dev/null +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java &lt; at &gt;&lt; at &gt; -0,0 +1,251 &lt; at &gt;&lt; at &gt; +/******************************************************************************* + * Copyright (c) 2010 Intel 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: + * Intel - initial API and implementation + *******************************************************************************/ +package org.yocto.sdk.ide.wizard; + +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.eclipse.cdt.autotools.core.AutotoolsNewProjectNature; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.templateengine.TemplateCore; +import org.eclipse.cdt.core.templateengine.process.ProcessArgument; +import org.eclipse.cdt.core.templateengine.process.ProcessFailureException; +import org.eclipse.cdt.core.templateengine.process.ProcessRunner; +import org.eclipse.cdt.core.templateengine.process.processes.Messages; +import org.eclipse.cdt.internal.autotools.core.configure.AutotoolsConfigurationManager; +import org.eclipse.cdt.make.core.MakeCorePlugin; +import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager; +import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo; +import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerProjectDiscoveredPathInfo; +import org.eclipse.cdt.make.internal.core.scannerconfig.util.SymbolEntry; +import org.eclipse.cdt.managedbuilder.core.BuildException; +import org.eclipse.cdt.managedbuilder.core.IConfiguration; +import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; +import org.eclipse.cdt.managedbuilder.core.IOption; +import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; +import org.eclipse.cdt.managedbuilder.templateengine.ProjectCreatedActions; +import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.cdt.ui.wizards.CDTMainWizardPage; +import org.eclipse.cdt.internal.ui.wizards.ICDTCommonProjectWizard; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.IWorkspaceDescription; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Path; +import org.eclipse.jface.preference.IPreferenceStore; +import org.yocto.sdk.ide.YoctoGeneralException; +import org.yocto.sdk.ide.YoctoProfileElement; +import org.yocto.sdk.ide.YoctoSDKChecker; +import org.yocto.sdk.ide.YoctoSDKMessages; +import org.yocto.sdk.ide.YoctoSDKPlugin; +import org.yocto.sdk.ide.YoctoUIElement; +import org.yocto.sdk.ide.natures.YoctoSDKAutotoolsProjectNature; +import org.yocto.sdk.ide.natures.YoctoSDKCMakeProjectNature; +import org.yocto.sdk.ide.natures.YoctoSDKEmptyProjectNature; +import org.yocto.sdk.ide.natures.YoctoSDKNatureUtils; +import org.yocto.sdk.ide.natures.YoctoSDKProjectNature; +import org.yocto.sdk.ide.utils.YoctoSDKUtils; + + +&lt; at &gt;SuppressWarnings("restriction") +public class NewYoctoProjectTemplateProcess extends ProcessRunner { +protected boolean savedAutoBuildingValue; +protected ProjectCreatedActions pca; +protected IManagedBuildInfo info; +protected List&lt;Character&gt; illegalChars = Arrays.asList('$', '"','#','%','&amp;','\'','(',')','*', '+', ',','.','/',':',';','&lt;','=','&gt;','?','&lt; at &gt;','[','\\',']','^','`','{','|','}','~'); +private static final String PROJECT_NAME_ERROR = "Wizard.SDK.Error.ProjectName"; + +public NewYoctoProjectTemplateProcess() { +pca = new ProjectCreatedActions(); +} +private String printIllegalChars(){ +String print = ""; +for (Character ch : illegalChars) +print += ch + ", "; +print = print.substring(0, print.length() - 2); +return print; +} +public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException { + +String projectName = args[0].getSimpleValue(); +String location = args[1].getSimpleValue(); +String artifactExtension = args[2].getSimpleValue(); +String isCProjectValue = args[3].getSimpleValue(); +String isEmptyProjetValue = args[4].getSimpleValue(); +String isAutotoolsProjectValue = args[5].getSimpleValue(); +String isCMakeProjectValue = args[6].getSimpleValue(); +boolean isCProject = Boolean.valueOf(isCProjectValue).booleanValue(); +boolean isEmptyProject = Boolean.valueOf(isEmptyProjetValue).booleanValue(); +boolean isAutotoolsProject = Boolean.valueOf(isAutotoolsProjectValue).booleanValue(); +boolean isCMakeProject = Boolean.valueOf(isCMakeProjectValue).booleanValue(); + +IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); +try { +if (!isValidProjectName(projectName)) { + +IWizardPage[] pages = MBSCustomPageManager.getPages(); +if(pages != null &amp;&amp; pages.length &gt; 0) { +CDTMainWizardPage cdtMainPage = (CDTMainWizardPage)pages[0]; +cdtMainPage.setPageComplete(false); +ICDTCommonProjectWizard wizard = (ICDTCommonProjectWizard) pages[0].getWizard(); +wizard.performCancel(); + +project.delete(true, null); +} +throw new ProcessFailureException(YoctoSDKMessages.getFormattedString(PROJECT_NAME_ERROR, new Object[]{projectName, printIllegalChars()})); +} +if (!project.exists()) { +IWorkspace workspace = ResourcesPlugin.getWorkspace(); +turnOffAutoBuild(workspace); + +IPath locationPath = null; +if (location != null &amp;&amp; !location.trim().equals("")) { //$NON-NLS-1$ +locationPath = Path.fromPortableString(location); +} + +List&lt;?&gt; configs = template.getTemplateInfo().getConfigurations(); +if (configs == null || configs.size() == 0) { +throw new ProcessFailureException(Messages.getString("NewManagedProject.4") + projectName); //$NON-NLS-1$ +} + +pca.setProject(project); +pca.setProjectLocation(locationPath); +pca.setConfigs((IConfiguration[]) configs.toArray(new IConfiguration[configs.size()])); +pca.setArtifactExtension(artifactExtension); +info = pca.createProject(monitor, CCorePlugin.DEFAULT_INDEXER, isCProject); + +addNatures(project, false, isEmptyProject, isAutotoolsProject, isCMakeProject, monitor); + +info.setValid(true); +ManagedBuildManager.saveBuildInfo(project, true); + +restoreAutoBuild(workspace); +} else { + +IWorkspace workspace = ResourcesPlugin.getWorkspace(); +turnOffAutoBuild(workspace); + +YoctoSDKChecker.checkIfGloballySelectedYoctoProfileIsValid(); + +addNatures(project, true, isEmptyProject, isAutotoolsProject, isCMakeProject, monitor); + +//restoreAutoBuild(workspace); +IDiscoveredPathManager manager = MakeCorePlugin.getDefault().getDiscoveryManager(); +IDiscoveredPathInfo pathInfo = manager.getDiscoveredInfo(project); +if (pathInfo instanceof IPerProjectDiscoveredPathInfo) { + IPerProjectDiscoveredPathInfo projectPathInfo = + (IPerProjectDiscoveredPathInfo) pathInfo; + projectPathInfo.setIncludeMap(new LinkedHashMap&lt;String, Boolean&gt;()); + projectPathInfo.setSymbolMap(new LinkedHashMap&lt;String, SymbolEntry&gt;()); + manager.removeDiscoveredInfo(project); +} +} +} +catch (CoreException e) +{ +throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage(), e); //$NON-NLS-1$ +} +catch (BuildException e) +{ +throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage()); //$NON-NLS-1$ +} +catch (YoctoGeneralException e) +{ +try { +project.delete(true, monitor); +} catch (CoreException err) { +throw new ProcessFailureException(Messages.getString("NewManagedProject.3") + e.getMessage() + " " + err.getMessage()); +} +throw new OperationCanceledException(Messages.getString("NewManagedProject.3") + e.getMessage()); +} +} +private boolean isValidProjectName(String projectName) { +Pattern pattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_\\-]*$"); +Matcher matcher = pattern.matcher(projectName); +return matcher.find(); +} + +private void addNatures(IProject project, boolean projectExists, boolean isEmptyProject, +boolean isAutotoolsProject, boolean isCMakeProject, IProgressMonitor monitor) +throws CoreException, YoctoGeneralException { +YoctoSDKNatureUtils.addNature(project, YoctoSDKProjectNature.YoctoSDK_NATURE_ID, monitor); + +YoctoSDKChecker.checkIfGloballySelectedYoctoProfileIsValid(); + +YoctoProfileElement profileElement = YoctoSDKUtils.getProfilesFromDefaultStore(); +YoctoSDKUtils.saveProfilesToProjectPreferences(profileElement, project); + +IPreferenceStore selecteProfileStore = YoctoSDKPlugin.getProfilePreferenceStore(profileElement.getSelectedProfile()); +YoctoUIElement elem = YoctoSDKUtils.getElemFromStore(selecteProfileStore); +YoctoSDKUtils.setEnvironmentVariables(project, elem); + +if (isEmptyProject) { +YoctoSDKNatureUtils.addNature(project, YoctoSDKEmptyProjectNature.YoctoSDK_EMPTY_NATURE_ID, monitor); +} + +if (isAutotoolsProject) { +AutotoolsNewProjectNature.addAutotoolsNature(project, monitor); + +if (!projectExists) { +// For each IConfiguration, create a corresponding Autotools Configuration +for (IConfiguration cfg : pca.getConfigs()) { +AutotoolsConfigurationManager.getInstance().getConfiguration(project, cfg.getName(), true); +} +AutotoolsConfigurationManager.getInstance().saveConfigs(project); +} + +YoctoSDKNatureUtils.addNature(project, YoctoSDKAutotoolsProjectNature.YoctoSDK_AUTOTOOLS_NATURE_ID, monitor); +YoctoSDKAutotoolsProjectNature.configureAutotoolsOptions(project); +} else if (isCMakeProject) { +YoctoSDKNatureUtils.addNature(project, YoctoSDKCMakeProjectNature.YoctoSDK_CMAKE_NATURE_ID, monitor); +YoctoSDKCMakeProjectNature.extendProjectEnvironmentForCMake(project); +} +} + +protected final void turnOffAutoBuild(IWorkspace workspace) throws CoreException { +IWorkspaceDescription workspaceDesc = workspace.getDescription(); +savedAutoBuildingValue = workspaceDesc.isAutoBuilding(); +workspaceDesc.setAutoBuilding(false); +workspace.setDescription(workspaceDesc); +} + +protected final void restoreAutoBuild(IWorkspace workspace) throws CoreException { +IWorkspaceDescription workspaceDesc = workspace.getDescription(); +workspaceDesc.setAutoBuilding(savedAutoBuildingValue); +workspace.setDescription(workspaceDesc); +} + +/** + * setOptionValue + * &lt; at &gt;param config + * &lt; at &gt;param option + * &lt; at &gt;param val + * &lt; at &gt;throws BuildException + */ +protected void setOptionValue(IConfiguration config, IOption option, String val) throws BuildException { +if (val != null) { +if (!option.isExtensionElement()) { +option.setValue(val); +} else { +IOption newOption = config.getToolChain().createOption(option, option.getId() + "." + ManagedBuildManager.getRandomNumber(), option.getName(), false); //$NON-NLS-1$ +newOption.setValue(val); +} +} +} +} </pre> Atanas Gegov 2013-05-24T12:03:23 [PATCH 4/7] plugins/sdk.ide: Update CMake projects on Yoctosettings change http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13743 <pre>From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; CMake projects will use additional variables in the environment. They have to be set if the Yocto settings are changed. --- .../src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java index 1e2e424..f27fad7 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java &lt; at &gt;&lt; at &gt; -55,6 +55,7 &lt; at &gt;&lt; at &gt; import org.yocto.sdk.ide.YoctoSDKMessages; import org.yocto.sdk.ide.YoctoSDKPlugin; import org.yocto.sdk.ide.YoctoUIElement; import org.yocto.sdk.ide.natures.YoctoSDKAutotoolsProjectNature; +import org.yocto.sdk.ide.natures.YoctoSDKCMakeProjectNature; import org.yocto.sdk.ide.natures.YoctoSDKEmptyProjectNature; import org.yocto.sdk.ide.preferences.PreferenceConstants; &lt; at &gt;&lt; at &gt; -427,9 +428,13 &lt; at &gt;&lt; at &gt; public class YoctoSDKUtils { try { setEnvironmentVariables(project, elem); -if(project.hasNature(YoctoSDKAutotoolsProjectNature.YoctoSDK_AUTOTOOLS_NATURE_ID)) { + +if (project.hasNature(YoctoSDKAutotoolsProjectNature.YoctoSDK_AUTOTOOLS_NATURE_ID)) { YoctoSDKAutotoolsProjectNature.configureAutotoolsOptions(project); +} else if (project.hasNature(YoctoSDKCMakeProjectNature.YoctoSDK_CMAKE_NATURE_ID)) { +YoctoSDKCMakeProjectNature.extendProjectEnvironmentForCMake(project); } + IConsole console = CCorePlugin.getDefault().getConsole("org.yocto.sdk.ide.YoctoConsole"); console.start(project); consoleOutStream = console.getOutputStream(); </pre> Atanas Gegov 2013-05-24T12:03:22 [PATCH 3/7] plugins/sdk.ide: Enable the creation of CMakeprojects http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13742 <pre>From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; This enables creating projects with the introduced CMake nature. What is still upcoming are the template projects and a corresponfig CMake ManagedBuilder (CMake build toolchain for Eclipse). --- .../ide/natures/YoctoSDKCMakeProjectNature.java | 72 ++++++++++++++++++++ .../sdk/ide/wizard/NewYoctoCProjectTemplate.java | 12 ++-- 2 files changed, 80 insertions(+), 4 deletions(-) diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java index 86a9d45..b3d0f2c 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java &lt; at &gt;&lt; at &gt; -10,11 +10,83 &lt; at &gt;&lt; at &gt; *******************************************************************************/ package org.yocto.sdk.ide.natures; +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.core.envvar.IContributedEnvironment; +import org.eclipse.cdt.core.envvar.IEnvironmentVariable; +import org.eclipse.cdt.core.envvar.IEnvironmentVariableManager; +import org.eclipse.cdt.core.model.CoreModel; +import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; +import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.yocto.sdk.ide.YoctoSDKPlugin; +import org.yocto.sdk.ide.utils.YoctoSDKUtils; public class YoctoSDKCMakeProjectNature extends YoctoSDKProjectNature { public static final String YoctoSDK_CMAKE_NATURE_ID = YoctoSDKPlugin.getUniqueIdentifier() + ".YoctoSDKCMakeNature"; +// Considered poky's cmake.bbclass for this method +public static void extendProjectEnvironmentForCMake(IProject project) { +ICProjectDescription cpdesc = CoreModel.getDefault().getProjectDescription(project, true); +ICConfigurationDescription ccdesc = cpdesc.getActiveConfiguration(); +IEnvironmentVariableManager manager = CCorePlugin.getDefault().getBuildEnvironmentManager(); +IContributedEnvironment env = manager.getContributedEnvironment(); +String delimiter = manager.getDefaultDelimiter(); + +env.addVariable("CCACHE", "", IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); + +env.addVariable("OECMAKE_SOURCEPATH", "..", +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); + +String oecmakeBuildPathString = ""; +env.addVariable("OECMAKE_BUILDPATH", oecmakeBuildPathString, +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); +env.addVariable("EXTRA_OEMAKE", "-C " + oecmakeBuildPathString, +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); + +String ccString = YoctoSDKUtils.getEnvValue(project, "CC"); + +if (!ccString.equals("") &amp;&amp; !ccString.equals(" ")) { +ccString.trim(); +ccString = ccString.split(" ")[0]; +} + +env.addVariable("OECMAKE_C_COMPILER", ccString, +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); +String cxxString = YoctoSDKUtils.getEnvValue(project, "CXX"); + +if (!cxxString.equals("") &amp;&amp; !cxxString.equals(" ")) { +cxxString.trim(); +cxxString = cxxString.split(" ")[0]; +} + +env.addVariable("OECMAKE_CXX_COMPILER", cxxString, +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); + +String hostCCArchString = YoctoSDKUtils.getEnvValue(project, "HOST_CC_ARCH"); +String toolchainOptionsString = YoctoSDKUtils.getEnvValue(project, "TOOLCHAIN_OPTIONS"); +String cppFlagsString = YoctoSDKUtils.getEnvValue(project, "CPPFLAGS"); +String cxxFlagsString = YoctoSDKUtils.getEnvValue(project, "CXXFLAGS"); +String selectedOptimizationString = YoctoSDKUtils.getEnvValue(project, "SELECTED_OPTIMIZATION"); +env.addVariable("OECMAKE_C_FLAGS", hostCCArchString + " " + toolchainOptionsString + " " + cppFlagsString, +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); +env.addVariable("OECMAKE_CXX_FLAGS", hostCCArchString + " " + toolchainOptionsString + " " + cxxFlagsString ++ " -fpermissive", +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); +env.addVariable("OECMAKE_C_FLAGS_RELEASE", selectedOptimizationString + " " + cppFlagsString + " -DNDEBUG", +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); +env.addVariable("OECMAKE_CXX_FLAGS_RELEASE", selectedOptimizationString + " " + cxxFlagsString + " -DNDEBUG", +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); + +env.addVariable("OECMAKE_RPATH", "", +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); +env.addVariable("OECMAKE_PERLNATIVE_DIR", "", +IEnvironmentVariable.ENVVAR_REPLACE, delimiter, ccdesc); + +try { +CoreModel.getDefault().setProjectDescription(project, cpdesc); +} catch (CoreException e) { +e.printStackTrace(); +} +} } diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java index 705dc99..dc9bca5 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java &lt; at &gt;&lt; at &gt; -56,6 +56,7 &lt; at &gt;&lt; at &gt; import org.yocto.sdk.ide.YoctoSDKMessages; import org.yocto.sdk.ide.YoctoSDKPlugin; import org.yocto.sdk.ide.YoctoUIElement; import org.yocto.sdk.ide.natures.YoctoSDKAutotoolsProjectNature; +import org.yocto.sdk.ide.natures.YoctoSDKCMakeProjectNature; import org.yocto.sdk.ide.natures.YoctoSDKEmptyProjectNature; import org.yocto.sdk.ide.natures.YoctoSDKNatureUtils; import org.yocto.sdk.ide.natures.YoctoSDKProjectNature; &lt; at &gt;&lt; at &gt; -129,7 +130,7 &lt; at &gt;&lt; at &gt; public class NewYoctoCProjectTemplate extends ProcessRunner { pca.setArtifactExtension(artifactExtension); info = pca.createProject(monitor, CCorePlugin.DEFAULT_INDEXER, isCProject); -addNatures(project, false, isEmptyProject, isAutotoolsProject, monitor); +addNatures(project, false, isEmptyProject, isAutotoolsProject, isCMakeProject, monitor); info.setValid(true); ManagedBuildManager.saveBuildInfo(project, true); &lt; at &gt;&lt; at &gt; -142,7 +143,7 &lt; at &gt;&lt; at &gt; public class NewYoctoCProjectTemplate extends ProcessRunner { YoctoSDKChecker.checkIfGloballySelectedYoctoProfileIsValid(); -addNatures(project, true, isEmptyProject, isAutotoolsProject, monitor); +addNatures(project, true, isEmptyProject, isAutotoolsProject, isCMakeProject, monitor); //restoreAutoBuild(workspace); IDiscoveredPathManager manager = MakeCorePlugin.getDefault().getDiscoveryManager(); &lt; at &gt;&lt; at &gt; -181,7 +182,7 &lt; at &gt;&lt; at &gt; public class NewYoctoCProjectTemplate extends ProcessRunner { } private void addNatures(IProject project, boolean projectExists, boolean isEmptyProject, -boolean isAutotoolsProject, IProgressMonitor monitor) +boolean isAutotoolsProject, boolean isCMakeProject, IProgressMonitor monitor) throws CoreException, YoctoGeneralException { YoctoSDKNatureUtils.addNature(project, YoctoSDKProjectNature.YoctoSDK_NATURE_ID, monitor); &lt; at &gt;&lt; at &gt; -201,7 +202,7 &lt; at &gt;&lt; at &gt; public class NewYoctoCProjectTemplate extends ProcessRunner { if (isAutotoolsProject) { AutotoolsNewProjectNature.addAutotoolsNature(project, monitor); -if(!projectExists) { +if (!projectExists) { // For each IConfiguration, create a corresponding Autotools Configuration for (IConfiguration cfg : pca.getConfigs()) { AutotoolsConfigurationManager.getInstance().getConfiguration(project, cfg.getName(), true); &lt; at &gt;&lt; at &gt; -211,6 +212,9 &lt; at &gt;&lt; at &gt; public class NewYoctoCProjectTemplate extends ProcessRunner { YoctoSDKNatureUtils.addNature(project, YoctoSDKAutotoolsProjectNature.YoctoSDK_AUTOTOOLS_NATURE_ID, monitor); YoctoSDKAutotoolsProjectNature.configureAutotoolsOptions(project); +} else if (isCMakeProject) { +YoctoSDKNatureUtils.addNature(project, YoctoSDKCMakeProjectNature.YoctoSDK_CMAKE_NATURE_ID, monitor); +YoctoSDKCMakeProjectNature.extendProjectEnvironmentForCMake(project); } } </pre> Atanas Gegov 2013-05-24T12:03:21 [PATCH 2/7] plugins/sdk.ide: Added a newYoctoSDKCMakeProjectNature http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13741 <pre>From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; This nature is intended for Yocto projects that use CMake as a build system. It requires the YoctoSDKProjectNature and can be used by upcoming CMake project templates. It excludes the YoctoSDKAutotoolsProjectNature, e.g. their relation in plugin.xml is declared as "one-of-nature". --- .../OSGI-INF/l10n/bundle.properties | 1 + plugins/org.yocto.sdk.ide/plugin.xml | 19 +++++++++++++++++++ .../ide/natures/YoctoSDKCMakeProjectNature.java | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java diff --git a/plugins/org.yocto.sdk.ide/OSGI-INF/l10n/bundle.properties b/plugins/org.yocto.sdk.ide/OSGI-INF/l10n/bundle.properties index 1a4e3c9..48eb653 100644 --- a/plugins/org.yocto.sdk.ide/OSGI-INF/l10n/bundle.properties +++ b/plugins/org.yocto.sdk.ide/OSGI-INF/l10n/bundle.properties &lt; at &gt;&lt; at &gt; -2,6 +2,7 &lt; at &gt;&lt; at &gt; page.name.0 = Yocto Project ADT extension.name.0 = YoctoSDKNature extension.name.1 = YoctoSDKAutotoolsNature +extension.name.2 = YoctoSDKCMakeNature command.name = ReconfigureYoctoProject command.label.0 = Change Yocto Project Settings command.mnemonic = C diff --git a/plugins/org.yocto.sdk.ide/plugin.xml b/plugins/org.yocto.sdk.ide/plugin.xml index dd75532..2d6b941 100644 --- a/plugins/org.yocto.sdk.ide/plugin.xml +++ b/plugins/org.yocto.sdk.ide/plugin.xml &lt; at &gt;&lt; at &gt; -40,11 +40,30 &lt; at &gt;&lt; at &gt; class="org.yocto.sdk.ide.natures.YoctoSDKAutotoolsProjectNature"&gt; &lt;/run&gt; &lt;/runtime&gt; + &lt;one-of-nature + id="org.yocto.sdk.ide.buildsystemNaturesSet"&gt; + &lt;/one-of-nature&gt; &lt;builder id="org.eclipse.cdt.autotools.core.genmakebuilderV2"&gt; &lt;/builder&gt; &lt;/extension&gt; &lt;extension + id="YoctoSDKCMakeNature" + name="%extension.name.2" + point="org.eclipse.core.resources.natures"&gt; + &lt;requires-nature + id="org.yocto.sdk.ide.YoctoSDKNature"&gt; + &lt;/requires-nature&gt; + &lt;runtime&gt; + &lt;run + class="org.yocto.sdk.ide.natures.YoctoSDKCMakeProjectNature"&gt; + &lt;/run&gt; + &lt;/runtime&gt; + &lt;one-of-nature + id="org.yocto.sdk.ide.buildsystemNaturesSet"&gt; + &lt;/one-of-nature&gt; + &lt;/extension&gt; + &lt;extension id="YoctoSDKEmptyNature" point="org.eclipse.core.resources.natures"&gt; &lt;requires-nature diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java new file mode 100644 index 0000000..86a9d45 --- /dev/null +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java &lt; at &gt;&lt; at &gt; -0,0 +1,20 &lt; at &gt;&lt; at &gt; +/******************************************************************************* + * Copyright (c) 2013 BMW Car IT GmbH. + * 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: + * BMW Car IT - initial API and implementation + *******************************************************************************/ +package org.yocto.sdk.ide.natures; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.yocto.sdk.ide.YoctoSDKPlugin; + +public class YoctoSDKCMakeProjectNature extends YoctoSDKProjectNature { +public static final String YoctoSDK_CMAKE_NATURE_ID = YoctoSDKPlugin.getUniqueIdentifier() + ".YoctoSDKCMakeNature"; + +} </pre> Atanas Gegov 2013-05-24T12:03:20 [PATCH 1/7] plugins/sdk.ide: Prepared templates for CMakenature http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13740 <pre>From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; Added an extra variable to the templates and the creating process to prepare them for the new CMake nature. --- plugins/org.yocto.sdk.ide/plugin.xml | 4 ++++ .../sdk/ide/wizard/NewYoctoCProjectTemplate.java | 2 ++ .../EmptyCAutotoolsProject/template.xml | 1 + .../EmptyCPPAutotoolsProject/template.xml | 1 + .../HelloWorldCAutotoolsProject/template.xml | 1 + .../HelloWorldCGTKAutotoolsProject/template.xml | 1 + .../HelloWorldCPPAutotoolsProject/template.xml | 1 + 7 files changed, 11 insertions(+) diff --git a/plugins/org.yocto.sdk.ide/plugin.xml b/plugins/org.yocto.sdk.ide/plugin.xml index 1b882a2..dd75532 100644 --- a/plugins/org.yocto.sdk.ide/plugin.xml +++ b/plugins/org.yocto.sdk.ide/plugin.xml &lt; at &gt;&lt; at &gt; -162,6 +162,10 &lt; at &gt;&lt; at &gt; external="true" name="isAutotoolsProject"&gt; &lt;/simple&gt; + &lt;simple + external="true" + name="isCMakeProject"&gt; + &lt;/simple&gt; &lt;/processType&gt; &lt;processType name="NewYoctoAutotoolsProjectPostProcess" diff --git a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java index a103ebe..705dc99 100644 --- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java +++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java &lt; at &gt;&lt; at &gt; -88,9 +88,11 &lt; at &gt;&lt; at &gt; public class NewYoctoCProjectTemplate extends ProcessRunner { String isCProjectValue = args[3].getSimpleValue(); String isEmptyProjetValue = args[4].getSimpleValue(); String isAutotoolsProjectValue = args[5].getSimpleValue(); +String isCMakeProjectValue = args[6].getSimpleValue(); boolean isCProject = Boolean.valueOf(isCProjectValue).booleanValue(); boolean isEmptyProject = Boolean.valueOf(isEmptyProjetValue).booleanValue(); boolean isAutotoolsProject = Boolean.valueOf(isAutotoolsProjectValue).booleanValue(); +boolean isCMakeProject = Boolean.valueOf(isCMakeProjectValue).booleanValue(); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); try { diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/EmptyCAutotoolsProject/template.xml b/plugins/org.yocto.sdk.ide/templates/projecttemplates/EmptyCAutotoolsProject/template.xml index 028f33d..e1c1abc 100644 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/EmptyCAutotoolsProject/template.xml +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/EmptyCAutotoolsProject/template.xml &lt; at &gt;&lt; at &gt; -11,6 +11,7 &lt; at &gt;&lt; at &gt; &lt;simple name="isCProject" value="true" /&gt; &lt;simple name="isEmptyProject" value="true" /&gt; &lt;simple name="isAutotoolsProject" value="true" /&gt; +&lt;simple name="isCMakeProject" value="false" /&gt; &lt;/process&gt; &lt;/template&gt; diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/EmptyCPPAutotoolsProject/template.xml b/plugins/org.yocto.sdk.ide/templates/projecttemplates/EmptyCPPAutotoolsProject/template.xml index ae4173b..9f1d46b 100644 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/EmptyCPPAutotoolsProject/template.xml +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/EmptyCPPAutotoolsProject/template.xml &lt; at &gt;&lt; at &gt; -10,6 +10,7 &lt; at &gt;&lt; at &gt; &lt;simple name="isCProject" value="false" /&gt; &lt;simple name="isEmptyProject" value="true" /&gt; &lt;simple name="isAutotoolsProject" value="true" /&gt; +&lt;simple name="isCMakeProject" value="false" /&gt; &lt;/process&gt; &lt;/template&gt; diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml index 33bffd5..ca154ca 100644 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml &lt; at &gt;&lt; at &gt; -56,6 +56,7 &lt; at &gt;&lt; at &gt; &lt;simple name="isCProject" value="true" /&gt; &lt;simple name="isEmptyProject" value="false" /&gt; &lt;simple name="isAutotoolsProject" value="true" /&gt; +&lt;simple name="isCMakeProject" value="false" /&gt; &lt;/process&gt; &lt;process type="org.eclipse.cdt.core.CreateSourceFolder"&gt; diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCGTKAutotoolsProject/template.xml b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCGTKAutotoolsProject/template.xml index 8a4f43b..4234ff4 100644 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCGTKAutotoolsProject/template.xml +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCGTKAutotoolsProject/template.xml &lt; at &gt;&lt; at &gt; -56,6 +56,7 &lt; at &gt;&lt; at &gt; &lt;simple name="isCProject" value="true" /&gt; &lt;simple name="isEmptyProject" value="false" /&gt; &lt;simple name="isAutotoolsProject" value="true" /&gt; +&lt;simple name="isCMakeProject" value="false" /&gt; &lt;/process&gt; &lt;process type="org.eclipse.cdt.core.CreateSourceFolder"&gt; diff --git a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml index 0b807d8..2bf76bf 100644 --- a/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml +++ b/plugins/org.yocto.sdk.ide/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml &lt; at &gt;&lt; at &gt; -56,6 +56,7 &lt; at &gt;&lt; at &gt; &lt;simple name="isCProject" value="false" /&gt; &lt;simple name="isEmptyProject" value="false" /&gt; &lt;simple name="isAutotoolsProject" value="true" /&gt; +&lt;simple name="isCMakeProject" value="false" /&gt; &lt;/process&gt; &lt;process type="org.eclipse.cdt.core.CreateSourceFolder"&gt; </pre> Atanas Gegov 2013-05-24T12:03:19 [eclipse-poky][PATCH 0/7] Introducing aYoctoSDKCMakeProjectNature http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13739 <pre>From: Atanas Gegov &lt;atanas.gegov-98C5kh4wR6ohFhg+JK9F0w&lt; at &gt;public.gmane.org&gt; Hi, This patch series introduces a YoctoSDKCMakeProjectNature as a new nature for CMake-based Yocto Projects in the IDE. It requires the basic YoctoSDKProjectNature and is an alternative to the YoctoSDKAutotoolsProjectNature. This does not affect the currently existing Autotools template projects. Upcoming patch series will add the last missing parts for having CMake projects in the IDE: a ManagedBuilder for CMake (CMake toolchain for building in Eclipse) and some template projects. Cheers, Atanas P.S: This patch series apply on the current master "Fix the issue introduced by code refactoring since DialogHandler inherit IHandler, execute expect to return an object" (dd7ab69282f7c9cc18ff06fffaa9681e4b297cfa). Atanas Gegov (7): plugins/sdk.ide: Prepared templates for CMake nature plugins/sdk.ide: Added a new YoctoSDKCMakeProjectNature plugins/sdk.ide: Enable the creation of CMake projects plugins/sdk.ide: Update CMake projects on Yocto settings change plugins/sdk.ide: Renamed template process plugins/sdk.ide: Fixed whitespace issues plugins/sdk.ide: Extracted member variables .../OSGI-INF/l10n/bundle.properties | 1 + plugins/org.yocto.sdk.ide/plugin.xml | 25 +- .../ide/natures/YoctoSDKCMakeProjectNature.java | 92 +++++++ .../src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java | 7 +- .../sdk/ide/wizard/NewYoctoCProjectTemplate.java | 245 ------------------ .../ide/wizard/NewYoctoProjectTemplateProcess.java | 267 ++++++++++++++++++++ .../EmptyCAutotoolsProject/template.xml | 1 + .../EmptyCPPAutotoolsProject/template.xml | 1 + .../HelloWorldCAutotoolsProject/template.xml | 1 + .../HelloWorldCGTKAutotoolsProject/template.xml | 1 + .../HelloWorldCPPAutotoolsProject/template.xml | 1 + 11 files changed, 395 insertions(+), 247 deletions(-) create mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/natures/YoctoSDKCMakeProjectNature.java delete mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoCProjectTemplate.java create mode 100644 plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/wizard/NewYoctoProjectTemplateProcess.java </pre> Atanas Gegov 2013-05-24T12:03:18 Re: [eclipse-poky][PATCH 00/13] Completed CMake integration in the Yocto IDE http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13738 <pre>Hi Jessica, Yes, this patch series indeed relies on the previous RFC patches: [yocto] [eclipse-poky][RFCv2 0/7] Introducing a YoctoSDKCMakeProjectNature. I will resend the series as PATCH. Best regards, Atanas On Thu, May 23, 2013 at 11:50 PM, Zhang, Jessica &lt;jessica.zhang-ral2JQCrhuEAvxtiuMwx3w&lt; at &gt;public.gmane.org&gt;wrote: </pre> Atanas Gegov 2013-05-24T11:56:21 [meta-ivi] : Fix required in configure_append of pulseaudio http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13737 <pre>Hi, While building pulseaudio version 3.0, I faced an issue with do_configure_append in the pulseaudio_3.0.bbappend in meta-ivi. The I am attaching the error log with the mail. This got resolved by a small fix made in the do_configure_append. I am attaching the patch along with the mail. Thanks, Sujith H </pre> sujith h 2013-05-24T11:18:22 Re: QA rdepends issue when building xerces-c http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13736 <pre> I should add I did try to build xerces-c using this recipe with a few tweaks, and it failed at do_configure because /usr/include was being referred to in the configure script (in check for unicode libraries). I didn't take it further than that. Cheers, Paul </pre> Paul Eggleton 2013-05-24T09:38:27 Re: QA rdepends issue when building xerces-c http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13735 <pre> FYI, files are selected for each package by looking through the PACKAGES variable and for each package in turn the value of FILES is checked. The first package whose FILES matches a file, gets the file. The default value of PACKAGES is "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}- doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"; thus FILES_${PN} can be broad if the earlier packages pick out the files they need to specifically. In most cases the default values work perfectly. What you really need to do is determine which file it is that gets added to the -dev package and put that elsewhere. You should not need to change FILES_${PN}, just FILES_${PN}-dev (or other packages as appropriate). Cheers, Paul </pre> Paul Eggleton 2013-05-24T09:27:43 Re: .rpm packaging weirdness of dynamic libraries http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13734 <pre> Oh, if you've created modules and not libraries, then yes. Use those options and generally people put them in a subdirectory under libdir. Ross _______________________________________________ yocto mailing list yocto&lt; at &gt;yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto </pre> Burton, Ross 2013-05-24T09:14:40 [PATCH v3 2/2] Remove all plugin dependencies to RSE APifrom remote tools plugin http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13733 <pre>- removed all plugin dependencies to the RSE API &amp; kept only the ones needed for GUI actions and Terminal views Signed-off-by: Ioana Grigoropol &lt;ioanax.grigoropol-ral2JQCrhuEAvxtiuMwx3w&lt; at &gt;public.gmane.org&gt; --- .../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/org.yocto.sdk.remotetools/META-INF/MANIFEST.MF b/plugins/org.yocto.sdk.remotetools/META-INF/MANIFEST.MF index c34ad9e..5147c1a 100644 --- a/plugins/org.yocto.sdk.remotetools/META-INF/MANIFEST.MF +++ b/plugins/org.yocto.sdk.remotetools/META-INF/MANIFEST.MF &lt; at &gt;&lt; at &gt; -7,16 +7,10 &lt; at &gt;&lt; at &gt; Bundle-Activator: org.yocto.sdk.remotetools.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.rse.core;bundle-version="3.0.0", - org.eclipse.rse.services;bundle-version="3.0.0", - org.eclipse.rse.subsystems.files.core;bundle-version="3.0.0", - org.eclipse.rse.ui;bundle-version="3.0.0", org.yocto.sdk.ide, - org.eclipse.tm.terminal;bundle-version="3.0.1", - org.eclipse.rse.subsystems.terminals.core;bundle-version="[1.0.0,2.0.0)", org.eclipse.rse.terminals.ui;bundle-version="1.0.100", org.eclipse.cdt;bundle-version="7.0.0", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0", - org.eclipse.rse.subsystems.shells.core, org.eclipse.ui.ide;bundle-version="3.8.0", org.eclipse.ui.console;bundle-version="3.5.100" Bundle-ActivationPolicy: lazy &lt; at &gt;&lt; at &gt; -24,6 +18,10 &lt; at &gt;&lt; at &gt; Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.eclipse.core.resources, org.eclipse.debug.internal.ui, org.eclipse.rse.shells.ui, + org.eclipse.rse.ui.actions, + org.eclipse.tm.internal.terminal.control, + org.eclipse.tm.internal.terminal.control.actions, + org.eclipse.tm.internal.terminal.provisional.api, org.eclipse.ui.forms.widgets, org.yocto.remote.utils Bundle-Vendor: %Bundle-Vendor </pre> Ioana Grigoropol 2013-05-24T08:45:15 [PATCH v3 1/2] Remove unused TCFTerminalConnectors http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13732 <pre>- removed TCFTerminalConnector and TCFTerminalConnectorImpl since there are no usages of this classes Signed-off-by: Ioana Grigoropol &lt;ioanax.grigoropol-ral2JQCrhuEAvxtiuMwx3w&lt; at &gt;public.gmane.org&gt; --- .../remotetools/views/TCFTerminalConnector.java | 49 ---------- .../views/TCFTerminalConnectorImpl.java | 98 -------------------- 2 files changed, 147 deletions(-) delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java deleted file mode 100644 index 6239136..0000000 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java +++ /dev/null &lt; at &gt;&lt; at &gt; -1,49 +0,0 &lt; at &gt;&lt; at &gt; -/******************************************************************************** - * Copyright (c) 2008, 2009 MontaVista Software, Inc. and others - * 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: - * Anna Dushistova (MontaVista) - initial API and implementation - * Uwe Stieber (Wind River) - [282996] [terminal][api] Add "hidden" attribute to terminal connector extension point - ********************************************************************************/ -package org.yocto.sdk.remotetools.views; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.rse.core.model.IHost; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalConnector; - -public class TCFTerminalConnector extends TCFTerminalConnectorImpl implements ITerminalConnector { - - public TCFTerminalConnector(IHost host) { -super(host); - } - - public String getId() { - return "yocto_tcf_internal_connector"; //$NON-NLS-1$ - } - - public String getInitializationErrorMessage() { - return null; - } - - public String getName() { - return "yocto_tcf_internal_connector"; - } - - public boolean isHidden() { - return true; - } - - public boolean isInitialized() { - return true; - } - -public Object getAdapter(Class adapterType) { -if (adapterType.isInstance(this)) -return this; -return Platform.getAdapterManager().getAdapter(this, adapterType); -} - -} diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java deleted file mode 100644 index 105ca62..0000000 --- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java +++ /dev/null &lt; at &gt;&lt; at &gt; -1,98 +0,0 &lt; at &gt;&lt; at &gt; -/******************************************************************************** - * Copyright (c) 2008 MontaVista Software, Inc. - * 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: - * Anna Dushistova (MontaVista) - initial API and implementation - * Yu-Fen Kuo (MontaVista) - [227572] RSE Terminal doesn't reset the "connected" state when the shell exits - * Anna Dushistova (MontaVista) - [228577] [rseterminal] Clean up RSE Terminal impl - ********************************************************************************/ -package org.yocto.sdk.remotetools.views; - -import java.io.InputStream; -import java.io.OutputStream; - -import org.eclipse.rse.core.model.IHost; -import org.eclipse.tm.internal.terminal.provisional.api.ITerminalControl; -import org.eclipse.tm.internal.terminal.provisional.api.provider.TerminalConnectorImpl; - -public class TCFTerminalConnectorImpl extends TerminalConnectorImpl { - - private OutputStream fOutputStream; - private InputStream fInputStream; - IHost host; -//TODO private RSETerminalConnectionThread fConnection; -//TODO private ITerminalShell shell; - - public TCFTerminalConnectorImpl(IHost host) { - super(); - this.host = host; - } - /* TODO - public void connect(ITerminalControl control) { - super.connect(control); - fConnection = new RSETerminalConnectionThread(this, control); - fConnection.start(); - } - - public void doDisconnect() { - fConnection.disconnect(); - if (getInputStream() != null) { - try { - getInputStream().close(); - } catch (Exception exception) { - RSECorePlugin.getDefault().getLogger().logError("Error while closing input stream", exception); //$NON-NLS-1$ - } - } - - if (getTerminalToRemoteStream() != null) { - try { - getTerminalToRemoteStream().close(); - } catch (Exception exception) { - RSECorePlugin.getDefault().getLogger().logError("Error while closing terminal-to-remote stream", exception); //$NON-NLS-1$ - } - } - } -*/ - public OutputStream getTerminalToRemoteStream() { - return fOutputStream; - } - - public String getSettingsSummary() { - return "RSE: " + host.getName(); - } -/* TODO - public boolean isLocalEcho() { - return shell.isLocalEcho(); - } - - public void setTerminalSize(int newWidth, int newHeight) { - if(shell != null) - { - shell.setTerminalSize(newWidth, newHeight); - } - } - - public InputStream getInputStream() { - return fInputStream; - } - - public void setOutputStream(OutputStream outputStream) { - fOutputStream = outputStream; - } - - public void setInputStream(InputStream inputStream) { - fInputStream = inputStream; - } - - public void setTerminalHostShell(ITerminalShell shell) { - this.shell = shell; - } - - public ITerminalShell getTerminalHostShell() { - return shell; - } -*/ -} </pre> Ioana Grigoropol 2013-05-24T08:45:14 [PATCH v3 0/2] Yocto SDK IDE cleanup http://permalink.gmane.org/gmane.linux.embedded.yocto.general/13731 <pre>- org.yocto.sdk.ide clean up - remove unused classes Ioana Grigoropol (2): Remove unused TCFTerminalConnectors Remove all plugin dependencies to RSE APi from remote tools plugin .../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 10 +- .../remotetools/views/TCFTerminalConnector.java | 49 ---------- .../views/TCFTerminalConnectorImpl.java | 98 -------------------- 3 files changed, 4 insertions(+), 153 deletions(-) delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnector.java delete mode 100644 plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/views/TCFTerminalConnectorImpl.java </pre> Ioana Grigoropol 2013-05-24T08:45:13 Search Engine Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.linux.embedded.yocto.general