propagate the sdcc exit code through the wrapper scripts

tenbaht · tenbaht · commit cb243e054540 · 2017-10-23T18:59:35.000+02:00
diff --git a/board-manager/parts/platform-entry-sduino-0.3.0.txt b/board-manager/parts/platform-entry-sduino-0.3.0.txt
@@ -0,0 +1,26 @@
+{
+	"name": "Sduino STM8 plain C core (non-C++)",
+	"architecture": "stm8",
+	"version": "0.3.0",
+	"category": "Contributed",
+	"boards": [
+		{"name": "STM8S103F3 Breakout Board"},
+		{"name": "STM8S105C6 Discovery Board"}
+	],
+	"toolsDependencies": [
+		{
+			"name": "STM8Tools",
+			"version": "2017.10.21",
+			"packager": "sduino"
+		},
+		{
+			"name": "sdcc",
+			"version": "build.10088",
+			"packager": "sduino"
+		}
+	],
+	"url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-core-0.3.0.tar.bz2",
+	"archiveFileName": "sduino-core-0.3.0.tar.bz2",
+	"checksum": "SHA-256:5e3b2b950954e1004ef78084063374c59b37f682ba43f1789bc40d66d88e9994",
+	"size": "4261038"
+},
diff --git a/board-manager/parts/tools-entry-sdcc-10088.txt b/board-manager/parts/tools-entry-sdcc-10088.txt
@@ -0,0 +1,25 @@
+                {
+                    "name": "sdcc",
+                    "version": "build.10088",
+                    "systems": [
+                        {
+                            "host": "x86_64-pc-linux-gnu",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sdcc-stm8-amd64-unknown-linux2.5-20171020-10088.tar.bz2",
+                            "archiveFileName": "sdcc-stm8-amd64-unknown-linux2.5-20171020-10088.tar.bz2",
+                            "checksum": "SHA-256:dce37df6f57f6264e6b705cf7ce394d9b4407dba53c4071e77bfa34f746599a6",
+                            "size": "2486676"
+                        },{
+                            "host": "i686-pc-linux-gnu",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sdcc-stm8-i386-unknown-linux2.5-20171020-10088.tar.bz2",
+                            "archiveFileName": "sdcc-stm8-i386-unknown-linux2.5-20171020-10088.tar.bz2",
+                            "checksum": "SHA-256:5237465f22f62beb69c62a14adf1e1140fe12fc29060329c61516c11fe4bacf2",
+                            "size": "2606938"
+                        },{
+                            "host": "i686-mingw32",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sdcc-stm8-i586-mingw32msvc-20171020-10088.tar.bz2",
+                            "archiveFileName": "sdcc-stm8-i586-mingw32msvc-20171020-10088.tar.bz2",
+                            "checksum": "SHA-256:2c9db6ff4d2f7b7b608f956adbc06e24ac8ec4dd4f41f26c79c48f9ddecb22a5",
+                            "size": "2973875"
+                        }
+                    ]
+                },
diff --git a/board-manager/parts/tools-entry-sduino-tools-2017.10.21.txt b/board-manager/parts/tools-entry-sduino-tools-2017.10.21.txt
@@ -0,0 +1,25 @@
+                {
+                    "name": "STM8Tools",
+                    "version": "2017.10.21",
+                    "systems": [
+                        {
+                            "host": "i686-pc-linux-gnu",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_linux32-2017.10.21.tar.bz2",
+                            "archiveFileName": "sduino-tools_linux32-2017.10.21.tar.bz2",
+                            "checksum": "SHA-256:5f10d3de3e044e03160e63252ed818754c177afe5e9b5ce73a656f779193cffe",
+                            "size": "44516"
+                        },{
+                            "host": "x86_64-pc-linux-gnu",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_linux64-2017.10.21.tar.bz2",
+                            "archiveFileName": "sduino-tools_linux64-2017.10.21.tar.bz2",
+                            "checksum": "SHA-256:0943f76ad2a7eef325e1ab858212c2413123521768ea9a06f946a2b238e0a100",
+                            "size": "49065"
+                        },{
+                            "host": "i686-mingw32",
+                            "url": "file:///home/mmayer/rsync/stm8/board-manager/release/sduino-tools_mingw32-2017.10.21.tar.bz2",
+                            "archiveFileName": "sduino-tools_mingw32-2017.10.21.tar.bz2",
+                            "checksum": "SHA-256:dfdc7364a0d6749d3d1693ce5b5311ace4d80425225c98a90c5c527e375d1ecd",
+                            "size": "5541472"
+                        }
+                    ]
+                },
diff --git a/sduino/hardware/sduino/tools/wrapper/sdar.sh b/sduino/hardware/sduino/tools/wrapper/sdar.sh
@@ -32,4 +32,8 @@ shift 4
 
 >&2 echo "${GREEN}Mark $MARK:${OFF}" "$SDAR" "$@" "$LIB" "$OBJ"
 "$SDAR" "$@" "$LIB" "$OBJ"
+ERR=$?
 cp -a "$LIB" "${LIB%.a}.lib"
+
+# propagate the sdar exit code
+exit $ERR
diff --git a/sduino/hardware/sduino/tools/wrapper/sdcc-link.sh b/sduino/hardware/sduino/tools/wrapper/sdcc-link.sh
@@ -43,3 +43,6 @@ while [ $# -gt 0 ]; do
 done
 echo "$SDCC" "${OBJS[@]}"
 "$SDCC" "${OBJS[@]}"
+
+# propagate the sdcc exit code
+exit $?
diff --git a/sduino/hardware/sduino/tools/wrapper/sdcc.sh b/sduino/hardware/sduino/tools/wrapper/sdcc.sh
@@ -50,15 +50,20 @@ case "$SRC" in
 		CSRC="${SRC%pp}"
 		cp -av "$SRC" "$CSRC"
 		"$SDCC" "$@" "$CSRC" -o "$OBJ"
+		ERR=$?
 		rm -f "$CSRC"
 		;;
 	*.c)
 		# compile a .c file
 		"$SDCC" "$@" "$SRC" -o "$OBJ"
+		ERR=$?
 		;;
 esac
 
 # copy the generated .rel files as an .o file to avoid recompiling the next time
 if [ -e "${REL}" ]; then
 	cp -a "${REL}" "${OBJ}"
 fi
+
+# propagate the sdcc exit code
+exit $ERR
