Skip to content

Commit 2cf6414

Browse files
tenbahttenbaht
committed
fix DeqingSun#29: add support for board manager install on Mac OSX
1 parent 90d327d commit 2cf6414

10 files changed

Lines changed: 143 additions & 7 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased]
8+
### Added
9+
- IDE installation for OSX works now (#29, manual installation still
10+
problematic)
11+
812
### Fixed
913
- Windows: better path handling to fix "'cp' and 'rm' not found" error
1014
- removed unneed symlink in SPL that caused the IDE installation to fail (#30)

‎board-manager/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# the required versions for the new build
2-
COREVERSION=0.3.2
2+
COREVERSION=0.3.3
33
SDCCVERSION=10088
4-
TOOLSVERSION=2017.11.06
4+
TOOLSVERSION=2017.11.13
55

66
BASEURL=https://github.com/tenbaht/sduino/releases/download/v$(COREVERSION)
77

@@ -12,6 +12,7 @@ TESTPACKAGEFILE=package_testserver_index.json
1212
TESTBASEURL=http://knecht.fritz.box/sduino
1313
TESTBASEDIR=knecht:/var/www/html/sduino
1414

15+
# make sure these definitions are visible for the sub-makes
1516
export
1617

1718
.PHONY: core tools sdcc clean upload release

‎board-manager/Makefile.tools‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ TOOLS_ENTRY=$(PARTSDIR)/tools-entry-$(NAME)-$(TOOLSVERSION).txt
2828
# The individual filenames for the different tools archives
2929
TOOLS_LINUX32=$(ARCHIVEDIR)/$(NAME)_linux32-$(TOOLSVERSION).tar.bz2
3030
TOOLS_LINUX64=$(ARCHIVEDIR)/$(NAME)_linux64-$(TOOLSVERSION).tar.bz2
31+
TOOLS_MACOSX=$(ARCHIVEDIR)/$(NAME)_macosx-$(TOOLSVERSION).tar.bz2
3132
TOOLS_WINDOWS=$(ARCHIVEDIR)/$(NAME)_mingw32-$(TOOLSVERSION).tar.bz2
3233

33-
TOOLS_TARS=$(TOOLS_LINUX32) $(TOOLS_LINUX64) $(TOOLS_WINDOWS)
34+
TOOLS_TARS=$(TOOLS_LINUX32) $(TOOLS_LINUX64) $(TOOLS_MACOSX) $(TOOLS_WINDOWS)
3435
EXCLUDES=$(addprefix --exclude=, $(IGNORE))
35-
TARFLAGS=$(EXCLUDES) --show-transformed-names --transform
36+
3637

3738
#
3839
# The actual rules
@@ -52,6 +53,10 @@ $(TOOLS_LINUX64): | $(ARCHIVEDIR)
5253
tar cjf $@ $(EXCLUDES) -C $(BASEDIR) --transform s/linux64/linux/ \
5354
tools/wrapper tools/linux64
5455

56+
$(TOOLS_MACOSX): | $(ARCHIVEDIR)
57+
@echo "Generating the tools archive file for Mac OSX"
58+
tar cjf $@ $(EXCLUDES) -C $(BASEDIR) tools/wrapper tools/macosx
59+
5560
$(TOOLS_WINDOWS): | $(ARCHIVEDIR)
5661
@echo "Generating the tools archive file for Windows."
5762
tar cjf $@ $(EXCLUDES) -C $(BASEDIR) tools/wrapper tools/win

‎board-manager/assemble.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ PACKAGEFILE=$1
1818

1919
cp -a package_template.json ${PACKAGEFILE}
2020

21-
for i in parts/platform*; do
21+
for i in parts/platform*.txt; do
2222
sed -ie "/\"platforms\" : \[/r $i" ${PACKAGEFILE};
2323
done;
2424

25-
for i in parts/tools*; do
25+
for i in parts/tools*.txt; do
2626
sed -ie "/\"tools\" : \[/r $i" ${PACKAGEFILE};
2727
done;
2828

‎board-manager/parts/platform-entry-sduino-0.3.3.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"name": "Sduino STM8 plain C core (non-C++)",
3+
"architecture": "stm8",
4+
"version": "0.3.3",
5+
"category": "Contributed",
6+
"boards": [
7+
{"name": "STM8S103F3 Breakout Board"},
8+
{"name": "STM8S105C6 Discovery Board"}
9+
],
10+
"toolsDependencies": [
11+
{
12+
"name": "STM8Tools",
13+
"version": "2017.11.13",
14+
"packager": "sduino"
15+
},
16+
{
17+
"name": "sdcc",
18+
"version": "build.10088",
19+
"packager": "sduino"
20+
}
21+
],
22+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-core-0.3.3.tar.bz2",
23+
"archiveFileName": "sduino-core-0.3.3.tar.bz2",
24+
"checksum": "SHA-256:67e0bc853f6498dcfb57aacc698e4fb8a07d75f515c1687c9232ef6e1e27431d",
25+
"size": "5642785"
26+
},

‎board-manager/parts/tools-entry-sdcc-10088.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
"archiveFileName": "sdcc-stm8-i586-mingw32msvc-20171020-10088.tar.bz2",
2121
"checksum": "SHA-256:2c9db6ff4d2f7b7b608f956adbc06e24ac8ec4dd4f41f26c79c48f9ddecb22a5",
2222
"size": "2973875"
23+
},{
24+
"host": "x86_64-apple-darwin",
25+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sdcc-stm8-universal-apple-macosx-20170720-9960.tar.bz2",
26+
"archiveFileName": "sdcc-stm8-universal-apple-macosx-20170720-9960.tar.bz2",
27+
"checksum": "SHA-256:135539c7685ed22f433a6085e4f4db5777655865fd05885a2bf773fec4eea405",
28+
"size": "4812042"
2329
}
2430
]
2531
},

‎board-manager/parts/tools-entry-sduino-tools-2017.11.13.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"name": "STM8Tools",
3+
"version": "2017.11.13",
4+
"systems": [
5+
{
6+
"host": "i686-pc-linux-gnu",
7+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-tools_linux32-2017.11.13.tar.bz2",
8+
"archiveFileName": "sduino-tools_linux32-2017.11.13.tar.bz2",
9+
"checksum": "SHA-256:957bb6b2c0776d6c781b58f1aeb6278d19ac62800534a6b8a979ae3949faafd4",
10+
"size": "45305"
11+
},{
12+
"host": "x86_64-pc-linux-gnu",
13+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-tools_linux64-2017.11.13.tar.bz2",
14+
"archiveFileName": "sduino-tools_linux64-2017.11.13.tar.bz2",
15+
"checksum": "SHA-256:b040deb0cfe6d4a863b8ea42070759bf82483c5df3246d0ef0270114b1acbada",
16+
"size": "49939"
17+
},{
18+
"host": "x86_64-apple-darwin",
19+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-tools_macosx-2017.11.13.tar.bz2",
20+
"archiveFileName": "sduino-tools_macosx-2017.11.13.tar.bz2",
21+
"checksum": "SHA-256:fce23560c90cb69abb19c315d161b60174be8c74044f53df5674ceb0b8a6d233",
22+
"size": "21390"
23+
},{
24+
"host": "i686-mingw32",
25+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-tools_mingw32-2017.11.13.tar.bz2",
26+
"archiveFileName": "sduino-tools_mingw32-2017.11.13.tar.bz2",
27+
"checksum": "SHA-256:a5735d8da309b7121f21c9d60652f3df240a348a7b564520bd2ca6d49bc4ceca",
28+
"size": "5540614"
29+
}
30+
]
31+
},

‎package_sduino_stm8_index.json‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,32 @@
99
"online": "http://www.stm32duino.com/viewforum.php?f=52"
1010
},
1111
"platforms" : [
12+
{
13+
"name": "Sduino STM8 plain C core (non-C++)",
14+
"architecture": "stm8",
15+
"version": "0.3.3",
16+
"category": "Contributed",
17+
"boards": [
18+
{"name": "STM8S103F3 Breakout Board"},
19+
{"name": "STM8S105C6 Discovery Board"}
20+
],
21+
"toolsDependencies": [
22+
{
23+
"name": "STM8Tools",
24+
"version": "2017.11.13",
25+
"packager": "sduino"
26+
},
27+
{
28+
"name": "sdcc",
29+
"version": "build.10088",
30+
"packager": "sduino"
31+
}
32+
],
33+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-core-0.3.3.tar.bz2",
34+
"archiveFileName": "sduino-core-0.3.3.tar.bz2",
35+
"checksum": "SHA-256:67e0bc853f6498dcfb57aacc698e4fb8a07d75f515c1687c9232ef6e1e27431d",
36+
"size": "5642785"
37+
},
1238
{
1339
"name": "Sduino STM8 plain C core (non-C++)",
1440
"architecture": "stm8",
@@ -89,6 +115,37 @@
89115
}
90116
],
91117
"tools" : [
118+
{
119+
"name": "STM8Tools",
120+
"version": "2017.11.13",
121+
"systems": [
122+
{
123+
"host": "i686-pc-linux-gnu",
124+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-tools_linux32-2017.11.13.tar.bz2",
125+
"archiveFileName": "sduino-tools_linux32-2017.11.13.tar.bz2",
126+
"checksum": "SHA-256:957bb6b2c0776d6c781b58f1aeb6278d19ac62800534a6b8a979ae3949faafd4",
127+
"size": "45305"
128+
},{
129+
"host": "x86_64-pc-linux-gnu",
130+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-tools_linux64-2017.11.13.tar.bz2",
131+
"archiveFileName": "sduino-tools_linux64-2017.11.13.tar.bz2",
132+
"checksum": "SHA-256:b040deb0cfe6d4a863b8ea42070759bf82483c5df3246d0ef0270114b1acbada",
133+
"size": "49939"
134+
},{
135+
"host": "x86_64-apple-darwin",
136+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-tools_macosx-2017.11.13.tar.bz2",
137+
"archiveFileName": "sduino-tools_macosx-2017.11.13.tar.bz2",
138+
"checksum": "SHA-256:fce23560c90cb69abb19c315d161b60174be8c74044f53df5674ceb0b8a6d233",
139+
"size": "21390"
140+
},{
141+
"host": "i686-mingw32",
142+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sduino-tools_mingw32-2017.11.13.tar.bz2",
143+
"archiveFileName": "sduino-tools_mingw32-2017.11.13.tar.bz2",
144+
"checksum": "SHA-256:a5735d8da309b7121f21c9d60652f3df240a348a7b564520bd2ca6d49bc4ceca",
145+
"size": "5540614"
146+
}
147+
]
148+
},
92149
{
93150
"name": "STM8Tools",
94151
"version": "2017.11.06",
@@ -161,6 +218,12 @@
161218
"archiveFileName": "sdcc-stm8-i586-mingw32msvc-20171020-10088.tar.bz2",
162219
"checksum": "SHA-256:2c9db6ff4d2f7b7b608f956adbc06e24ac8ec4dd4f41f26c79c48f9ddecb22a5",
163220
"size": "2973875"
221+
},{
222+
"host": "x86_64-apple-darwin",
223+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.3/sdcc-stm8-universal-apple-macosx-20170720-9960.tar.bz2",
224+
"archiveFileName": "sdcc-stm8-universal-apple-macosx-20170720-9960.tar.bz2",
225+
"checksum": "SHA-256:135539c7685ed22f433a6085e4f4db5777655865fd05885a2bf773fec4eea405",
226+
"size": "4812042"
164227
}
165228
]
166229
}

‎sduino/hardware/sduino/stm8/platform.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ recipe.preproc.macros="{compiler.wrapper.path}/{compiler.cpp.cmd}.sh" "{compiler
127127
tools.stm8flash.cmd=stm8flash
128128
tools.stm8flash.path={runtime.tools.STM8Tools.path}/linux
129129
tools.stm8flash.path.windows={runtime.tools.STM8Tools.path}/win
130-
tools.stm8flash.path.macos={runtime.tools.STM8Tools.path}/macosx
130+
tools.stm8flash.path.macosx={runtime.tools.STM8Tools.path}/macosx
131131
#tools.stm8flash.path.linux64={runtime.hardware.path}/tools/linux64
132132

133133
#tools.stm8flash.upload.params.verify=

‎sduino/hardware/sduino/tools/macosx/stm8flash‎

52 KB
Binary file not shown.

0 commit comments

Comments
 (0)