First successful test for #1126

Author: jan

io.sloeber.core/plugin.xml

@@ -179,7 +179,7 @@
                     id="io.sloeber.compiler.c.link.output"
                     name="%outputType.C.link.name"
                     namePattern="*.o"
-                    nameProvider="io.sloeber.managedBuild.Internal.CompileOutputNameProvider">
+                    nameProvider="io.sloeber.core.builder.CompileOutputNameProvider">
               </outputType>
               <outputType
                     buildVariable="AR_OBJ"
@@ -220,7 +220,7 @@
                     id="io.sloeber.compiler.S.sketch.link.output"
                     name="%outputType.S.link.name"
                     namePattern="%.o"
-                    nameProvider="io.sloeber.managedBuild.Internal.CompileOutputNameProvider"
+                    nameProvider="io.sloeber.core.builder.CompileOutputNameProvider"
                     superClass="io.sloeber.compiler.c.link.output">
               </outputType>
               <outputType
@@ -240,6 +240,7 @@
                     buildVariable="AR"
                     id="io.sloeber.tool.archiver.output"
                     name="%outputType.archiver.name"
+                    nameProvider="io.sloeber.core.builder.ArchiveOutputNameProvider"
                     outputExtension="ar"
                     outputName="${archive_file}">
               </outputType>

io.sloeber.core/src/io/sloeber/core/builder/ArchiveOutputNameProvider.java

@@ -0,0 +1,36 @@
+package io.sloeber.core.builder;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IPath;
+
+import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
+import io.sloeber.autoBuild.extensionPoint.IOutputNameProvider;
+import static io.sloeber.core.api.Const.*;
+import io.sloeber.core.api.ISloeberConfiguration;
+import io.sloeber.schema.api.IInputType;
+import io.sloeber.schema.api.IOutputType;
+
+public class ArchiveOutputNameProvider implements IOutputNameProvider {
+
+
+	@Override
+	public String getOutputFileName(IFile inputFile, IAutoBuildConfigurationDescription autoData, IInputType inputType,
+			IOutputType outputType) {
+
+		ISloeberConfiguration sloeberConf = ISloeberConfiguration.getConfig(autoData);
+		if (sloeberConf == null) {
+			// This should not happen
+			return null;
+		}
+		IPath buildPath=autoData.getBuildFolder().getProjectRelativePath();
+		IPath inputFilePath = inputFile.getProjectRelativePath();
+		String inputFilePathSegments[]=inputFilePath.segments();
+		for(int curSegment=buildPath.segmentCount() ;curSegment<inputFilePathSegments.length;curSegment++) {
+			if(SLOEBER_LIBRARY_FOLDER_NAME.equals(  inputFilePathSegments[curSegment])){
+				return inputFilePathSegments[curSegment+1]+DOT+outputType.getOutputExtension();
+			}
+		}
+		return outputType.getOutputName();
+	}
+
+}

io.sloeber.core/src/io/sloeber/managedBuild/Internal/CompileOutputNameProvider.java renamed to io.sloeber.core/src/io/sloeber/core/builder/CompileOutputNameProvider.java

@@ -1,4 +1,4 @@
-package io.sloeber.managedBuild.Internal;
+package io.sloeber.core.builder;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -70,13 +70,13 @@ private static boolean isArchiverFile(IFile inputFile, ISloeberConfiguration slo
 				KeyValueTree rootSection = libProps.getData();
 				ret = Boolean.valueOf(rootSection.getValue(LIBRARY_DOT_A_LINKAGE)).booleanValue();
 			}
-			isArchiveLib.put(libName, ret);
+			isArchiveLib.put(libName, Boolean.valueOf(ret));
 			return ret;
 
 		}
 		// It is standard sketch code. No archiver needed
 
-		return true;
+		return false;
 	}
 
 }