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
063988f1
"components/vscode:/vscode.git/clone" did not exist on "8e441b59c133b0c8501b2972b59db9d63e3893ba"
Commit
063988f1
authored
Jul 12, 2019
by
Gregor
Browse files
Change DTS to string since it is too big as number
parent
6a785467
Changes
3
Show whitespace changes
Inline
Side-by-side
app/include/user_version.h
View file @
063988f1
...
@@ -13,6 +13,8 @@
...
@@ -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"
...
...
app/modules/node.c
View file @
063988f1
...
@@ -131,7 +131,7 @@ static int node_info( lua_State* L )
...
@@ -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_push
number
(
L
,
BUILDINFO_RELEASE_DTS
);
lua_push
string
(
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
);
...
...
tools/update_buildinfo.sh
View file @
063988f1
...
@@ -8,9 +8,6 @@ COMMIT_ID="$(git rev-parse HEAD)"
...
@@ -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
...
@@ -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
...
@@ -65,7 +61,7 @@ cat >> $TEMPFILE << EndOfMessage2
"
\t
branch: " BUILDINFO_BRANCH "
\n
"
\\
"
\t
branch: " BUILDINFO_BRANCH "
\n
"
\\
"
\t
commit: " BUILDINFO_COMMIT_ID "
\n
"
\\
"
\t
commit: " BUILDINFO_COMMIT_ID "
\n
"
\\
"
\t
release: " BUILDINFO_RELEASE "
\n
"
\\
"
\t
release: " BUILDINFO_RELEASE "
\n
"
\\
"
\t
release DTS: " BUILDINFO_RELEASE_DTS
_STR
"
\n
"
\\
"
\t
release DTS: " BUILDINFO_RELEASE_DTS "
\n
"
\\
"
\t
SSL: " BUILDINFO_SSL_STR "
\n
"
\\
"
\t
SSL: " BUILDINFO_SSL_STR "
\n
"
\\
"
\t
Build type: " BUILDINFO_BUILD_TYPE "
\n
"
\\
"
\t
Build type: " BUILDINFO_BUILD_TYPE "
\n
"
\\
"
\t
LFS: " BUILDINFO_LFS "
\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