Removed no more used "coan" tools

Signed-off-by: Cristian Maglie <c.maglie@arduino.cc>

Author: cmaglie

src/arduino.cc/builder/coan_runner.go

@@ -72,7 +72,6 @@ const BUILD_PROPERTIES_SOURCE_FILE = "source_file"
 const BUILD_PROPERTIES_SOURCE_PATH = "build.source.path"
 const BUILD_PROPERTIES_TOOLS_KEY = "tools"
 const BUILD_PROPERTIES_VID = "vid"
-const COAN = "coan"
 const CTAGS = "ctags"
 const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
 const CTX_BUILD_CORE = "buildCore"
@@ -95,7 +94,6 @@ const EMPTY_STRING = ""
 const FILE_BOARDS_LOCAL_TXT = "boards.local.txt"
 const FILE_BOARDS_TXT = "boards.txt"
 const FILE_BUILTIN_TOOLS_VERSIONS_TXT = "builtin_tools_versions.txt"
-const FILE_COAN_TARGET = "coan_target.cpp"
 const FILE_CTAGS_TARGET = "ctags_target.cpp"
 const FILE_CTAGS_TARGET_FOR_GCC_MINUS_E = "ctags_target_for_gcc_minus_e.cpp"
 const FILE_GCC_PREPROC_TARGET = "gcc_preproc_target.cpp"

src/arduino.cc/builder/constants/constants.go

@@ -1,6 +1 @@
-# coan
-# ------------------------------
-tools.coan.path={runtime.tools.coan.path}
-tools.coan.cmd.path={path}/coan
-tools.coan.pattern="{cmd.path}" source -m -E -P -kb {compiler.c.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} "{source_file}"
 

src/arduino.cc/builder/test/coan_runner_test.go

@@ -105,13 +105,6 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 		Tool{Name: "avrdude", Version: "6.0.1-arduino5"},
 		Tool{Name: "avr-gcc", Version: "4.8.1-arduino5"},
 		Tool{Name: "arm-none-eabi-gcc", Version: "4.8.3-2014q1"},
-		Tool{Name: "coan", Version: "5.2", OsUrls: []OsUrl{
-			OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/coan-5.2-i686-pc-linux-gnu.tar.bz2"},
-			OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/coan-5.2-x86_64-pc-linux-gnu.tar.bz2"},
-			OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/coan-5.2-i686-mingw32.zip"},
-			OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/coan-5.2-x86_64-apple-darwin.zip"},
-			OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/coan-5.2-arm-linux-gnueabihf.tar.bz2"},
-		}},
 		Tool{Name: "ctags", Version: "5.8-arduino10",
 			OsUrls: []OsUrl{
 				OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino10-i686-pc-linux-gnu.tar.bz2"},

src/arduino.cc/builder/test/hardware/platform.txt

@@ -34,50 +34,10 @@ import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
 	"github.com/stretchr/testify/require"
-	"os"
-	"path/filepath"
 	"sort"
 	"testing"
 )
 
-func TestIncludesFinderWithRegExpCoanOutput(t *testing.T) {
-	DownloadCoresAndToolsAndLibraries(t)
-
-	context := make(map[string]interface{})
-	ctx := &types.Context{
-		HardwareFolders:   []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
-		ToolsFolders:      []string{"downloaded_tools"},
-		SketchLocation:    filepath.Join("sketch2", "SketchWithIfDef.ino"),
-		FQBN:              "arduino:avr:leonardo",
-		ArduinoAPIVersion: "10600",
-		Verbose:           true,
-	}
-
-	buildPath := SetupBuildPath(t, ctx)
-	defer os.RemoveAll(buildPath)
-
-	commands := []types.Command{
-		&builder.ContainerSetupHardwareToolsLibsSketchAndProps{},
-
-		&builder.ContainerMergeCopySketchFiles{},
-
-		&builder.CoanRunner{},
-
-		&builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE},
-	}
-
-	for _, command := range commands {
-		err := command.Run(context, ctx)
-		NoError(t, err)
-	}
-
-	includes := ctx.Includes
-	require.Equal(t, 3, len(includes))
-	require.Equal(t, "Arduino.h", includes[0])
-	require.Equal(t, "empty_1.h", includes[1])
-	require.Equal(t, "empty_2.h", includes[2])
-}
-
 func TestIncludesFinderWithRegExp(t *testing.T) {
 	context := make(map[string]interface{})
 	ctx := &types.Context{}
@@ -86,9 +46,9 @@ func TestIncludesFinderWithRegExp(t *testing.T) {
 		"#include <SPI.h>\n" +
 		"^\n" +
 		"compilation terminated."
-	context["source"] = output
+	context[constants.CTX_SOURCE] = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
+	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -103,9 +63,9 @@ func TestIncludesFinderWithRegExpEmptyOutput(t *testing.T) {
 
 	output := ""
 
-	context["source"] = output
+	context[constants.CTX_SOURCE] = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
+	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -124,9 +84,9 @@ func TestIncludesFinderWithRegExpPreviousIncludes(t *testing.T) {
 		"^\n" +
 		"compilation terminated."
 
-	context["source"] = output
+	context[constants.CTX_SOURCE] = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
+	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -145,9 +105,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes(t *testing.T) {
 		" #               include <Wire.h>\n" +
 		"                                 ^\n" +
 		"compilation terminated.\n"
-	context["source"] = output
+	context[constants.CTX_SOURCE] = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
+	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -165,9 +125,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes2(t *testing.T) {
 		" #\t\t\tinclude <Wire.h>\n" +
 		"                                 ^\n" +
 		"compilation terminated.\n"
-	context["source"] = output
+	context[constants.CTX_SOURCE] = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
+	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 
@@ -184,9 +144,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes3(t *testing.T) {
 	output := "/some/path/sketch.ino:1:33: fatal error: SPI.h: No such file or directory\n" +
 		"compilation terminated.\n"
 
-	context["source"] = output
+	context[constants.CTX_SOURCE] = output
 
-	parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
+	parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
 	err := parser.Run(context, ctx)
 	NoError(t, err)
 

src/arduino.cc/builder/test/helper_tools_downloader.go

@@ -217,10 +217,6 @@ func TestSetupBuildPropertiesWithMissingPropsFromParentPlatformTxtFiles(t *testi
 	require.Equal(t, "\"{compiler.path}{compiler.c.cmd}\" {compiler.c.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} \"{source_file}\" -o \"{object_file}\"", buildProperties["recipe.c.o.pattern"])
 	require.Equal(t, "{path}/etc/avrdude.conf", buildProperties["tools.avrdude.config.path"])
 
-	coanProps := buildProperties.SubTree(constants.BUILD_PROPERTIES_TOOLS_KEY).SubTree(constants.COAN)
-	require.Equal(t, "{path}/coan", coanProps["cmd.path"])
-	require.Equal(t, "\"{cmd.path}\" source -m -E -P -kb {compiler.c.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} \"{source_file}\"", coanProps[constants.BUILD_PROPERTIES_PATTERN])
-
 	require.Equal(t, Abs(t, "user_hardware/my_avr_platform/avr"), buildProperties[constants.BUILD_PROPERTIES_RUNTIME_PLATFORM_PATH])
 	require.Equal(t, Abs(t, "user_hardware/my_avr_platform"), buildProperties[constants.BUILD_PROPERTIES_RUNTIME_HARDWARE_PATH])
 	require.Equal(t, "10600", buildProperties[constants.BUILD_PROPERTIES_RUNTIME_IDE_VERSION])