#1005 Variant is not put in archive

Author: jantje

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

@@ -39,9 +39,12 @@ public class Const {
 	public static final String ARDUINO_HARDWARE_FOLDER_NAME = "hardware";
 	public static final String ARDUINO_CODE_FOLDER_NAME = "core";
 
+	public static final String ARDUINO_CODE_FOLDER_PATH =ARDUINO_CODE_FOLDER_NAME+ "/core";
+
 	public static final String BOARDS_FILE_NAME = "boards.txt";
 
 	public static final String VARIANTS_FOLDER_NAME = "variants";
+	public static final String ARDUINO_VARIANT_FOLDER_PATH =ARDUINO_CODE_FOLDER_NAME+ "/variant";
 
 	// tags to interpret the arduino txt config files
 

io.sloeber.core/src/io/sloeber/core/toolchain/ArchiveNameProvider.java

@@ -27,7 +27,7 @@ public IPath[] getOutputNames(IProject project, IConfiguration cConf, ITool tool
 		.getBuildEnvironmentVariable(project, cConf.getName(), Const.ENV_KEY_USE_ARCHIVER, Const.TRUE)
 		.equalsIgnoreCase(Const.TRUE);
 	for (int curPath = 0; curPath < primaryInputNames.length; curPath++) {
-	    if (primaryInputNames[curPath].toString().startsWith(Const.ARDUINO_CODE_FOLDER_NAME) && (bUseArchiver)) {
+	    if (primaryInputNames[curPath].toString().startsWith(Const.ARDUINO_CODE_FOLDER_PATH) && (bUseArchiver)) {
 		outputNames[curPath] = Helpers.GetOutputName(primaryInputNames[curPath]).addFileExtension("o"); //$NON-NLS-1$
 	    } else {
 		return null;

io.sloeber.core/src/io/sloeber/core/toolchain/LinkNameProvider.java

@@ -26,7 +26,7 @@ public IPath[] getOutputNames(IProject project, IConfiguration cConf, ITool tool
 		.equalsIgnoreCase(Const.TRUE);
 	IPath[] outputNames = new IPath[primaryInputNames.length];
 	for (int curPath = 0; curPath < outputNames.length; curPath++) {
-	    if (primaryInputNames[curPath].toString().startsWith(Const.ARDUINO_CODE_FOLDER_NAME) && (bUseArchiver)) {
+	    if (primaryInputNames[curPath].toString().startsWith(Const.ARDUINO_CODE_FOLDER_PATH) && (bUseArchiver)) {
 		return null;
 	    }
 	    if (primaryInputNames[curPath].toString().endsWith(".ino")) { //$NON-NLS-1$

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

@@ -75,7 +75,7 @@
  *
  */
 public class Helpers extends Common {
-	private static final String ARDUINO_CORE_BUILD_FOLDER_NAME = "core";
+	
 
 	private static final String ENV_KEY_BUILD_ARCH = ERASE_START + "BUILD.ARCH";
 	private static final String ENV_KEY_BUILD_GENERIC_PATH = ERASE_START + "BUILD.GENERIC.PATH";
@@ -396,15 +396,15 @@ public static void addArduinoCodeToProject(BoardDescriptor boardDescriptor, IPro
 
 		IPath corePath = boardDescriptor.getActualCoreCodePath();
 		if(corePath!=null) {
-		addCodeFolder(project, corePath, ARDUINO_CODE_FOLDER_NAME + '/' + ARDUINO_CORE_BUILD_FOLDER_NAME,
+		addCodeFolder(project, corePath, ARDUINO_CODE_FOLDER_PATH,
 				configurationDescription,true);
 		IPath variantPath = boardDescriptor.getActualVariantPath();
 		if (variantPath == null) {
 			// remove the existing link
-			Helpers.removeCodeFolder(project, ARDUINO_CODE_FOLDER_NAME + "/variant");
+			Helpers.removeCodeFolder(project, ARDUINO_VARIANT_FOLDER_PATH);
 		} else {
 			IPath redirectVariantPath = boardDescriptor.getActualVariantPath();
-			Helpers.addCodeFolder(project, redirectVariantPath, ARDUINO_CODE_FOLDER_NAME + "/variant",
+			Helpers.addCodeFolder(project, redirectVariantPath, ARDUINO_VARIANT_FOLDER_PATH,
 					configurationDescription,false);
 		}
 		}

io.sloeber.product/arduino.product

@@ -364,8 +364,8 @@ rights to a jury trial in any resulting litigation.</p>
 
    <repositories>
       <repository location="http://eclipse.baeyens.it/update/V4/nightly" enabled="false" />
-      <repository location="http://eclipse.baeyens.it/update/V4/stable" enabled="true" />
       <repository location="http://download.eclipse.org/releases/photon" enabled="true" />
+      <repository location="http://eclipse.baeyens.it/update/V4/stable" enabled="true" />
    </repositories>
 
    <preferencesInfo>

io.sloeber.tests/src/io/sloeber/core/CreateAndCompileDefaultInoOnAllBoardsTest.java

@@ -65,11 +65,6 @@ public class CreateAndCompileDefaultInoOnAllBoardsTest {
             // boards that need to be fixed
             "RedBear Duo (Native USB Port)", "RedBear Duo (RBLink USB Port)",
 
-            // needs support for commands before compiling
-    //        "Nucleo-144", "Nucleo-64", "Nucleo-32", "Discovery",
-
-            // variant content should not be part of the archive
-            "UDOO Neo (Cortex M4)",
 
             // issue #660
             "Engimusing EFM32WG840", "Engimusing EFM32WG842",