MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change DTS to string since it is too big as number

This commit is contained in:
Gregor 2019-07-12 22:39:04 +02:00
parent 6a78546707
commit 063988f12a
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/include/user_version.h
View File

@ -13,6 +13,8 @@
#define NODE_VERSION_XSTR(x) NODE_VERSION_STR(x) #define NODE_VERSION_XSTR(x) NODE_VERSION_STR(x)
# define NODE_VERSION "NodeMCU " ESP_SDK_VERSION_STRING "." NODE_VERSION_XSTR(NODE_VERSION_INTERNAL) " " NODE_VERSION_LONG # define NODE_VERSION "NodeMCU " ESP_SDK_VERSION_STRING "." NODE_VERSION_XSTR(NODE_VERSION_INTERNAL) " " NODE_VERSION_LONG
// Leave the space after # in the line above. It busts replacement of NODE_VERSION in the docker build which is not needed anymore with this PR.
// Can be removed when the script is adapted
#ifndef BUILD_DATE #ifndef BUILD_DATE
#define BUILD_DATE "unspecified" #define BUILD_DATE "unspecified"

2
app/modules/node.c
View File

@ -131,7 +131,7 @@ static int node_info( lua_State* L )
lua_pushstring(L, BUILDINFO_BRANCH); lua_pushstring(L, BUILDINFO_BRANCH);
lua_pushstring(L, BUILDINFO_COMMIT_ID); lua_pushstring(L, BUILDINFO_COMMIT_ID);
lua_pushstring(L, BUILDINFO_RELEASE); lua_pushstring(L, BUILDINFO_RELEASE);
lua_pushnumber(L, BUILDINFO_RELEASE_DTS); lua_pushstring(L, BUILDINFO_RELEASE_DTS);
lua_pushboolean(L, BUILDINFO_SSL); lua_pushboolean(L, BUILDINFO_SSL);
lua_pushstring(L, BUILDINFO_LFS); lua_pushstring(L, BUILDINFO_LFS);
lua_pushstring(L, BUILDINFO_MODULES); lua_pushstring(L, BUILDINFO_MODULES);

8
tools/update_buildinfo.sh
View File

@ -8,9 +8,6 @@ COMMIT_ID="$(git rev-parse HEAD)"
BRANCH="$(git rev-parse --abbrev-ref HEAD | sed -r 's/[\/\\]+/_/g')" BRANCH="$(git rev-parse --abbrev-ref HEAD | sed -r 's/[\/\\]+/_/g')"
RELEASE="$(git describe --tags --long | sed -r 's/(.*)-(.*)-.*/\1 +\2/g' | sed 's/ +0$//')" RELEASE="$(git describe --tags --long | sed -r 's/(.*)-(.*)-.*/\1 +\2/g' | sed 's/ +0$//')"
RELEASE_DTS=$(git show -s --format=%cd --date=format:"%Y%m%d%H%M" HEAD) RELEASE_DTS=$(git show -s --format=%cd --date=format:"%Y%m%d%H%M" HEAD)
if [ -z "$RELEASE_DTS"]; then
RELEASE_DTS=0
fi
# figure out whether SSL is enabled in user_config.h # figure out whether SSL is enabled in user_config.h
if grep -Eq "^#define CLIENT_SSL_ENABLE" $USER_CONFIG_H; then if grep -Eq "^#define CLIENT_SSL_ENABLE" $USER_CONFIG_H; then
@ -51,8 +48,7 @@ echo "#define USER_PROLOG \""$USER_PROLOG"\"" >> $TEMPFILE
echo "#define BUILDINFO_BRANCH \""$BRANCH"\"" >> $TEMPFILE echo "#define BUILDINFO_BRANCH \""$BRANCH"\"" >> $TEMPFILE
echo "#define BUILDINFO_COMMIT_ID \""$COMMIT_ID"\"" >> $TEMPFILE echo "#define BUILDINFO_COMMIT_ID \""$COMMIT_ID"\"" >> $TEMPFILE
echo "#define BUILDINFO_RELEASE \""$RELEASE"\"" >> $TEMPFILE echo "#define BUILDINFO_RELEASE \""$RELEASE"\"" >> $TEMPFILE
echo "#define BUILDINFO_RELEASE_DTS "$RELEASE_DTS >> $TEMPFILE echo "#define BUILDINFO_RELEASE_DTS \""$RELEASE_DTS"\"" >> $TEMPFILE
echo "#define BUILDINFO_RELEASE_DTS_STR \""$RELEASE_DTS"\"" >> $TEMPFILE
echo "#define BUILDINFO_SSL "$SSL >> $TEMPFILE echo "#define BUILDINFO_SSL "$SSL >> $TEMPFILE
echo "#define BUILDINFO_SSL_STR \""$SSL"\"" >> $TEMPFILE echo "#define BUILDINFO_SSL_STR \""$SSL"\"" >> $TEMPFILE
echo "#define BUILDINFO_BUILD_TYPE \""$BUILD_TYPE"\"" >> $TEMPFILE echo "#define BUILDINFO_BUILD_TYPE \""$BUILD_TYPE"\"" >> $TEMPFILE
@ -65,7 +61,7 @@ cat >> $TEMPFILE << EndOfMessage2
"\tbranch: " BUILDINFO_BRANCH "\n" \\ "\tbranch: " BUILDINFO_BRANCH "\n" \\
"\tcommit: " BUILDINFO_COMMIT_ID "\n" \\ "\tcommit: " BUILDINFO_COMMIT_ID "\n" \\
"\trelease: " BUILDINFO_RELEASE "\n" \\ "\trelease: " BUILDINFO_RELEASE "\n" \\
"\trelease DTS: " BUILDINFO_RELEASE_DTS_STR "\n" \\ "\trelease DTS: " BUILDINFO_RELEASE_DTS "\n" \\
"\tSSL: " BUILDINFO_SSL_STR "\n" \\ "\tSSL: " BUILDINFO_SSL_STR "\n" \\
"\tBuild type: " BUILDINFO_BUILD_TYPE "\n" \\ "\tBuild type: " BUILDINFO_BUILD_TYPE "\n" \\
"\tLFS: " BUILDINFO_LFS "\n" \\ "\tLFS: " BUILDINFO_LFS "\n" \\