Merge pull request #375 from github0null/dev

v3.19.9 revision

Author: github0null

CHANGELOG.md

@@ -6,6 +6,17 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.19.9] revision
+
+**New**:
+  - `Plug-in Settings`: New plug-in settings: `Win32.Msys.Enable`, to determine whether to enable the built-in MSYS tools.
+  - `Project Variables`: Export `EIDE_xxx` variables into project variables.
+
+**Change**:
+  - ~~`Other`: Append msys path to the tail of system PATH, not head.~~
+
+***
+
 ### [v3.19.8] update
 
 **Fix**:

package.json

@@ -38,7 +38,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
-    "version": "3.19.8",
+    "version": "3.19.9",
     "preview": false,
     "engines": {
         "vscode": "^1.67.0"
@@ -188,6 +188,12 @@
             {
                 "title": "Embedded IDE",
                 "properties": {
+                    "EIDE.Win32.Msys.Enable": {
+                        "type": "boolean",
+                        "scope": "resource",
+                        "markdownDescription": "%settings.msys.enable%",
+                        "default": true
+                    },
                     "EIDE.DisplayLanguage": {
                         "type": "string",
                         "scope": "resource",
@@ -207,7 +213,7 @@
                     "EIDE.ExternalTools.IndexUrl": {
                         "type": "string",
                         "scope": "machine",
-                        "markdownDescription": "external tools **index.json** url, ref: https://github.com/github0null/eide_default_external_tools_index"
+                        "markdownDescription": "External tools **index.json** url, ref: https://github.com/github0null/eide_default_external_tools_index"
                     },
                     "EIDE.SourceTree.AutoSearchIncludePath": {
                         "type": "boolean",

package.nls.json

@@ -95,6 +95,8 @@
     "eide.deps.macro.show": "Display All Macros",
     "eide.deps.macro.add": "Add Macro",
 
+    "settings.msys.enable": "Determine whether to enable the built-in **MSYS environment and tools** on Win32 platform",
+
     "settings.enable.telemetry": "Enable telemetry for extension. We will collect information from the logs to help improve the functionality of this extension.",
 
     "settings.builder.jobs": "The number of threads when build",

package.nls.zh-CN.json

@@ -95,6 +95,8 @@
     "eide.deps.macro.show": "显示所有宏定义",
     "eide.deps.macro.add": "添加宏定义",
 
+    "settings.msys.enable": "确定是否在Windows平台上启用内置的 **MSYS环境和工具**",
+
     "settings.enable.telemetry": "启用遥测功能。我们将收集日志中的信息，帮助改进该扩展的功能",
 
     "settings.builder.jobs": "构建时使用的线程数",

src/EIDEProject.ts

@@ -2512,7 +2512,12 @@ $(OUT_DIR):
         this.registerBuiltinVar('SYS_EOL', () => os.EOL);
 
         // eide vars
-        this.registerBuiltinVar('UnifyBuilderDir', () => ResManager.instance().getUnifyBuilderExe().dir);
+        this.registerBuiltinVar('EIDE_BUILDER_DIR', () => ResManager.instance().getUnifyBuilderExe().dir);
+        for (const key in process.env) {
+            if (key.startsWith('EIDE_')) {
+                this.registerBuiltinVar(key, () => process.env[key] || '');
+            }
+        }
     }
 
     private RegisterEvent(): void {

src/SettingManager.ts

@@ -35,6 +35,7 @@ import * as Utility from './utility';
 import { find, exeSuffix, userhome } from './Platform';
 import { WorkspaceManager } from './WorkspaceManager';
 import { ToolchainName } from './ToolchainManager';
+import { view_str$prompt$needReloadToUpdateEnv } from './StringTable';
 
 export enum CheckStatus {
     All_Verified,
@@ -117,6 +118,10 @@ export class SettingManager {
                         this.syncGlobalEnvVariablesToNodeEnv();
                     }
 
+                    if (e.affectsConfiguration('EIDE.Win32.Msys.Enable')) {
+                        Utility.notifyReloadWindow(view_str$prompt$needReloadToUpdateEnv);
+                    }
+
                 } catch (error) {
                     GlobalEvent.log_warn(error);
                 }
@@ -289,6 +294,12 @@ export class SettingManager {
         return this.getConfiguration().get<string[]>('Cpptools.ForceInclude') || [];
     }
 
+    isEnableMsys(): boolean {
+        if (os.platform() != 'win32')
+            return false; //! not support non-win32 platform
+        return this.getConfiguration().get<boolean>('Win32.Msys.Enable') || false;
+    }
+
     isEnableTelemetry(): boolean {
         return this.getConfiguration().get<boolean>('Option.EnableTelemetry') || false;
     }

src/extension.ts

@@ -768,7 +768,6 @@ function exportEnvToSysPath(context?: vscode.ExtensionContext) {
         File.normalize(`${resManager.Get7zDir().path}`),   // builtin 7za tool
         File.normalize(`${resManager.getBuiltInToolsDir().path}/utils`) // builtin util tools
     ];
-    const appendSystemPaths: string[] = [];
 
     //
     const eideToolsFolder = new File(File.normalize(`${platform.userhome()}/.eide/tools`));
@@ -846,8 +845,12 @@ function exportEnvToSysPath(context?: vscode.ExtensionContext) {
     legacyBuilderDir.GetList(File.EXCLUDE_ALL_FILTER).forEach((subDir) => {
         const binFolder = File.normalize(`${subDir.path}/bin`);
         if (File.IsDir(binFolder)) {
+            const key_name = `EIDE_${subDir.name.toUpperCase()}`;
+            // check msys is enabled
+            if (key_name == 'EIDE_MSYS' && !settingManager.isEnableMsys())
+                return;
             pathList.push({
-                key: `EIDE_${subDir.name.toUpperCase()}`,
+                key: key_name,
                 path: binFolder
             });
         }
@@ -857,24 +860,16 @@ function exportEnvToSysPath(context?: vscode.ExtensionContext) {
     pathList
         .filter((env) => File.IsDir(env.path))
         .forEach(envInfo => {
-            if (['EIDE_MSYS'].includes(envInfo.key)) {
-                appendSystemPaths.push(envInfo.path);
-                if (envInfo.extraPath) {
-                    envInfo.extraPath.forEach(p => appendSystemPaths.push(p));
-                }
-            } else {
-                prependSystemPaths.push(envInfo.path);
-                if (envInfo.extraPath) {
-                    envInfo.extraPath.forEach(p => prependSystemPaths.push(p));
-                }
+            prependSystemPaths.push(envInfo.path);
+            if (envInfo.extraPath) {
+                envInfo.extraPath.forEach(p => prependSystemPaths.push(p));
             }
         });
 
     /* append to System Path if we not */
     if (isEnvSetuped == false) {
         isEnvSetuped = true;
         platform.prependToSysEnv(process.env, prependSystemPaths);
-        platform.appendToSysEnv(process.env, appendSystemPaths);
     }
 
     /* update env key value */
@@ -1234,7 +1229,8 @@ class EideTaskProvider implements vscode.TaskProvider {
 
         const workspaceManager = WorkspaceManager.getInstance();
 
-        if (task_.definition.type == EideTaskProvider.TASK_TYPE_MSYS) {
+        if (task_.definition.type == EideTaskProvider.TASK_TYPE_MSYS && 
+            SettingManager.GetInstance().isEnableMsys()) {
 
             const definition: EideShellTaskDef = <any>task_.definition;