Skip to content

Commit 7520e66

Browse files
cmagliecmaglie
committed
Removed no more used "coan" tools
Signed-off-by: Cristian Maglie <[email protected]>
1 parent a9fd1c6 commit 7520e66

File tree

7 files changed

+12
-235
lines changed

7 files changed

+12
-235
lines changed

Diff for: ‎src/arduino.cc/builder/coan_runner.go

-91
This file was deleted.

Diff for: ‎src/arduino.cc/builder/constants/constants.go

-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ const BUILD_PROPERTIES_SOURCE_FILE = "source_file"
7272
const BUILD_PROPERTIES_SOURCE_PATH = "build.source.path"
7373
const BUILD_PROPERTIES_TOOLS_KEY = "tools"
7474
const BUILD_PROPERTIES_VID = "vid"
75-
const COAN = "coan"
7675
const CTAGS = "ctags"
7776
const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
7877
const CTX_BUILD_CORE = "buildCore"
@@ -95,7 +94,6 @@ const EMPTY_STRING = ""
9594
const FILE_BOARDS_LOCAL_TXT = "boards.local.txt"
9695
const FILE_BOARDS_TXT = "boards.txt"
9796
const FILE_BUILTIN_TOOLS_VERSIONS_TXT = "builtin_tools_versions.txt"
98-
const FILE_COAN_TARGET = "coan_target.cpp"
9997
const FILE_CTAGS_TARGET = "ctags_target.cpp"
10098
const FILE_CTAGS_TARGET_FOR_GCC_MINUS_E = "ctags_target_for_gcc_minus_e.cpp"
10199
const FILE_GCC_PREPROC_TARGET = "gcc_preproc_target.cpp"

Diff for: ‎src/arduino.cc/builder/test/coan_runner_test.go

-74
This file was deleted.

Diff for: ‎src/arduino.cc/builder/test/hardware/platform.txt

-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
# coan
2-
# ------------------------------
3-
tools.coan.path={runtime.tools.coan.path}
4-
tools.coan.cmd.path={path}/coan
5-
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}"
61

Diff for: ‎src/arduino.cc/builder/test/helper_tools_downloader.go

-7
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,6 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
105105
Tool{Name: "avrdude", Version: "6.0.1-arduino5"},
106106
Tool{Name: "avr-gcc", Version: "4.8.1-arduino5"},
107107
Tool{Name: "arm-none-eabi-gcc", Version: "4.8.3-2014q1"},
108-
Tool{Name: "coan", Version: "5.2", OsUrls: []OsUrl{
109-
OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/coan-5.2-i686-pc-linux-gnu.tar.bz2"},
110-
OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/coan-5.2-x86_64-pc-linux-gnu.tar.bz2"},
111-
OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/coan-5.2-i686-mingw32.zip"},
112-
OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/coan-5.2-x86_64-apple-darwin.zip"},
113-
OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/coan-5.2-arm-linux-gnueabihf.tar.bz2"},
114-
}},
115108
Tool{Name: "ctags", Version: "5.8-arduino10",
116109
OsUrls: []OsUrl{
117110
OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino10-i686-pc-linux-gnu.tar.bz2"},

Diff for: ‎src/arduino.cc/builder/test/includes_finder_with_regexp_test.go

+12-52
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,10 @@ import (
3434
"arduino.cc/builder/constants"
3535
"arduino.cc/builder/types"
3636
"github.com/stretchr/testify/require"
37-
"os"
38-
"path/filepath"
3937
"sort"
4038
"testing"
4139
)
4240

43-
func TestIncludesFinderWithRegExpCoanOutput(t *testing.T) {
44-
DownloadCoresAndToolsAndLibraries(t)
45-
46-
context := make(map[string]interface{})
47-
ctx := &types.Context{
48-
HardwareFolders: []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"},
49-
ToolsFolders: []string{"downloaded_tools"},
50-
SketchLocation: filepath.Join("sketch2", "SketchWithIfDef.ino"),
51-
FQBN: "arduino:avr:leonardo",
52-
ArduinoAPIVersion: "10600",
53-
Verbose: true,
54-
}
55-
56-
buildPath := SetupBuildPath(t, ctx)
57-
defer os.RemoveAll(buildPath)
58-
59-
commands := []types.Command{
60-
&builder.ContainerSetupHardwareToolsLibsSketchAndProps{},
61-
62-
&builder.ContainerMergeCopySketchFiles{},
63-
64-
&builder.CoanRunner{},
65-
66-
&builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE},
67-
}
68-
69-
for _, command := range commands {
70-
err := command.Run(context, ctx)
71-
NoError(t, err)
72-
}
73-
74-
includes := ctx.Includes
75-
require.Equal(t, 3, len(includes))
76-
require.Equal(t, "Arduino.h", includes[0])
77-
require.Equal(t, "empty_1.h", includes[1])
78-
require.Equal(t, "empty_2.h", includes[2])
79-
}
80-
8141
func TestIncludesFinderWithRegExp(t *testing.T) {
8242
context := make(map[string]interface{})
8343
ctx := &types.Context{}
@@ -86,9 +46,9 @@ func TestIncludesFinderWithRegExp(t *testing.T) {
8646
"#include <SPI.h>\n" +
8747
"^\n" +
8848
"compilation terminated."
89-
context["source"] = output
49+
context[constants.CTX_SOURCE] = output
9050

91-
parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
51+
parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
9252
err := parser.Run(context, ctx)
9353
NoError(t, err)
9454

@@ -103,9 +63,9 @@ func TestIncludesFinderWithRegExpEmptyOutput(t *testing.T) {
10363

10464
output := ""
10565

106-
context["source"] = output
66+
context[constants.CTX_SOURCE] = output
10767

108-
parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
68+
parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
10969
err := parser.Run(context, ctx)
11070
NoError(t, err)
11171

@@ -124,9 +84,9 @@ func TestIncludesFinderWithRegExpPreviousIncludes(t *testing.T) {
12484
"^\n" +
12585
"compilation terminated."
12686

127-
context["source"] = output
87+
context[constants.CTX_SOURCE] = output
12888

129-
parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
89+
parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
13090
err := parser.Run(context, ctx)
13191
NoError(t, err)
13292

@@ -145,9 +105,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes(t *testing.T) {
145105
" # include <Wire.h>\n" +
146106
" ^\n" +
147107
"compilation terminated.\n"
148-
context["source"] = output
108+
context[constants.CTX_SOURCE] = output
149109

150-
parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
110+
parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
151111
err := parser.Run(context, ctx)
152112
NoError(t, err)
153113

@@ -165,9 +125,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes2(t *testing.T) {
165125
" #\t\t\tinclude <Wire.h>\n" +
166126
" ^\n" +
167127
"compilation terminated.\n"
168-
context["source"] = output
128+
context[constants.CTX_SOURCE] = output
169129

170-
parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
130+
parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
171131
err := parser.Run(context, ctx)
172132
NoError(t, err)
173133

@@ -184,9 +144,9 @@ func TestIncludesFinderWithRegExpPaddedIncludes3(t *testing.T) {
184144
output := "/some/path/sketch.ino:1:33: fatal error: SPI.h: No such file or directory\n" +
185145
"compilation terminated.\n"
186146

187-
context["source"] = output
147+
context[constants.CTX_SOURCE] = output
188148

189-
parser := builder.IncludesFinderWithRegExp{ContextField: "source"}
149+
parser := builder.IncludesFinderWithRegExp{ContextField: constants.CTX_SOURCE}
190150
err := parser.Run(context, ctx)
191151
NoError(t, err)
192152

Diff for: ‎src/arduino.cc/builder/test/setup_build_properties_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,6 @@ func TestSetupBuildPropertiesWithMissingPropsFromParentPlatformTxtFiles(t *testi
217217
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"])
218218
require.Equal(t, "{path}/etc/avrdude.conf", buildProperties["tools.avrdude.config.path"])
219219

220-
coanProps := buildProperties.SubTree(constants.BUILD_PROPERTIES_TOOLS_KEY).SubTree(constants.COAN)
221-
require.Equal(t, "{path}/coan", coanProps["cmd.path"])
222-
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])
223-
224220
require.Equal(t, Abs(t, "user_hardware/my_avr_platform/avr"), buildProperties[constants.BUILD_PROPERTIES_RUNTIME_PLATFORM_PATH])
225221
require.Equal(t, Abs(t, "user_hardware/my_avr_platform"), buildProperties[constants.BUILD_PROPERTIES_RUNTIME_HARDWARE_PATH])
226222
require.Equal(t, "10600", buildProperties[constants.BUILD_PROPERTIES_RUNTIME_IDE_VERSION])

0 commit comments

Comments
 (0)