Skip to content

Commit f8e1038

Browse files
committed
Updated tools for arduino-preprocessor
1 parent 7ca217b commit f8e1038

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

Diff for: hardware/platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# --------------------
33

44
tools.arduino-preprocessor.path={runtime.tools.arduino-preprocessor.path}
5-
tools.arduino-preprocessor.cmd.path={path}/bin/arduino-preprocessor
5+
tools.arduino-preprocessor.cmd.path={path}/arduino-preprocessor
66
tools.arduino-preprocessor.pattern="{cmd.path}" "{source_file}" "{codecomplete}" -- -std=gnu++11
77

88
# ctags

Diff for: test/helper_tools_downloader.go

+11-9
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,17 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
112112
OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-mingw32.zip"},
113113
OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-apple-darwin.zip"},
114114
OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-armv6-linux-gnueabihf.tar.bz2"},
115-
}},
116-
Tool{Name: "arduino-preprocessor", Version: "0.0.1"}, //OsUrls: []OsUrl{
117-
// OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-pc-linux-gnu.tar.bz2"},
118-
// OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-pc-linux-gnu.tar.bz2"},
119-
// OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-mingw32.zip"},
120-
// OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-apple-darwin.zip"},
121-
// OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-armv6-linux-gnueabihf.tar.bz2"},
122-
//}
123-
115+
},
116+
},
117+
Tool{Name: "arduino-preprocessor", Version: "0.1.0",
118+
OsUrls: []OsUrl{
119+
// OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-pc-linux-gnu.tar.bz2"},
120+
OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/arduino-preprocessor-0.1.0-x86_64-pc-linux-gnu.tar.bz2"},
121+
// OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-mingw32.zip"},
122+
// OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-apple-darwin.zip"},
123+
// OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-armv6-linux-gnueabihf.tar.bz2"},
124+
},
125+
},
124126
}
125127

126128
boardsManagerTools := []Tool{

Diff for: test/tools_loader_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ func TestLoadTools(t *testing.T) {
7171

7272
idx := 0
7373
require.Equal(t, "arduino-preprocessor", tools[idx].Name)
74-
require.Equal(t, "0.0.1", tools[idx].Version)
75-
require.Equal(t, Abs(t, "./downloaded_tools/arduino-preprocessor/0.0.1"), tools[idx].Folder)
74+
require.Equal(t, "0.1.0", tools[idx].Version)
75+
require.Equal(t, Abs(t, "./downloaded_tools/arduino-preprocessor/0.1.0"), tools[idx].Folder)
7676
idx++
7777
require.Equal(t, "arm-none-eabi-gcc", tools[idx].Name)
7878
require.Equal(t, "4.8.3-2014q1", tools[idx].Version)
@@ -151,8 +151,8 @@ func TestLoadLotsOfTools(t *testing.T) {
151151
require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/arduino/tools/CMSIS/4.0.0-atmel"), tools[idx].Folder)
152152
idx++
153153
require.Equal(t, "arduino-preprocessor", tools[idx].Name)
154-
require.Equal(t, "0.0.1", tools[idx].Version)
155-
require.Equal(t, Abs(t, "./downloaded_tools/arduino-preprocessor/0.0.1"), tools[idx].Folder)
154+
require.Equal(t, "0.1.0", tools[idx].Version)
155+
require.Equal(t, Abs(t, "./downloaded_tools/arduino-preprocessor/0.1.0"), tools[idx].Folder)
156156
idx++
157157
require.Equal(t, "arm-none-eabi-gcc", tools[idx].Name)
158158
require.Equal(t, "4.8.3-2014q1", tools[idx].Version)

0 commit comments

Comments
 (0)