improved build script, automatic version fetch from source

get_version.c

@@ -0,0 +1,14 @@
+//
+// Created by MightyPork on 2017/10/03.
+//
+// helper for building release packages
+//
+// Run with `tcc -run`
+//
+
+#include "user/version.h"
+#include <stdio.h>
+
+void main() {
+	printf(FW_VERSION);
+}

ship.sh

@@ -1,16 +1,19 @@
 #!/usr/bin/env bash
 
-echo -n -e "\e[1;36m Version number (for file names): \e[0m"
+if [ -z "$1" ]; then
-read vers
+    vers=$(tcc -run get_version.c)
-echo
+else
-
+    vers=$1
-if [ -z "$vers" ]
-    then
-        echo -e "\e[0;31m Aborted.\e[0m"
-        echo
-        exit
 fi
 
+git pull
+
+echo -n -e "\e[1;36mBuilding packages for version $vers\e[0m"
+
+cd front-end
+git pull
+cd ..
+
 function buildlang() {
     lang=$1
 
@@ -20,8 +23,6 @@ function buildlang() {
     ESP_LANG=${lang} make web
     ESP_LANG=${lang} make actual_all -B -j4
 
-    cp firmware/0x00000.bin release/0x00000.bin
-    cp firmware/0x40000.bin release/0x40000.bin
     cd release
 
     destdir="$vers-$lang"
@@ -56,12 +57,13 @@ function buildlang() {
     [[ -e ${targetfile}.zip ]] && rm ${targetfile}.zip
     pwd
     zip -9 ${targetfile} ${destdir}/*
-    #rm -r ${destdir}
-
-    rm 0x00000.bin 0x40000.bin
     cd ..
 }
 
-buildlang cs
+if [ -z "$ESP_LANG" ]; then
-buildlang en
+    buildlang cs
-buildlang de
+    buildlang en
+    buildlang de
+else
+    buildlang ${ESP_LANG}
+fi

user/version.h

@@ -5,12 +5,13 @@
 #ifndef ESP_VT100_FIRMWARE_VERSION_H
 #define ESP_VT100_FIRMWARE_VERSION_H
 
-#include "helpers.h"
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
 
 #define FW_V_MAJOR 2
 #define FW_V_MINOR 1
 #define FW_V_PATCH 0
-#define FW_V_SUFFIX "-beta2"
+#define FW_V_SUFFIX "-beta3"
 //#define FW_V_SUFFIX ""
 #define FW_CODENAME "Anthill" // 2.1.0
 #define FW_CODENAME_QUOTED "\""FW_CODENAME"\""