Merge pull request #84 from github0null/dev

v2.16.1 revision

Author: github0null

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ***
 
+### [v2.16.1] (revision)
+
+**Bug Fixes**:
+  - Some plug-in settings `TAG` missing.
+
+***
+
 ### [v2.16.0]
 
 **New Features**:

package.json

@@ -27,7 +27,7 @@
     "homepage": "https://github.com/github0null/eide/blob/master/README.md",
     "license": "MIT",
     "description": "An embedded development environment for 8051/STM8/Cortex-M/RISC-V",
-    "version": "2.16.0",
+    "version": "2.16.1",
     "engines": {
         "vscode": "^1.60.0"
     },
@@ -456,13 +456,13 @@
                         "markdownDescription": "%settings.riscv.gcc.prefix%",
                         "default": "riscv-none-embed-"
                     },
-                    "Toolchain.AnyGcc.InstallDirectory": {
+                    "EIDE.Toolchain.AnyGcc.InstallDirectory": {
                         "type": "string",
                         "scope": "resource",
                         "markdownDescription": "Any gcc toolchain install directory",
                         "default": ""
                     },
-                    "Toolchain.AnyGcc.ToolPrefix": {
+                    "EIDE.Toolchain.AnyGcc.ToolPrefix": {
                         "type": "string",
                         "scope": "resource",
                         "markdownDescription": "Any gcc **toolchain prefix**",

src/ToolchainManager.ts

@@ -1937,15 +1937,15 @@ class AnyGcc implements IToolchian {
             global: {
             },
             'c/cpp-compiler': {
-                "C_FLAGS": "-c -x c",
-                "CXX_FLAGS": "-c -x c++"
+                "C_FLAGS": "-c -x c -ffunction-sections -fdata-sections",
+                "CXX_FLAGS": "-c -x c++ -ffunction-sections -fdata-sections"
             },
             'asm-compiler': {
                 "ASM_FLAGS": "-c -x assembler"
             },
             linker: {
                 "output-format": "elf",
-                "LD_FLAGS": "-Wl,--print-memory-usage",
+                "LD_FLAGS": "-Wl,--gc-sections -Wl,--print-memory-usage",
                 "LIB_FLAGS": ""
             }
         };

src/extension.ts

@@ -262,6 +262,11 @@ async function onSelectSerialBaudrate() {
     }
 }
 
+function checkBinFolder(binFolder: File): boolean {
+    return binFolder.IsDir() &&
+        File.fromArray([binFolder.path, File.ToLocalPath('lib/mono/4.5/mscorlib.dll')]).IsFile();
+}
+
 async function checkAndInstallBinaries(constex: vscode.ExtensionContext, forceInstall?: boolean): Promise<boolean> {
 
     const eideCfg = ResManager.GetInstance().getAppConfig<any>();
@@ -277,30 +282,29 @@ async function checkAndInstallBinaries(constex: vscode.ExtensionContext, forceIn
     }
 
     // if 'bin' dir is existed, we exit, if not, we need install eide-binaries
-    else if (binFolder.IsDir() &&
-        File.fromArray([binFolder.path, File.ToLocalPath('lib/mono/4.5/mscorlib.dll')]).IsFile()) {
+    else if (checkBinFolder(binFolder)) {
         // if user enabled auto-update, we try get new version from 
         // github, and install it at background after 1 min delay
         //if (SettingManager.GetInstance().isEnableAutoUpdateEideBinaries()) {
-            setTimeout(async () => {
-                // get local binary version from disk
-                const verFile = File.fromArray([binFolder.path, 'VERSION']);
-                if (verFile.IsFile()) {
-                    const cont = verFile.Read().trim();
-                    if (utility.isVersionString(cont)) {
-                        localVersion = cont;
-                    }
+        setTimeout(async () => {
+            // get local binary version from disk
+            const verFile = File.fromArray([binFolder.path, 'VERSION']);
+            if (verFile.IsFile()) {
+                const cont = verFile.Read().trim();
+                if (utility.isVersionString(cont)) {
+                    localVersion = cont;
                 }
-                // try update
-                const done = await tryUpdateBinaries(binFolder, localVersion);
-                if (!done) {
-                    const msg = `Update eide-binaries failed, please restart vscode !`;
-                    const sel = await vscode.window.showErrorMessage(msg, 'Restart', 'Cancel');
-                    if (sel == 'Restart') {
-                        vscode.commands.executeCommand('workbench.action.reloadWindow');
-                    }
+            }
+            // try update
+            const done = await tryUpdateBinaries(binFolder, localVersion);
+            if (!done) {
+                const msg = `Update eide-binaries failed, please restart vscode !`;
+                const sel = await vscode.window.showErrorMessage(msg, 'Restart', 'Cancel');
+                if (sel == 'Restart') {
+                    vscode.commands.executeCommand('workbench.action.reloadWindow');
                 }
-            }, 5 * 1000);
+            }
+        }, 5 * 1000);
         //}
         return true;
     }
@@ -341,7 +345,7 @@ async function tryUpdateBinaries(binFolder: File, localVer: string, notConfirm?:
     }
 
     // check bin folder
-    if (binFolder.IsDir()) {
+    if (checkBinFolder(binFolder)) {
 
         // not need update, exit now
         if (binVersion == localVer) {