Skip to content

Commit 941c458

Browse files
authored
Merge pull request #207 from github0null/dev
v3.10.11 revision
2 parents a9fad29 + 1e41e3e commit 941c458

6 files changed

Lines changed: 51 additions & 22 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ All notable version changes will be recorded in this file.
66

77
***
88

9+
### [v3.10.11] revision
10+
11+
**Fix**:
12+
- `Terminal Environment Variables`: Environment variable values are incorrectly linked together !
13+
14+
***
15+
916
### [v3.10.10] revision
1017

1118
**New**:

README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,24 @@ Supported Platforms:
8787
- [Github](https://github.com/github0null/eide/issues)
8888

8989
- [Forum https://discuss.em-ide.com](https://discuss.em-ide.com/)
90+
91+
***
92+
93+
## How to build ?
94+
95+
You can build this project by your self.
96+
97+
1. Install `NodeJS 16`
98+
99+
2. Clone this repo, Open folder by vscode and then run command:
100+
101+
```shell
102+
npm install
103+
```
104+
105+
3. Press `ctrl+shift+b` to show vscode task
106+
107+
- Use `npm: webpack` to build this extension, and then you can press F5 to debug it.
108+
109+
- Use `build vsix` to build as a vsix package.
110+

README_ZH-CN.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,24 @@
6363
- [Github Issue](https://github.com/github0null/eide/issues)
6464

6565
- [论坛: https://discuss.em-ide.com](https://discuss.em-ide.com/)
66+
67+
***
68+
69+
## 如何构建 ?
70+
71+
你可以自行构建该扩展
72+
73+
1. 安装 `NodeJS 16`
74+
75+
2. 克隆该仓库,用 VSCode 打开该项目,并执行如下命令
76+
77+
```shell
78+
npm install
79+
```
80+
81+
3. 按下快捷键 `ctrl+shift+b` 打开构建命令
82+
83+
- 使用 `npm: webpack` 可构建带有调试信息的扩展,稍后你可以按 F5 进行调试
84+
85+
- 使用 `build vsix` 构建并打包成 VSIX
86+

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"homepage": "https://em-ide.com",
3636
"license": "MIT",
3737
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
38-
"version": "3.10.10",
38+
"version": "3.10.11",
3939
"preview": false,
4040
"engines": {
4141
"vscode": "^1.67.0"

src/EIDETypeDefine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ export class ProjectConfiguration<T extends BuilderConfigData>
13471347
this.__watcherReloadDelayTimer = setTimeout((_this: ProjectConfiguration<any>) => {
13481348
_this.__watcherReloadDelayTimer = undefined;
13491349
_this.Watch();
1350-
}, 1600, this);
1350+
}, 3000, this);
13511351
}
13521352
}
13531353
}

src/extension.ts

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,6 @@ async function tryInstallBinaries(binFolder: File, binVersion: string): Promise<
746746

747747
let isEnvSetuped: boolean = false;
748748

749-
let isExport2ExtensionCtx = false;
750-
751749
function exportEnvToSysPath(context?: vscode.ExtensionContext) {
752750

753751
const settingManager = SettingManager.GetInstance();
@@ -875,24 +873,6 @@ function exportEnvToSysPath(context?: vscode.ExtensionContext) {
875873
// 你可通过使用喜欢的 shell 将 DOTNET_CLI_TELEMETRY_OPTOUT 环境变量设置为 "1" 或 "true" 来选择退出遥测。
876874
// 阅读有关 .NET CLI 工具遥测的更多信息: https://aka.ms/dotnet-cli-telemetry
877875
process.env['DOTNET_CLI_TELEMETRY_OPTOUT'] = '1'; // disable telemetry
878-
879-
//
880-
// export to vscode extension envs
881-
//
882-
if (context && !isExport2ExtensionCtx) {
883-
884-
isExport2ExtensionCtx = true;
885-
886-
context.environmentVariableCollection.persistent = false;
887-
888-
context.environmentVariableCollection.prepend('DOTNET_CLI_TELEMETRY_OPTOUT', '1');
889-
890-
for (const env of pathList) {
891-
if (File.IsDir(env.path)) {
892-
context.environmentVariableCollection.append(env.key, env.path);
893-
}
894-
}
895-
}
896876
}
897877

898878
async function checkAndInstallRuntime() {

0 commit comments

Comments
 (0)