prepare release v0.3.1

tenbaht · Nov 6, 2017 · b3b70c3 · b3b70c3
1 parent e36adf3
commit b3b70c3
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.3.1 - 2017-11-06]
+### Fixed
+- don't use symlinks in archives for Windows anymore (#25)
+- improved path quoting in the wrapper scripts for windows (#24)
+- allow the IDE to stop a failed build process by propagating compiler error
+  codes
+- fix "command not found" error for cp and rm on Windows
+
+
+
 ## [0.3.0 - 2017-10-23]
 ### Added
 - integration into the Arduino IDE

diff --git a/board-manager/Makefile b/board-manager/Makefile
@@ -1,19 +1,22 @@
 # the required versions for the new build
-COREVERSION=0.3.0-pre.1
+COREVERSION=0.3.1
 SDCCVERSION=10088
-TOOLSVERSION=2017.10.21
+TOOLSVERSION=2017.11.06
 
 PACKAGEFILE=package_sduino_stm8_index.json
+GITHUB_BASE=https://github.com/tenbaht/sduino/releases/download/v$(COREVERSION)
 
 export
 
-.PHONY: core tools sdcc
+.PHONY: core tools sdcc clean upload
 
 
 $(PACKAGEFILE): core tools sdcc
 	@echo "Generating the package_index file."
 	./assemble.sh $@
-	sed 's#file:///home/mmayer/rsync/stm8/board-manager/release#http://knecht.box/sduino#' $(PACKAGEFILE) > package_knecht_index.json
+
+../$(PACKAGEFILE): $(PACKAGEFILE)
+	sed "s#file:///home/mmayer/rsync/stm8/board-manager/release#$(GITHUB_BASE)#" $^ > $@
 
 core:
 	VERSION=$(COREVERSION) make -f Makefile.core
@@ -27,3 +30,8 @@ sdcc:
 clean:
 	rm -rf *~ *.jsone *.bak *.orig *.rej
 
+
+# upload to my private test server, totally useless for anybody else.
+upload: $(PACKAGEFILE)
+	sed 's#file:///home/mmayer/rsync/stm8/board-manager#http://knecht.fritz.box/sduino#' $^ > package_knecht_index.json
+	rsync -rsh=ssh --delete release package_knecht_index.json knecht:/var/www/html/sduino
diff --git a/board-manager/Makefile.core b/board-manager/Makefile.core
@@ -34,4 +34,5 @@ $(PLATFORM_ENTRY): $(COREFILE)
 
 $(COREFILE):
 	echo "Generating the core archive file."
-	tar cjf $@ $(EXCLUDES) -C ../sduino/hardware/sduino/stm8 .
+	# dereference symlinks as they are not supported on Windows (#24)
+	tar cjf $@ --hard-dereference --dereference $(EXCLUDES) -C ../sduino/hardware/sduino/stm8 .
diff --git a/board-manager/README.md b/board-manager/README.md
@@ -12,10 +12,10 @@ Makefile.core
 Makefile.sdcc
 Makefile.tools
 
-`minimize-sdcc.sh`: Repack a [SDCC snapshot build]
-(http://sdcc.sourceforge.net/snap.php) into a minimal compiler package by
-removing all non-STM8 files. The total unpacked size shrinks from 250MB to
-6MB.
+`minimize-sdcc.sh`: Repack a [SDCC snapshot
+build](http://sdcc.sourceforge.net/snap.php) into a minimal compiler package
+by removing all non-STM8 files. The total unpacked size shrinks from 250MB
+to 6MB.
 
 `package_sduino_stm8_index.json`: Generated package index file.
 

diff --git a/board-manager/assemble.sh b/board-manager/assemble.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# This is a very basic template "engine" to generate a full platform index
+# file.
+
+
 if [ $# -ne 1 ]; then
 	echo "
 usage: $0 packagefile
@@ -23,8 +27,8 @@ for i in parts/tools*; do
 done;
 
 # The template contains an empty {} as a 'end of list' marker. We need to
-# remove the trailing comma after the last platform and tools entry and the
-# marker. This is asking for some sed magic:
+# remove this marker and the comma right before it. This can be done by some
+# sed magic:
 #
 # compact: sed -e '/},/{N;s/},\s*{}/}/}' package_sduino_stm8_index.json
 # (slightly) more readable:

diff --git a/board-manager/package_template.json b/board-manager/package_template.json
@@ -2,7 +2,7 @@
     "packages": [
         {
             "name": "sduino",
-            "maintainer": "Tenbaht",
+            "maintainer": "Michael Mayer",
             "websiteURL": "https://tenbaht.github.io/sduino/",
             "email": "[email protected]",
             "help": {

diff --git a/board-manager/parts/platform-entry-sduino-0.3.1.txt b/board-manager/parts/platform-entry-sduino-0.3.1.txt
@@ -0,0 +1,26 @@
+{
+	"name": "Sduino STM8 plain C core (non-C++)",
+	"architecture": "stm8",
+	"version": "0.3.1",
+	"category": "Contributed",
+	"boards": [
+		{"name": "STM8S103F3 Breakout Board"},
+		{"name": "STM8S105C6 Discovery Board"}
+	],
+	"toolsDependencies": [
+		{
+			"name": "STM8Tools",
+			"version": "2017.11.06",
+			"packager": "sduino"
+		},
+		{
+			"name": "sdcc",
+			"version": "build.10088",
+			"packager": "sduino"
+		}
+	],
+	"url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-core-0.3.1.tar.bz2",
+	"archiveFileName": "sduino-core-0.3.1.tar.bz2",
+	"checksum": "SHA-256:9d5c5d0c96c8e18efc16820f17d88ec59c48ba59a84ce46dc9ccd8fc45c59016",
+	"size": "4347217"
+},
diff --git a/board-manager/parts/tools-entry-sduino-tools-2017.11.06.txt b/board-manager/parts/tools-entry-sduino-tools-2017.11.06.txt
@@ -0,0 +1,25 @@
+                {
+                    "name": "STM8Tools",
+                    "version": "2017.11.06",
+                    "systems": [
+                        {
+                            "host": "i686-pc-linux-gnu",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_linux32-2017.11.06.tar.bz2",
+                            "archiveFileName": "sduino-tools_linux32-2017.11.06.tar.bz2",
+                            "checksum": "SHA-256:c0af0be23db870d66f5342e29deb803df006d361345526095cc03ec9998f5c88",
+                            "size": "45294"
+                        },{
+                            "host": "x86_64-pc-linux-gnu",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_linux64-2017.11.06.tar.bz2",
+                            "archiveFileName": "sduino-tools_linux64-2017.11.06.tar.bz2",
+                            "checksum": "SHA-256:c5235baa3f9cc37029fbd81858a9af08e37f76550d5c82e3faf920a4f094c561",
+                            "size": "49872"
+                        },{
+                            "host": "i686-mingw32",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_mingw32-2017.11.06.tar.bz2",
+                            "archiveFileName": "sduino-tools_mingw32-2017.11.06.tar.bz2",
+                            "checksum": "SHA-256:2209dcc01827e9e0de2c6ece40de1fc40d0d86d4537413fdd30329fb8decbd25",
+                            "size": "5541339"
+                        }
+                    ]
+                },
diff --git a/package_sduino_stm8_index.json b/package_sduino_stm8_index.json
@@ -2,13 +2,39 @@
     "packages": [
         {
             "name": "sduino",
-            "maintainer": "Tenbaht",
+            "maintainer": "Michael Mayer",
             "websiteURL": "https://tenbaht.github.io/sduino/",
             "email": "[email protected]",
             "help": {
                 "online": "http://www.stm32duino.com/viewforum.php?f=52"
             },
             "platforms" : [
+{
+	"name": "Sduino STM8 plain C core (non-C++)",
+	"architecture": "stm8",
+	"version": "0.3.1",
+	"category": "Contributed",
+	"boards": [
+		{"name": "STM8S103F3 Breakout Board"},
+		{"name": "STM8S105C6 Discovery Board"}
+	],
+	"toolsDependencies": [
+		{
+			"name": "STM8Tools",
+			"version": "2017.11.06",
+			"packager": "sduino"
+		},
+		{
+			"name": "sdcc",
+			"version": "build.10088",
+			"packager": "sduino"
+		}
+	],
+	"url": "https://github.com/tenbaht/sduino/releases/download/v0.3.1/sduino-core-0.3.1.tar.bz2",
+	"archiveFileName": "sduino-core-0.3.1.tar.bz2",
+	"checksum": "SHA-256:9d5c5d0c96c8e18efc16820f17d88ec59c48ba59a84ce46dc9ccd8fc45c59016",
+	"size": "4347217"
+},
 {
 	"name": "Sduino STM8 plain C core (non-C++)",
 	"architecture": "stm8",
@@ -37,6 +63,31 @@
 }
             ],
             "tools" : [
+                {
+                    "name": "STM8Tools",
+                    "version": "2017.11.06",
+                    "systems": [
+                        {
+                            "host": "i686-pc-linux-gnu",
+                            "url": "https://github.com/tenbaht/sduino/releases/download/v0.3.1/sduino-tools_linux32-2017.11.06.tar.bz2",
+                            "archiveFileName": "sduino-tools_linux32-2017.11.06.tar.bz2",
+                            "checksum": "SHA-256:c0af0be23db870d66f5342e29deb803df006d361345526095cc03ec9998f5c88",
+                            "size": "45294"
+                        },{
+                            "host": "x86_64-pc-linux-gnu",
+                            "url": "https://github.com/tenbaht/sduino/releases/download/v0.3.1/sduino-tools_linux64-2017.11.06.tar.bz2",
+                            "archiveFileName": "sduino-tools_linux64-2017.11.06.tar.bz2",
+                            "checksum": "SHA-256:c5235baa3f9cc37029fbd81858a9af08e37f76550d5c82e3faf920a4f094c561",
+                            "size": "49872"
+                        },{
+                            "host": "i686-mingw32",
+                            "url": "https://github.com/tenbaht/sduino/releases/download/v0.3.1/sduino-tools_mingw32-2017.11.06.tar.bz2",
+                            "archiveFileName": "sduino-tools_mingw32-2017.11.06.tar.bz2",
+                            "checksum": "SHA-256:2209dcc01827e9e0de2c6ece40de1fc40d0d86d4537413fdd30329fb8decbd25",
+                            "size": "5541339"
+                        }
+                    ]
+                },
                 {
                     "name": "STM8Tools",
                     "version": "2017.10.21",