feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/idf_exe_crash' into 'master'

Browse Source 
tools: fix idf.py.exe crash on Windows 7

Closes IDFGH-1471

See merge request espressif/esp-idf!5484
This commit is contained in:
Ivan Grokhotkov
2019-07-10 16:20:13 +08:00
parent fbc8e35577 e6e1792946
commit 847e00d17b
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/idf_tools.py
View File

@@ -96,6 +96,7 @@ PLATFORM_FROM_NAME = {
# Windows # Windows
PLATFORM_WIN32: PLATFORM_WIN32, PLATFORM_WIN32: PLATFORM_WIN32,
'Windows-i686': PLATFORM_WIN32, 'Windows-i686': PLATFORM_WIN32,
'Windows-x86': PLATFORM_WIN32,
PLATFORM_WIN64: PLATFORM_WIN64, PLATFORM_WIN64: PLATFORM_WIN64,
'Windows-x86_64': PLATFORM_WIN64, 'Windows-x86_64': PLATFORM_WIN64,
'Windows-AMD64': PLATFORM_WIN64, 'Windows-AMD64': PLATFORM_WIN64,

14
tools/tools.json
View File

@@ -334,17 +334,17 @@
"version_regex": "([0-9.]+)", "version_regex": "([0-9.]+)",
"versions": [ "versions": [
{ {
"name": "1.0", "name": "1.0.1",
"status": "recommended", "status": "recommended",
"win32": { "win32": {
"sha256": "83a83ac7a246cbae93884db7c5f2ef9a7607d602340b1cf1e64ec2a925071748", "sha256": "53eb6aaaf034cc7ed1a97d5c577afa0f99815b7793905e9408e74012d357d04a",
"size": 11289, "size": 11297,
"url": "https://dl.espressif.com/dl/idf-exe-v1.0.zip" "url": "https://dl.espressif.com/dl/idf-exe-v1.0.1.zip"
}, },
"win64": { "win64": {
"sha256": "83a83ac7a246cbae93884db7c5f2ef9a7607d602340b1cf1e64ec2a925071748", "sha256": "53eb6aaaf034cc7ed1a97d5c577afa0f99815b7793905e9408e74012d357d04a",
"size": 11289, "size": 11297,
"url": "https://dl.espressif.com/dl/idf-exe-v1.0.zip" "url": "https://dl.espressif.com/dl/idf-exe-v1.0.1.zip"
} }
} }
] ]

3
tools/windows/idf_exe/CMakeLists.txt
View File

@@ -1,10 +1,11 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
project(idfexe) project(idfexe)
set(VERSION 1.0) set(VERSION 1.0.1)
set(ARCHIVE_NAME idf-exe-v${VERSION}.zip) set(ARCHIVE_NAME idf-exe-v${VERSION}.zip)
add_executable(idf idf_main.c) add_executable(idf idf_main.c)
target_compile_definitions(idf PRIVATE -DVERSION=\"${VERSION}\")
set_target_properties(idf PROPERTIES C_STANDARD 99) set_target_properties(idf PROPERTIES C_STANDARD 99)
target_link_libraries(idf "-lshlwapi") target_link_libraries(idf "-lshlwapi")

4
tools/windows/idf_exe/idf_main.c
View File

@@ -18,7 +18,6 @@
#include <stdarg.h> #include <stdarg.h>
#define LINESIZE 1024 #define LINESIZE 1024
#define VERSION "1.0"
static void fail(LPCSTR message, ...) __attribute__((noreturn)); static void fail(LPCSTR message, ...) __attribute__((noreturn));
@@ -48,7 +47,8 @@ int main(int argc, LPTSTR argv[])
(StrCmp(argv[1], TEXT("--version")) == 0 || (StrCmp(argv[1], TEXT("--version")) == 0 ||
StrCmp(argv[1], TEXT("-v")) == 0)) { StrCmp(argv[1], TEXT("-v")) == 0)) {
LPCSTR msg = VERSION "\n"; LPCSTR msg = VERSION "\n";
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msg, lstrlen(msg), NULL, NULL); DWORD written;
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msg, lstrlen(msg), &written, NULL);
return 0; return 0;
} }

14
tools/windows/tool_setup/tools_fallback.json
View File

@@ -333,17 +333,17 @@
"version_regex": "([0-9.]+)", "version_regex": "([0-9.]+)",
"versions": [ "versions": [
{ {
"name": "1.0", "name": "1.0.1",
"status": "recommended", "status": "recommended",
"win32": { "win32": {
"sha256": "83a83ac7a246cbae93884db7c5f2ef9a7607d602340b1cf1e64ec2a925071748", "sha256": "53eb6aaaf034cc7ed1a97d5c577afa0f99815b7793905e9408e74012d357d04a",
"size": 11289, "size": 11297,
"url": "https://dl.espressif.com/dl/idf-exe-v1.0.zip" "url": "https://dl.espressif.com/dl/idf-exe-v1.0.1.zip"
}, },
"win64": { "win64": {
"sha256": "83a83ac7a246cbae93884db7c5f2ef9a7607d602340b1cf1e64ec2a925071748", "sha256": "53eb6aaaf034cc7ed1a97d5c577afa0f99815b7793905e9408e74012d357d04a",
"size": 11289, "size": 11297,
"url": "https://dl.espressif.com/dl/idf-exe-v1.0.zip" "url": "https://dl.espressif.com/dl/idf-exe-v1.0.1.zip"
} }
} }
] ]