added new release system
This commit is contained in:
@@ -170,6 +170,7 @@ add_definitions(
|
||||
-DICACHE_FLASH_ATTR=
|
||||
-DICACHE_RODATA_ATTR=
|
||||
-DFLAG_GZIP=2
|
||||
-DESP_LANG="en"
|
||||
|
||||
-DGIT_HASH_BACKEND="asdf"
|
||||
-DGIT_HASH_FRONTEND="asdf"
|
||||
|
||||
@@ -62,6 +62,10 @@ LIBS = c gcc hal phy pp net80211 wpa main lwip crypto
|
||||
#Add in esphttpd lib
|
||||
LIBS += esphttpd
|
||||
|
||||
ifndef ESP_LANG
|
||||
ESP_LANG = en
|
||||
endif
|
||||
|
||||
# compiler flags using during compilation of source files -ggdb
|
||||
CFLAGS = -Os -std=gnu99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
|
||||
-nostdlib -mlongcalls -mtext-section-literals -D__ets__ -DICACHE_FLASH \
|
||||
@@ -69,7 +73,7 @@ CFLAGS = -Os -std=gnu99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inli
|
||||
|
||||
CFLAGS += -DGIT_HASH_BACKEND='"$(shell git rev-parse --short HEAD)"'
|
||||
CFLAGS += -DGIT_HASH_FRONTEND='"$(shell cd front-end && git rev-parse --short HEAD)"'
|
||||
CFLAGS += -D__TIMEZONE__='"$(shell date +%Z)"'
|
||||
CFLAGS += -D__TIMEZONE__='"$(shell date +%Z)"' -DESP_LANG='"$(ESP_LANG)"'
|
||||
|
||||
ifdef GLOBAL_CFLAGS
|
||||
CFLAGS += $(GLOBAL_CFLAGS)
|
||||
@@ -211,19 +215,7 @@ all: checkdirs
|
||||
$(Q) make actual_all -j4 -B
|
||||
|
||||
release:
|
||||
ESP_LANG=cs make web
|
||||
make actual_all -j4
|
||||
cp firmware/0x00000.bin release/0x00000.bin
|
||||
cp firmware/0x40000.bin release/0x40000-CS.bin
|
||||
|
||||
ESP_LANG=en make web
|
||||
make actual_all -j4
|
||||
cp firmware/0x40000.bin release/0x40000-EN.bin
|
||||
|
||||
ESP_LANG=de make web
|
||||
make actual_all -j4
|
||||
cp firmware/0x40000.bin release/0x40000-DE.bin
|
||||
|
||||
$(Q) ./release.sh
|
||||
|
||||
actual_all: parser $(TARGET_OUT) $(FW_BASE)
|
||||
|
||||
|
||||
+1
-1
Submodule front-end updated: 69e5b77447...2e64f0e20b
@@ -0,0 +1,21 @@
|
||||
This is a release archive of ESPTerm,
|
||||
the VT100 terminal emulator for ESP8266.
|
||||
|
||||
--------------------------------------------
|
||||
Version: %VERS%
|
||||
Locale : %LANG%
|
||||
Built : %DATETIME%
|
||||
--------------------------------------------
|
||||
|
||||
Source repository:
|
||||
https://github.com/espterm/espterm-firmware
|
||||
|
||||
Report any bugs to our bug-tracker at
|
||||
https://github.com/espterm/espterm-firmware/issues
|
||||
or send them to out mailing list
|
||||
espterm-dev@googlegroups.com
|
||||
|
||||
On-line demo is available at
|
||||
https://espterm.github.io/term.html
|
||||
|
||||
[EOF]
|
||||
@@ -0,0 +1,26 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# The parameters ESPTOOL, ESPPORT and ESPBAUD can be customized
|
||||
# - export your preferred values in .bashrc
|
||||
|
||||
echo -e "\e[32;1mFlashing ESPTerm %VERS% (%LANG%)\e[0m"
|
||||
|
||||
if [ -z ${ESPTOOL} ]; then
|
||||
ESPTOOL='esptool'
|
||||
which ${ESPTOOL} &>/dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
ESPTOOL='esptool.py'
|
||||
which ${ESPTOOL} &>/dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
echo -e '\e[31;1mesptool not found!\e[0m'
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
[ -z ESPPORT ] && ESPPORT=/dev/ttyUSB0
|
||||
[ -z ESPBAUD ] && ESPBAUD=460800
|
||||
|
||||
set -x
|
||||
${ESPTOOL} --port ${ESPPORT} --baud ${ESPBAUD} \
|
||||
write_flash 0x00000 '%FILE0%' 0x40000 '%FILE4%'
|
||||
@@ -1,2 +1,3 @@
|
||||
*
|
||||
!.gitignore
|
||||
!flash-tpl.sh
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
echo -n -e "\e[1;36m Version number (for file names): \e[0m"
|
||||
read vers
|
||||
echo
|
||||
|
||||
if [ -z "$vers" ]
|
||||
then
|
||||
echo -e "\e[0;31m Aborted.\e[0m"
|
||||
echo
|
||||
exit
|
||||
fi
|
||||
|
||||
function buildlang() {
|
||||
lang=$1
|
||||
|
||||
echo -e "\n\e[33;1m------ Building \"${lang}\" package ------\e[0m\n"
|
||||
|
||||
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"
|
||||
file0=${vers}-0x00000-${lang}.bin
|
||||
file4=${vers}-0x40000-${lang}.bin
|
||||
[ -e ${destdir} ] && rm -r ${destdir}
|
||||
mkdir ${destdir}
|
||||
cp ../firmware/0x00000.bin ${destdir}/${file0}
|
||||
cp ../firmware/0x40000.bin ${destdir}/${file4}
|
||||
|
||||
flashsh=${destdir}/flash.sh
|
||||
cp ../rel-tpl/flash.sh ${flashsh}
|
||||
sed -i s/%FILE0%/${file0}/ ${flashsh}
|
||||
sed -i s/%FILE4%/${file4}/ ${flashsh}
|
||||
sed -i s/%VERS%/${vers}/ ${flashsh}
|
||||
sed -i s/%LANG%/${lang}/ ${flashsh}
|
||||
chmod +x ${flashsh}
|
||||
|
||||
readmefil=${destdir}/README.txt
|
||||
cp ../rel-tpl/README.txt ${readmefil}
|
||||
sed -i s/%VERS%/${vers}/ ${readmefil}
|
||||
sed -i s/%LANG%/${lang}/ ${readmefil}
|
||||
dt=$(LC_TIME=en_US.UTF-8 date '+%c %Z')
|
||||
sed -i "s#%DATETIME%#${dt}#" ${readmefil}
|
||||
unix2dos ${readmefil}
|
||||
|
||||
cd ${destdir}
|
||||
sha256sum ${file0} ${file4} README.txt flash.sh > checksums.txt
|
||||
cd ..
|
||||
|
||||
targetfile=espterm-${vers}-${lang}.zip
|
||||
[[ -e ${targetfile}.zip ]] && rm ${targetfile}.zip
|
||||
pwd
|
||||
zip -9 ${targetfile} ${destdir}/*
|
||||
#rm -r ${destdir}
|
||||
|
||||
rm 0x00000.bin 0x40000.bin
|
||||
cd ..
|
||||
}
|
||||
|
||||
buildlang cs
|
||||
buildlang en
|
||||
buildlang de
|
||||
+1
-1
@@ -114,7 +114,7 @@ void ICACHE_FLASH_ATTR user_init(void)
|
||||
banner_info();
|
||||
banner_info(TERMINAL_GITHUB_REPO_NOPROTO);
|
||||
banner_info();
|
||||
banner_info("Version "FW_VERSION", code name "FW_CODENAME_QUOTED);
|
||||
banner_info("Version "FW_VERSION" ("ESP_LANG"), code name "FW_CODENAME_QUOTED);
|
||||
banner_info(" back-end #"GIT_HASH_BACKEND" front-end #"GIT_HASH_FRONTEND);
|
||||
banner_info(" built "__DATE__" at "__TIME__" "__TIMEZONE__);
|
||||
banner_info();
|
||||
|
||||
Reference in New Issue
Block a user