Merge pull request #207 from github0null/dev

v3.10.11 revision
github0null · Jan 30, 2023 · 941c458 · 941c458
2 parents a9fad29 + 1e41e3e
commit 941c458
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.10.11] revision
+
+**Fix**:
+  - `Terminal Environment Variables`: Environment variable values are incorrectly linked together !
+
+***
+
 ### [v3.10.10] revision
 
 **New**:

diff --git a/README.md b/README.md
@@ -87,3 +87,24 @@ Supported Platforms:
 - [Github](https://github.com/github0null/eide/issues)
 
 - [Forum https://discuss.em-ide.com](https://discuss.em-ide.com/)
+
+***
+
+## How to build ?
+
+You can build this project by your self.
+
+1. Install `NodeJS 16`
+
+2. Clone this repo, Open folder by vscode and then run command: 
+
+   ```shell
+   npm install
+   ```
+
+3. Press `ctrl+shift+b` to show vscode task
+
+   - Use `npm: webpack` to build this extension, and then you can press F5 to debug it.
+
+   - Use `build vsix` to build as a vsix package.
+
diff --git a/README_ZH-CN.md b/README_ZH-CN.md
@@ -63,3 +63,24 @@
 - [Github Issue](https://github.com/github0null/eide/issues)
 
 - [论坛: https://discuss.em-ide.com](https://discuss.em-ide.com/)
+
+***
+
+## 如何构建 ?
+
+你可以自行构建该扩展
+
+1. 安装 `NodeJS 16`
+
+2. 克隆该仓库，用 VSCode 打开该项目，并执行如下命令
+
+   ```shell
+   npm install
+   ```
+
+3. 按下快捷键 `ctrl+shift+b` 打开构建命令
+
+   - 使用 `npm: webpack` 可构建带有调试信息的扩展，稍后你可以按 F5 进行调试
+
+   - 使用 `build vsix` 构建并打包成 VSIX
+
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
-    "version": "3.10.10",
+    "version": "3.10.11",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"

diff --git a/src/EIDETypeDefine.ts b/src/EIDETypeDefine.ts
@@ -1347,7 +1347,7 @@ export class ProjectConfiguration<T extends BuilderConfigData>
             this.__watcherReloadDelayTimer = setTimeout((_this: ProjectConfiguration<any>) => {
                 _this.__watcherReloadDelayTimer = undefined;
                 _this.Watch();
-            }, 1600, this);
+            }, 3000, this);
         }
     }
 }

diff --git a/src/extension.ts b/src/extension.ts
@@ -746,8 +746,6 @@ async function tryInstallBinaries(binFolder: File, binVersion: string): Promise<
 
 let isEnvSetuped: boolean = false;
 
-let isExport2ExtensionCtx = false;
-
 function exportEnvToSysPath(context?: vscode.ExtensionContext) {
 
     const settingManager = SettingManager.GetInstance();
@@ -875,24 +873,6 @@ function exportEnvToSysPath(context?: vscode.ExtensionContext) {
     // 你可通过使用喜欢的 shell 将 DOTNET_CLI_TELEMETRY_OPTOUT 环境变量设置为 "1" 或 "true" 来选择退出遥测。
     // 阅读有关 .NET CLI 工具遥测的更多信息: https://aka.ms/dotnet-cli-telemetry
     process.env['DOTNET_CLI_TELEMETRY_OPTOUT'] = '1'; // disable telemetry
-
-    //
-    // export to vscode extension envs
-    //
-    if (context && !isExport2ExtensionCtx) {
-
-        isExport2ExtensionCtx = true;
-
-        context.environmentVariableCollection.persistent = false;
-
-        context.environmentVariableCollection.prepend('DOTNET_CLI_TELEMETRY_OPTOUT', '1');
-
-        for (const env of pathList) {
-            if (File.IsDir(env.path)) {
-                context.environmentVariableCollection.append(env.key, env.path);
-            }
-        }
-    }
 }
 
 async function checkAndInstallRuntime() {