Merge pull request #1201 from Sloeber/#1163_create_project_the_cdt_way

#1163 create project the cdt way

Author: jantje

io.sloeber.core/plugin.xml

@@ -142,7 +142,6 @@
      <!-- It is also used for the base of the Debug configuration (for use with a JTAG/DragonAVR etc). -->
      <!-- TODO: Consider renaming as base. -->
      <configuration
-           artifactExtension="hex"
            cleanCommand="rm -f"
            id="io.sloeber.core.configuration.release"
            languageSettingsProviders="io.sloeber.languageSettingsProvider"
@@ -400,22 +399,25 @@
                  command="${JANTJE.SIZE.SWITCH} "
                  commandLinePattern="${COMMAND}"
                  id="io.sloeber.tool.size"
+                 isAbstract="false"
                  name="%tool.printsize.name">
               <inputType
                     buildVariable="HEX"
                     dependencyExtensions="hex"
                     id="io.sloeber.tool.size.input"
                     multipleOfType="true"
                     primaryInput="true"
-                    sourceContentType="io.sloeber.tool.objcopy.output">
+                    sourceContentType="io.sloeber.tool.objcopy.output"
+                    sources="hex">
               </inputType>
               <outputType
                     buildVariable="SIZEDUMMY"
                     id="io.sloeber.tool.size.output"
                     multipleOfType="false"
-                    outputNames="sizedummy"
-                    outputs="${project}.size"
-                    primaryOutput="true">
+                    name="size info"
+                    outputNames="${ProjName}.size"
+                    outputs="size"
+                    primaryOutput="false">
               </outputType>
            </tool>
         </toolChain>

io.sloeber.core/src/io/sloeber/core/api/BoardDescriptor.java

@@ -71,13 +71,15 @@ public class Common extends Const {
 	 * filenames containing spaces in Windows, see Note 1 < less than used to
 	 * redirect input, allowed in Unix filenames, see Note 1 > greater than used
 	 * to redirect output, allowed in Unix filenames, see Note 1 . period or dot
+	 * 
+	 * # is excluded as it is seen as a special character by make
 	 *
 	 * @param name
 	 *            the string that needs to be checked
 	 * @return a name safe to create files or folders
 	 */
 	public static String MakeNameCompileSafe(String name) {
-		char[] badChars = { ' ', '/', '.',':', '\\', '(', ')', '*', '?', '%', '|', '<', '>', ',', '-' };
+		char[] badChars = { ' ', '/', '.',':', '\\', '(', ')', '*', '?', '%', '|', '<', '>', ',', '-','#' };
 
 		String ret = name.trim();
 		for (char curchar : badChars) {

io.sloeber.core/src/io/sloeber/core/common/Common.java

@@ -37,7 +37,6 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -103,8 +102,10 @@ public class Helpers extends Common {
 	 * @param configurationDescription
 	 * @param IncludePath
 	 */
-	public static void addIncludeFolder(ICConfigurationDescription configurationDescription, IPath IncludePath) {
-		addIncludeFolder(configurationDescription, IncludePath, true);
+
+	public static void addIncludeFolder(ICFolderDescription folderDescription,  IPath IncludePath) 
+	{
+		   addIncludeFolder( folderDescription,  IncludePath,true) ;
 	}
 
 	/**
@@ -116,10 +117,7 @@ public static void addIncludeFolder(ICConfigurationDescription configurationDesc
 	 * @param IncludePath              The path to add to the include folders
 	 * @see addLibraryDependency {@link #addLibraryDependency(IProject, IProject)}
 	 */
-	public static void addIncludeFolder(ICConfigurationDescription configurationDescription, IPath IncludePath,
-			boolean isWorkspacePath) {
-		// find all languages
-		ICFolderDescription folderDescription = configurationDescription.getRootFolderDescription();
+	public static void addIncludeFolder(ICFolderDescription folderDescription, IPath IncludePath,boolean isWorkspacePath) {
 		ICLanguageSetting[] languageSettings = folderDescription.getLanguageSettings();
 		int pathSetting = ICSettingEntry.VALUE_WORKSPACE_PATH;
 		if (!isWorkspacePath) {
@@ -247,6 +245,7 @@ public static void LinkFolderToFolder(IProject project, IPath source, IPath targ
 	public static void addCodeFolder(IProject project, IPath toLinkFolder, String LinkName,
 			ICConfigurationDescription configurationDescription, boolean forceRoot) throws CoreException {
 		IFolder link = project.getFolder(LinkName);
+		ICFolderDescription folderDescription = configurationDescription.getRootFolderDescription();
 
 		LinkFolderToFolder(project, toLinkFolder, new Path(LinkName));
 
@@ -256,27 +255,27 @@ public static void addCodeFolder(IProject project, IPath toLinkFolder, String Li
 		String possibleIncludeFolder = "utility";
 		File file = toLinkFolder.append(possibleIncludeFolder).toFile();
 		if (file.exists()) {
-			addIncludeFolder(configurationDescription, link.getFullPath().append(possibleIncludeFolder));
+			addIncludeFolder(folderDescription, link.getFullPath().append(possibleIncludeFolder));
 		}
 
 		if (forceRoot) {
-			addIncludeFolder(configurationDescription, link.getFullPath());
+			addIncludeFolder(folderDescription, link.getFullPath());
 		} else {
 			// add src or root give priority to src
 			possibleIncludeFolder = Library.LIBRARY_SOURCE_FODER;
 			file = toLinkFolder.append(possibleIncludeFolder).toFile();
 			if (file.exists()) {
-				addIncludeFolder(configurationDescription, link.getFullPath().append(possibleIncludeFolder));
+				addIncludeFolder(folderDescription, link.getFullPath().append(possibleIncludeFolder));
 			} else {
-				addIncludeFolder(configurationDescription, link.getFullPath());
+				addIncludeFolder(folderDescription, link.getFullPath());
 			}
 		}
 
 		possibleIncludeFolder = "arch";
 		file = toLinkFolder.append(possibleIncludeFolder).toFile();
 		if (file.exists()) {
 			InternalBoardDescriptor boardDescriptor = new InternalBoardDescriptor(configurationDescription);
-			addIncludeFolder(configurationDescription,
+			addIncludeFolder(folderDescription,
 					link.getFullPath().append(possibleIncludeFolder).append(boardDescriptor.getArchitecture()));
 		}
 	}
@@ -316,24 +315,6 @@ public static void addCodeFolder(IProject project, Path Path, ICConfigurationDes
 		addCodeFolder(project, Path, NiceName, configurationDescription, forceRoot);
 	}
 
-	/**
-	 * addTheNatures replaces all existing natures by the natures needed for a
-	 * arduino project
-	 *
-	 * @param project The project where the natures need to be added to
-	 * @throws CoreException
-	 */
-	public static void addTheNatures(IProjectDescription description) throws CoreException {
-
-		String[] newnatures = new String[5];
-		newnatures[0] = "org.eclipse.cdt.core.cnature";
-		newnatures[1] = "org.eclipse.cdt.core.ccnature";
-		newnatures[2] = "org.eclipse.cdt.managedbuilder.core.managedBuildNature";
-		newnatures[3] = "org.eclipse.cdt.managedbuilder.core.ScannerConfigNature";
-		newnatures[4] = Const.ARDUINO_NATURE_ID;
-		description.setNatureIds(newnatures);
-
-	}
 
 	/**
 	 * This method adds the content of a content stream to a file If the file

io.sloeber.core/src/io/sloeber/core/tools/Helpers.java

@@ -31,7 +31,6 @@
 
 import io.sloeber.core.api.CodeDescriptor;
 import io.sloeber.core.api.CompileOptions;
-import io.sloeber.core.api.ConfigurationDescriptor;
 import io.sloeber.core.api.PackageManager;
 import io.sloeber.core.api.Preferences;
 import io.sloeber.core.api.Sketch;
@@ -155,9 +154,7 @@ public void Build_Verify_upload(CodeDescriptor codeDescriptor,
 		try {
 
 			theTestProject = this.myBoard.getBoardDescriptor().createProject(
-					projectName, null,
-					ConfigurationDescriptor.getDefaultDescriptors(),
-					codeDescriptor, compileOptions, monitor);
+					projectName, null,	codeDescriptor, compileOptions, monitor);
 			Shared.waitForAllJobsToFinish(); // for the indexer
 		} catch (Exception e) {
 			e.printStackTrace();