diff --git a/logo.ico b/logo.ico new file mode 100644 index 00000000..5ddea7d7 Binary files /dev/null and b/logo.ico differ diff --git a/tools/ConEmu/ConEmu.xml b/tools/ConEmu/ConEmu.xml index 39236dbc..8658374a 100644 --- a/tools/ConEmu/ConEmu.xml +++ b/tools/ConEmu/ConEmu.xml @@ -1,11 +1,11 @@ - + - + @@ -264,11 +264,11 @@ - - + + - - + + @@ -599,9 +599,18 @@ - - - + + + + + + + + + + + + @@ -610,7 +619,7 @@ - + @@ -619,7 +628,7 @@ - + @@ -628,7 +637,7 @@ - + @@ -638,7 +647,7 @@ - + @@ -647,7 +656,7 @@ - + @@ -656,7 +665,7 @@ - + @@ -665,7 +674,7 @@ - + @@ -674,7 +683,7 @@ - + @@ -683,7 +692,7 @@ - + @@ -692,7 +701,7 @@ - + @@ -701,7 +710,7 @@ - + @@ -710,7 +719,7 @@ - + @@ -719,7 +728,7 @@ - + @@ -728,6 +737,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/ConEmu/ConEmu/CmdInit.cmd b/tools/ConEmu/ConEmu/CmdInit.cmd index bad19023..6f1c25e1 100644 --- a/tools/ConEmu/ConEmu/CmdInit.cmd +++ b/tools/ConEmu/ConEmu/CmdInit.cmd @@ -39,74 +39,6 @@ if "%ConEmuIsAdmin%" == "ADMIN" ( rem Finally reset color and add notify ConEmu about prompt input start coords set ConEmuPrompt3=$E[m$S$E]9;12$E\ - -:: ============= RT-Thread ENV Path ================== -set ENV_ROOT=%~dp0..\..\.. -set PYTHONPATH=%ENV_ROOT%\tools\Python27 -set PYTHONHOME=%ENV_ROOT%\tools\Python27 -set RTT_EXEC_PATH=%ENV_ROOT%\tools\gnu_gcc\arm_gcc\mingw\bin -set RTT_CC=gcc -set PKGS_ROOT=%ENV_ROOT%\packages -set SCONS=%PYTHONPATH%\Scripts -set PATH=%ENV_ROOT%\tools\git-2.41.0-32-bit\cmd;%PATH% -set PATH=%ENV_ROOT%\tools\bin;%PATH% -set PATH=%RTT_EXEC_PATH%;%PATH% -set PATH=%PYTHONHOME%;%PATH% -set PATH=%PYTHONPATH%;%PATH% -set PATH=%SCONS%;%PATH% -set PATH=%ENV_ROOT%\tools\qemu\qemu64;%PATH% - -:: ====== RT-Thread ENV Change Code Page ================ - -chcp 65001 > nul -python %~dp0..\..\scripts\env.py -v -echo ^\ ^| / -echo - RT - Thread Operating System -echo / ^| ^\ -echo 2006 - 2022 Copyright by RT-Thread team - -Setlocal ENABLEDELAYEDEXPANSION -::启用命令扩展，参加setlocal /?命令 -set str1=%~dp0 -set str=%str1% -set env_root=%~dp0 - -:next -if not "%str%"=="" ( -set /a num+=1 -if "!str:~0,1!"==" " ( - echo. - echo ******************************************************************* - echo Env 工具所在路径如下： - echo %env_root:~0,-21% - echo 警告：以上路径不能包含中文或空格，请将 Env 移动到符合要求的路径中。 - echo ******************************************************************* - endlocal - goto break_str -) -set "str=%str:~1%" -goto next -) -endlocal - -set "str=%~dp0" ->"%tmp%\t.t" echo;WSH.Echo(/[\u4E00-\u9FFF]/.test(WSH.Arguments(0))) -for /f %%a in ('cscript -nologo -e:jscript "%tmp%\t.t" "%str%"') do if %%a neq 0 (goto not_support_chinese) else goto break_str - -:not_support_chinese -echo. -echo ******************************************************************* -echo Env 工具所在路径如下： -echo %env_root:~0,-29% -echo 警告：以上路径不能包含中文或空格，请将 Env 移动到符合要求的路径中。 -echo ******************************************************************* - -:break_str - -chcp 437 > nul - -:: ====================================================== - rem Show 'git status' extract in prompt? if /I "%~1" == "/git" goto git if /I "%~1" == "-git" goto git diff --git a/tools/bin/env-init.bat b/tools/bin/env-init.bat new file mode 100644 index 00000000..26d38617 --- /dev/null +++ b/tools/bin/env-init.bat @@ -0,0 +1,122 @@ +@echo off +:: Do not repeat run +if not "%ENV_ROOT%" == "" goto end + +:: not ConEmu +if "%ConEmuBaseDir%" == "" goto env + +:: Creat user CmdInit.cmd +if not exist "%USERPROFILE%\.conemu\CmdInit.cmd" ( + if not exist "%USERPROFILE%\.conemu" ( + mkdir "%USERPROFILE%\.conemu" + ) + ( + echo rem !!! Sample user specific settings that will persist in upgrade !!! + echo rem !!! Save as "%%USERPROFILE%%\.conemu\CmdInit.cmd" to activate !!! + echo. + echo rem echo Loading ConEmu user settings... + echo. + echo rem Loading RT-Thread Env + echo if exist "%%ConEmuBaseDir%%\..\..\..\env.bat" ( + echo if exist "%%ConEmuBaseDir%%\..\..\bin\env-init.bat" ( + echo call "%%ConEmuBaseDir%%\..\..\bin\env-init.bat" + echo ^) + echo ^) + ) > "%USERPROFILE%\.conemu\CmdInit.cmd" + echo Create user profile additions success: "%USERPROFILE%\.conemu\CmdInit.cmd" +) + +:env +:: ============= RT-Thread ENV Path ================== +set ENV_ROOT=%~dp0..\.. +set PYTHONPATH=%ENV_ROOT%\tools\Python27 +set PYTHONHOME=%ENV_ROOT%\tools\Python27 +set RTT_EXEC_PATH=%ENV_ROOT%\tools\gnu_gcc\arm_gcc\mingw\bin +set RTT_CC=gcc +set PKGS_ROOT=%ENV_ROOT%\packages +set SCONS=%PYTHONPATH%\Scripts +:: Add to %PATH% +call :AddPath "%ENV_ROOT%\tools\git-2.41.0-32-bit\cmd" +call :AddPath "%ENV_ROOT%\tools\bin" +call :AddPath "%RTT_EXEC_PATH%" +call :AddPath "%PYTHONHOME%" +call :AddPath "%PYTHONPATH%" +call :AddPath "%SCONS%" +call :AddPath "%ENV_ROOT%\tools\qemu\qemu64" + +:: ====== RT-Thread ENV Change Code Page ================ + +chcp 65001 > nul +python %~dp0..\scripts\env.py -v +echo ^\ ^| / +echo - RT - Thread Operating System +echo / ^| ^\ +echo 2006 - 2024 Copyright by RT-Thread team + + +Setlocal ENABLEDELAYEDEXPANSION +:: 启用命令扩展，参加setlocal /?命令 +set str1=%~dp0 +set str=%str1% +set env_root=%~dp0 + +:next +if not "%str%"=="" ( +set /a num+=1 +if "!str:~0,1!"==" " ( + echo. + echo ******************************************************************* + echo Env 工具所在路径如下： + echo %env_root:~0,-21% + echo 警告：以上路径不能包含中文或空格，请将 Env 移动到符合要求的路径中。 + echo ******************************************************************* + endlocal + goto break_str +) +set "str=%str:~1%" +goto next +) +endlocal + +set "str=%~dp0" +>"%tmp%\t.t" echo;WSH.Echo(/[\u4E00-\u9FFF]/.test(WSH.Arguments(0))) +for /f %%a in ('cscript -nologo -e:jscript "%tmp%\t.t" "%str%"') do if %%a neq 0 (goto not_support_chinese) else goto break_str + +:not_support_chinese +echo. +echo ******************************************************************* +echo Env 工具所在路径如下： +echo %env_root:~0,-29% +echo 警告：以上路径不能包含中文或空格，请将 Env 移动到符合要求的路径中。 +echo ******************************************************************* + +:break_str +set str= +chcp 437 > nul +goto end +:: ====================================================== + +:: 不重复添加路径到 %PATH% 中 +:AddPath +setlocal enabledelayedexpansion +set "new_path=%~1" + +:: 将相对路径转换为绝对路径 +for %%A in ("%new_path%") do set "new_path=%%~fA" + +:: 检查 %PATH% 是否已经包含了要添加的路径 +echo %PATH% | findstr /i /c:"%new_path%;" >nul +if errorlevel 1 ( + set "PATH=%new_path%;%PATH%" +) else ( + :: 如果已经包含则将路径移动到 %PATH% 的最前面 + set "PATH=!new_path!;!PATH:%new_path%;=!" +) + +endlocal & set "PATH=%PATH%" +goto:eof + +:end +if "%ConEmuBaseDir%" == "" ( + %ENV_ROOT%\tools\ConEmu\ConEmu\clink\clink.bat inject +)