Skip to content

Commit b3b70c3

Browse files
tenbahttenbaht
committed
prepare release v0.3.1
1 parent e36adf3 commit b3b70c3

File tree

9 files changed

+138
-13
lines changed

9 files changed

+138
-13
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased]
88

9+
## [0.3.1 - 2017-11-06]
10+
### Fixed
11+
- don't use symlinks in archives for Windows anymore (#25)
12+
- improved path quoting in the wrapper scripts for windows (#24)
13+
- allow the IDE to stop a failed build process by propagating compiler error
14+
codes
15+
- fix "command not found" error for cp and rm on Windows
16+
17+
18+
919
## [0.3.0 - 2017-10-23]
1020
### Added
1121
- integration into the Arduino IDE

‎board-manager/Makefile‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
# the required versions for the new build
2-
COREVERSION=0.3.0-pre.1
2+
COREVERSION=0.3.1
33
SDCCVERSION=10088
4-
TOOLSVERSION=2017.10.21
4+
TOOLSVERSION=2017.11.06
55

66
PACKAGEFILE=package_sduino_stm8_index.json
7+
GITHUB_BASE=https://github.com/tenbaht/sduino/releases/download/v$(COREVERSION)
78

89
export
910

10-
.PHONY: core tools sdcc
11+
.PHONY: core tools sdcc clean upload
1112

1213

1314
$(PACKAGEFILE): core tools sdcc
1415
@echo "Generating the package_index file."
1516
./assemble.sh $@
16-
sed 's#file:///home/mmayer/rsync/stm8/board-manager/release#http://knecht.box/sduino#' $(PACKAGEFILE) > package_knecht_index.json
17+
18+
../$(PACKAGEFILE): $(PACKAGEFILE)
19+
sed "s#file:///home/mmayer/rsync/stm8/board-manager/release#$(GITHUB_BASE)#" $^ > $@
1720

1821
core:
1922
VERSION=$(COREVERSION) make -f Makefile.core
@@ -27,3 +30,8 @@ sdcc:
2730
clean:
2831
rm -rf *~ *.jsone *.bak *.orig *.rej
2932

33+
34+
# upload to my private test server, totally useless for anybody else.
35+
upload: $(PACKAGEFILE)
36+
sed 's#file:///home/mmayer/rsync/stm8/board-manager#http://knecht.fritz.box/sduino#' $^ > package_knecht_index.json
37+
rsync -rsh=ssh --delete release package_knecht_index.json knecht:/var/www/html/sduino

‎board-manager/Makefile.core‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ $(PLATFORM_ENTRY): $(COREFILE)
3434

3535
$(COREFILE):
3636
echo "Generating the core archive file."
37-
tar cjf $@ $(EXCLUDES) -C ../sduino/hardware/sduino/stm8 .
37+
# dereference symlinks as they are not supported on Windows (#24)
38+
tar cjf $@ --hard-dereference --dereference $(EXCLUDES) -C ../sduino/hardware/sduino/stm8 .

‎board-manager/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Makefile.core
1212
Makefile.sdcc
1313
Makefile.tools
1414

15-
`minimize-sdcc.sh`: Repack a [SDCC snapshot build]
16-
(http://sdcc.sourceforge.net/snap.php) into a minimal compiler package by
17-
removing all non-STM8 files. The total unpacked size shrinks from 250MB to
18-
6MB.
15+
`minimize-sdcc.sh`: Repack a [SDCC snapshot
16+
build](http://sdcc.sourceforge.net/snap.php) into a minimal compiler package
17+
by removing all non-STM8 files. The total unpacked size shrinks from 250MB
18+
to 6MB.
1919

2020
`package_sduino_stm8_index.json`: Generated package index file.
2121

‎board-manager/assemble.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/bin/bash
22

3+
# This is a very basic template "engine" to generate a full platform index
4+
# file.
5+
6+
37
if [ $# -ne 1 ]; then
48
echo "
59
usage: $0 packagefile
@@ -23,8 +27,8 @@ for i in parts/tools*; do
2327
done;
2428

2529
# The template contains an empty {} as a 'end of list' marker. We need to
26-
# remove the trailing comma after the last platform and tools entry and the
27-
# marker. This is asking for some sed magic:
30+
# remove this marker and the comma right before it. This can be done by some
31+
# sed magic:
2832
#
2933
# compact: sed -e '/},/{N;s/},\s*{}/}/}' package_sduino_stm8_index.json
3034
# (slightly) more readable:

‎board-manager/package_template.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
{
44
"name": "sduino",
5-
"maintainer": "Tenbaht",
5+
"maintainer": "Michael Mayer",
66
"websiteURL": "https://tenbaht.github.io/sduino/",
77
"email": "michael-mayer@gmx.de",
88
"help": {

‎board-manager/parts/platform-entry-sduino-0.3.1.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.1",
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.06",
14+
"packager": "sduino"
15+
},
16+
{
17+
"name": "sdcc",
18+
"version": "build.10088",
19+
"packager": "sduino"
20+
}
21+
],
22+
"url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-core-0.3.1.tar.bz2",
23+
"archiveFileName": "sduino-core-0.3.1.tar.bz2",
24+
"checksum": "SHA-256:9d5c5d0c96c8e18efc16820f17d88ec59c48ba59a84ce46dc9ccd8fc45c59016",
25+
"size": "4347217"
26+
},

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "STM8Tools",
3+
"version": "2017.11.06",
4+
"systems": [
5+
{
6+
"host": "i686-pc-linux-gnu",
7+
"url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_linux32-2017.11.06.tar.bz2",
8+
"archiveFileName": "sduino-tools_linux32-2017.11.06.tar.bz2",
9+
"checksum": "SHA-256:c0af0be23db870d66f5342e29deb803df006d361345526095cc03ec9998f5c88",
10+
"size": "45294"
11+
},{
12+
"host": "x86_64-pc-linux-gnu",
13+
"url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_linux64-2017.11.06.tar.bz2",
14+
"archiveFileName": "sduino-tools_linux64-2017.11.06.tar.bz2",
15+
"checksum": "SHA-256:c5235baa3f9cc37029fbd81858a9af08e37f76550d5c82e3faf920a4f094c561",
16+
"size": "49872"
17+
},{
18+
"host": "i686-mingw32",
19+
"url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_mingw32-2017.11.06.tar.bz2",
20+
"archiveFileName": "sduino-tools_mingw32-2017.11.06.tar.bz2",
21+
"checksum": "SHA-256:2209dcc01827e9e0de2c6ece40de1fc40d0d86d4537413fdd30329fb8decbd25",
22+
"size": "5541339"
23+
}
24+
]
25+
},

‎package_sduino_stm8_index.json‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,39 @@
22
"packages": [
33
{
44
"name": "sduino",
5-
"maintainer": "Tenbaht",
5+
"maintainer": "Michael Mayer",
66
"websiteURL": "https://tenbaht.github.io/sduino/",
77
"email": "michael-mayer@gmx.de",
88
"help": {
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.1",
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.06",
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.1/sduino-core-0.3.1.tar.bz2",
34+
"archiveFileName": "sduino-core-0.3.1.tar.bz2",
35+
"checksum": "SHA-256:9d5c5d0c96c8e18efc16820f17d88ec59c48ba59a84ce46dc9ccd8fc45c59016",
36+
"size": "4347217"
37+
},
1238
{
1339
"name": "Sduino STM8 plain C core (non-C++)",
1440
"architecture": "stm8",
@@ -37,6 +63,31 @@
3763
}
3864
],
3965
"tools" : [
66+
{
67+
"name": "STM8Tools",
68+
"version": "2017.11.06",
69+
"systems": [
70+
{
71+
"host": "i686-pc-linux-gnu",
72+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.1/sduino-tools_linux32-2017.11.06.tar.bz2",
73+
"archiveFileName": "sduino-tools_linux32-2017.11.06.tar.bz2",
74+
"checksum": "SHA-256:c0af0be23db870d66f5342e29deb803df006d361345526095cc03ec9998f5c88",
75+
"size": "45294"
76+
},{
77+
"host": "x86_64-pc-linux-gnu",
78+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.1/sduino-tools_linux64-2017.11.06.tar.bz2",
79+
"archiveFileName": "sduino-tools_linux64-2017.11.06.tar.bz2",
80+
"checksum": "SHA-256:c5235baa3f9cc37029fbd81858a9af08e37f76550d5c82e3faf920a4f094c561",
81+
"size": "49872"
82+
},{
83+
"host": "i686-mingw32",
84+
"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.1/sduino-tools_mingw32-2017.11.06.tar.bz2",
85+
"archiveFileName": "sduino-tools_mingw32-2017.11.06.tar.bz2",
86+
"checksum": "SHA-256:2209dcc01827e9e0de2c6ece40de1fc40d0d86d4537413fdd30329fb8decbd25",
87+
"size": "5541339"
88+
}
89+
]
90+
},
4091
{
4192
"name": "STM8Tools",
4293
"version": "2017.10.21",

0 commit comments

Comments
 (0)