Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
4b279939
Commit
4b279939
authored
Jul 04, 2019
by
Gregor
Browse files
Add release info
parent
21c35a1a
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/modules/node.c
View file @
4b279939
...
...
@@ -130,11 +130,14 @@ static int node_info( lua_State* L )
lua_pushinteger
(
L
,
flash_rom_get_speed
());
lua_pushstring
(
L
,
BUILDINFO_BRANCH
);
lua_pushstring
(
L
,
BUILDINFO_COMMIT_ID
);
lua_pushstring
(
L
,
BUILDINFO_RELEASE
);
lua_pushnumber
(
L
,
BUILDINFO_RELEASE_DTS
);
lua_pushboolean
(
L
,
BUILDINFO_SSL
);
lua_pushstring
(
L
,
BUILDINFO_LFS
);
lua_pushstring
(
L
,
BUILDINFO_MODULES
);
lua_pushstring
(
L
,
BUILDINFO_BUILD_TYPE
);
return
14
;
return
16
;
}
// Lua: chipid()
...
...
tools/update_buildinfo.sh
View file @
4b279939
...
...
@@ -4,6 +4,7 @@ BUILD_DATE="$(date "+%Y-%m-%d %H:%M")"
COMMIT_ID
=
"
$(
git rev-parse HEAD
)
"
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_DTS
=
0
$(
git show
-s
--format
=
%cd
--date
=
format:
"%Y%m%d%H%M"
HEAD
)
# figure out whether SSL is enabled in user_config.h
if
grep
-Eq
"^#define CLIENT_SSL_ENABLE"
../app/include/user_config.h
;
then
...
...
@@ -39,6 +40,7 @@ EndOfMessage
echo
"#define BUILDINFO_BRANCH
\"
"
$BRANCH
"
\"
"
>>
$TEMPFILE
echo
"#define BUILDINFO_COMMIT_ID
\"
"
$COMMIT_ID
"
\"
"
>>
$TEMPFILE
echo
"#define BUILDINFO_RELEASE
\"
"
$RELEASE
"
\"
"
>>
$TEMPFILE
echo
"#define BUILDINFO_RELEASE_DTS "
$RELEASE_DTS
""
>>
$TEMPFILE
echo
"#define BUILDINFO_SSL "
$SSL
>>
$TEMPFILE
echo
"#define BUILDINFO_SSL_STR
\"
"
$SSL
"
\"
"
>>
$TEMPFILE
echo
"#define BUILDINFO_BUILD_TYPE
\"
"
$BUILD_TYPE
"
\"
"
>>
$TEMPFILE
...
...
@@ -50,6 +52,8 @@ cat >> $TEMPFILE << EndOfMessage2
#define NODE_VERSION_LONG
\\
"
\t
branch: '" BUILDINFO_BRANCH "'
\n
"
\\
"
\t
commit: '" BUILDINFO_COMMIT_ID "'
\n
"
\\
"
\t
release: '" BUILDINFO_RELEASE "'
\n
"
\\
"
\t
release DTS: '" BUILDINFO_RELEASE_DTS "'
\n
"
\\
"
\t
SSL: '" BUILDINFO_SSL_STR "'
\n
"
\\
"
\t
Build type: '" BUILDINFO_BUILD_TYPE "'
\n
"
\\
"
\t
LFS: '" BUILDINFO_LFS "'
\n
"
\\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment