#1126 All seems fine except for the makefile rules

I want to check in as I did lots of changes
Building doesn't work anymore as the top level
rules are missing

Author: jantje

io.sloeber.core/src/io/sloeber/managedBuild/Internal/ArduinoGnuMakefileGenerator.java

@@ -4,8 +4,9 @@
 import static io.sloeber.managedBuild.Internal.ManagedBuildConstants.*;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -36,9 +37,9 @@
 
 public class MakeRule {
 
-    private Map<IOutputType, List<IFile>> myTargets = new HashMap<>(); //Macro file target map
-    private Map<IInputType, List<IFile>> myPrerequisites = new HashMap<>();//Macro file prerequisites map
-    private Map<String, List<IFile>> myDependencies = new HashMap<>(); //Macro file target map
+    private Map<IOutputType, List<IFile>> myTargets = new LinkedHashMap<>(); //Macro file target map
+    private Map<IInputType, List<IFile>> myPrerequisites = new LinkedHashMap<>();//Macro file prerequisites map
+    private Map<String, List<IFile>> myDependencies = new LinkedHashMap<>(); //Macro file target map
     private ITool myTool = null;
 
     //TOFIX get rid of caller argument
@@ -80,7 +81,7 @@ private void calculateDependencies(ArduinoGnuMakefileGenerator caller) {
                     IManagedDependencyCalculator depCalculator = (IManagedDependencyCalculator) depInfo;
                     IPath[] addlDeps = calculateDependenciesForSource(caller, depCalculator);
                     IPath[] addlTargets = depCalculator.getAdditionalTargets();
-                    //   }
+                    //TOFIX when is this call path used?
                 }
                 if (depInfo instanceof IManagedDependencyCommands) {
                     IManagedDependencyCommands tmp = (IManagedDependencyCommands) depInfo;
@@ -126,22 +127,51 @@ public HashSet<IFile> getPrerequisites() {
         return ret;
     }
 
-    public HashSet<IFile> getTargets() {
-        HashSet<IFile> ret = new HashSet<>();
+    public Set<IFile> getTargetFiles() {
+        Set<IFile> ret = new HashSet<>();
         for (List<IFile> cur : myTargets.values()) {
             ret.addAll(cur);
         }
         return ret;
     }
 
-    public HashSet<String> getMacros() {
-        HashSet<String> ret = new HashSet<>();
+    public Set<IFile> getDependencyFiles() {
+        Set<IFile> ret = new HashSet<>();
+        for (List<IFile> cur : myDependencies.values()) {
+            ret.addAll(cur);
+        }
+        return ret;
+    }
+
+    public Map<IOutputType, List<IFile>> getTargets() {
+        return myTargets;
+    }
+
+    public Set<String> getAllMacros() {
+        Set<String> ret = getTargetMacros();
+        ret.addAll(getPrerequisiteMacros());
+        ret.addAll(getDependecyMacros());
+        return ret;
+    }
+
+    public Set<String> getTargetMacros() {
+        HashSet<String> ret = new LinkedHashSet<>();
         for (IOutputType cur : myTargets.keySet()) {
             ret.add(cur.getBuildVariable());
         }
+        return ret;
+    }
+
+    public Set<String> getPrerequisiteMacros() {
+        HashSet<String> ret = new LinkedHashSet<>();
         for (IInputType cur : myPrerequisites.keySet()) {
             ret.add(cur.getBuildVariable());
         }
+        return ret;
+    }
+
+    public Set<String> getDependecyMacros() {
+        HashSet<String> ret = new LinkedHashSet<>();
         for (String cur : myDependencies.keySet()) {
             ret.add(cur);
         }
@@ -215,8 +245,8 @@ public StringBuffer getRule(IProject project, IFile niceBuildFolder, IConfigurat
         String cmd = myTool.getToolCommand();
         //For now assume 1 target with 1 or more prerequisites
         // if there is more than 1 prerequisite we take the flags of the first prerequisite only
-        HashSet<IFile> local_targets = getTargets();
-        HashSet<IFile> local_prerequisites = getPrerequisites();
+        Set<IFile> local_targets = getTargetFiles();
+        Set<IFile> local_prerequisites = getPrerequisites();
         if (local_targets.size() != 1) {
             System.err.println("Only 1 target per build rule is supported in this managed build"); //$NON-NLS-1$
             return new StringBuffer();
@@ -314,7 +344,7 @@ public StringBuffer getRule(IProject project, IFile niceBuildFolder, IConfigurat
     }
 
     private Set<String> getBuildFlags(IFile buildFolder, IConfiguration config, IFile sourceFile, IFile outputFile) {
-        Set<String> flags = new HashSet<>();
+        Set<String> flags = new LinkedHashSet<>();
         // Get the tool command line options
         try {
 

io.sloeber.core/src/io/sloeber/managedBuild/Internal/ArduinoManagedBuildGnuToolInfo.java

@@ -109,26 +109,29 @@ static public StringBuffer getSourceMacroName(String extensionName) {
     }
 
     public static void save(StringBuffer buffer, IFile file) throws CoreException {
-        String encoding = null;
-        try {
-            encoding = file.getCharset();
-        } catch (CoreException ce) {
-            // use no encoding
-        }
-        byte[] bytes = null;
-        if (encoding != null) {
-            try {
-                bytes = buffer.toString().getBytes(encoding);
-            } catch (Exception e) {
-                /* JABA is not going to write this code */
-            }
+
+        byte[] bytes = buffer.toString().getBytes();
+        ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
+        if (file.exists()) {
+            file.setContents(stream, true, false, null);
         } else {
-            bytes = buffer.toString().getBytes();
+            IFolder fileFolder = file.getProject().getFolder(file.getParent().getProjectRelativePath());
+            createFolder(fileFolder);
+            file.create(stream, false, null);
         }
-        ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
-        // use a platform operation to update the resource contents
-        boolean force = true;
-        file.setContents(stream, force, false, null);
+        file.setDerived(true, null);
+    }
+
+    public static void createFolder(IFolder folder) throws CoreException {
+        // Create or get the handle for the build directory
+        if (folder.exists()) {
+            return;
+        }
+        if (!folder.getParent().exists()) {
+            createFolder(folder.getFolder(".."));
+        }
+        folder.create(true, true, null);
+        folder.setDerived(true, null);
     }
 
     /**
@@ -484,7 +487,7 @@ public static void addMacroAdditionPrefix(LinkedHashMap<String, String> map, Str
             boolean addPrefix) {
         // there is no entry in the map, so create a buffer for this macro
         StringBuffer tempBuffer = new StringBuffer();
-        tempBuffer.append(macroName).append(WHITESPACE).append(MACRO_ADDITION_PREFIX_SUFFIX);
+        tempBuffer.append(macroName).append(MACRO_ADDITION_PREFIX_SUFFIX);
         if (addPrefix) {
             tempBuffer.append(new Path(MACRO_ADDITION_ADDPREFIX_HEADER).append(relativePath)
                     .append(MACRO_ADDITION_ADDPREFIX_SUFFIX).toOSString());

io.sloeber.core/src/io/sloeber/managedBuild/Internal/MakeRule.java

@@ -70,8 +70,9 @@ public class ManagedBuildConstants {
     public static final String OBJS_MACRO = "OBJS";
     public static final String MACRO_ADDITION_ADDPREFIX_HEADER = "${addprefix ";
     public static final String MACRO_ADDITION_ADDPREFIX_SUFFIX = "," + WHITESPACE + LINEBREAK;
-    public static final String JAVA_ADDITION = "+=";
-    public static final String MACRO_ADDITION_PREFIX_SUFFIX = JAVA_ADDITION + WHITESPACE + LINEBREAK;
+    public static final String MAKE_ADDITION = " +=";
+    public static final String MAKE_EQUAL = " :=";
+    public static final String MACRO_ADDITION_PREFIX_SUFFIX = MAKE_ADDITION + LINEBREAK;
     public static final String PREBUILD = "pre-build";
     public static final String MAINBUILD = "main-build";
     public static final String POSTBUILD = "post-build";

io.sloeber.core/src/io/sloeber/managedBuild/Internal/ManagebBuildCommon.java

@@ -3,136 +3,34 @@
 import static io.sloeber.managedBuild.Internal.ManagebBuildCommon.*;
 import static io.sloeber.managedBuild.Internal.ManagedBuildConstants.*;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
 import java.util.Set;
 
-import org.eclipse.cdt.core.settings.model.util.IPathSettingsContainerVisitor;
-import org.eclipse.cdt.core.settings.model.util.PathSettingsContainer;
-import org.eclipse.cdt.managedbuilder.core.IOutputType;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.managedbuilder.internal.core.ManagedMakeMessages;
-import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGeneratorType;
+import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 
 public class SrcMakeGenerator {
 
-    private ArduinoGnuMakefileGenerator caller;
-
-    SrcMakeGenerator(ArduinoGnuMakefileGenerator theCaller) {
-        caller = theCaller;
-    }
-
-    private IProject getProject() {
-        return caller.getProject();
-    }
-
-    public void populateSourcesMakefile(IFile fileHandle, PathSettingsContainer toolInfos,
+    static public void generateSourceMakefile(IProject project, IConfiguration config, Set<String> macroNames,
             Collection<IContainer> subDirs) throws CoreException {
         // Add the comment
         StringBuffer buffer = addDefaultHeader();
-        // Determine the set of macros
-        toolInfos.accept(new IPathSettingsContainerVisitor() {
-            @Override
-            public boolean visit(PathSettingsContainer container) {
-                ToolInfoHolder h = (ToolInfoHolder) container.getValue();
-                ITool[] buildTools = h.buildTools;
-                HashSet<String> handledInputExtensions = new HashSet<>();
-                String buildMacro;
-                for (ITool buildTool : buildTools) {
-                    if (buildTool.getCustomBuildStep())
-                        continue;
-                    // Add the known sources macros
-                    String[] extensionsList = buildTool.getAllInputExtensions();
-                    for (String ext : extensionsList) {
-                        // create a macro of the form "EXTENSION_SRCS :="
-                        String extensionName = ext;
-                        if (!handledInputExtensions.contains(extensionName)) {
-                            handledInputExtensions.add(extensionName);
-                            buildMacro = getSourceMacroName(extensionName).toString();
-                            if (!caller.buildSrcVars.containsKey(buildMacro)) {
-                                caller.buildSrcVars.put(buildMacro, new ArrayList<IPath>());
-                            }
-                            // Add any generated dependency file macros
-                            IManagedDependencyGeneratorType depType = buildTool
-                                    .getDependencyGeneratorForExtension(extensionName);
-                            if (depType != null) {
-                                int calcType = depType.getCalculatorType();
-                                if (calcType == IManagedDependencyGeneratorType.TYPE_COMMAND
-                                        || calcType == IManagedDependencyGeneratorType.TYPE_BUILD_COMMANDS
-                                        || calcType == IManagedDependencyGeneratorType.TYPE_PREBUILD_COMMANDS) {
-                                    buildMacro = getDepMacroName(extensionName).toString();
-                                    if (!caller.buildDepVars.containsKey(buildMacro)) {
-                                        caller.buildDepVars.put(buildMacro, new ArduinoGnuDependencyGroupInfo(
-                                                buildMacro,
-                                                (calcType != IManagedDependencyGeneratorType.TYPE_PREBUILD_COMMANDS)));
-                                    }
-                                    if (!caller.buildOutVars.containsKey(buildMacro)) {
-                                        caller.buildOutVars.put(buildMacro, new ArrayList<IPath>());
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    // Add the specified output build variables
-                    IOutputType[] outTypes = buildTool.getOutputTypes();
-                    if (outTypes != null && outTypes.length > 0) {
-                        for (IOutputType outputType : outTypes) {
-                            buildMacro = outputType.getBuildVariable();
-                            if (!caller.buildOutVars.containsKey(buildMacro)) {
-                                caller.buildOutVars.put(buildMacro, new ArrayList<IPath>());
-                            }
-                        }
-                    } else {
-                        // For support of pre-CDT 3.0 integrations.
-                        buildMacro = OBJS_MACRO;
-                        if (!caller.buildOutVars.containsKey(buildMacro)) {
-                            caller.buildOutVars.put(buildMacro, new ArrayList<IPath>());
-                        }
-                    }
-                }
-                return true;
-            }
-        });
         // Add the macros to the makefile
-        for (Entry<String, List<IPath>> entry : caller.buildSrcVars.entrySet()) {
-            String macroName = new Path(entry.getKey()).toOSString();
-            buffer.append(macroName).append(WHITESPACE).append(":=").append(WHITESPACE).append(NEWLINE); //$NON-NLS-1$
-        }
-        Set<Entry<String, List<IPath>>> set = caller.buildOutVars.entrySet();
-        for (Entry<String, List<IPath>> entry : set) {
-            String macroName = new Path(entry.getKey()).toOSString();
+        for (String macroName : macroNames) {
             buffer.append(macroName).append(WHITESPACE).append(":=").append(WHITESPACE).append(NEWLINE); //$NON-NLS-1$
         }
         // Add a list of subdirectories to the makefile
-        buffer.append(NEWLINE).append(addSubdirectories(subDirs));
-        // Save the file
-        save(buffer, fileHandle);
-    }
-
-    /*************************************************************************
-     * S O U R C E S (sources.mk) M A K E F I L E M E T H O D S
-     ************************************************************************/
-    private StringBuffer addSubdirectories(Collection<IContainer> subDirs) {
-        IProject project = getProject();
-        StringBuffer buffer = new StringBuffer();
+        buffer.append(NEWLINE);
         // Add the comment
         buffer.append(COMMENT_SYMBOL).append(WHITESPACE).append(MOD_LIST_MESSAGE).append(NEWLINE);
         buffer.append("SUBDIRS := ").append(LINEBREAK); //$NON-NLS-1$
         // Get all the module names
         for (IResource container : subDirs) {
-            caller.updateMonitor(ManagedMakeMessages.getFormattedString(
-                    "MakefileGenerator.message.adding.source.folder", container.getFullPath().toOSString())); //$NON-NLS-1$
-            // Check the special case where the module is the project root
             if (container.getFullPath() == project.getFullPath()) {
                 buffer.append(DOT).append(WHITESPACE).append(LINEBREAK);
             } else {
@@ -141,6 +39,30 @@ private StringBuffer addSubdirectories(Collection<IContainer> subDirs) {
             }
         }
         buffer.append(NEWLINE);
-        return buffer;
+        // Save the file
+        IFile fileHandle = project.getFile(config.getName() + '/' + SRCSFILE_NAME);
+        save(buffer, fileHandle);
     }
+
+    /**
+     * The makefile generator generates a Macro for each type of output, other than
+     * final artifact, created by the build.
+     *
+     * @param fileHandle
+     *            The file that should be populated with the output
+     */
+    protected static void generateObjectsMakefile(IProject project, IConfiguration config, Set<String> outputMacros)
+            throws CoreException {
+        StringBuffer macroBuffer = new StringBuffer();
+        macroBuffer.append(addDefaultHeader());
+
+        for (String macroName : outputMacros) {
+            macroBuffer.append(macroName).append(MAKE_EQUAL);
+            macroBuffer.append(NEWLINE);
+            macroBuffer.append(NEWLINE);
+        }
+        IFile fileHandle = project.getFile(config.getName() + '/' + OBJECTS_MAKFILE);
+        save(macroBuffer, fileHandle);
+    }
+
 }