Merge pull request #445 from Jafaral/msys2-doc

add settings for msys2 shells to vscode
uniconproject · Apr 29, 2024 · f3c3ea1 · f3c3ea1
2 parents 9079c56 + 25da059
commit f3c3ea1
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 14 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,10 +8,6 @@
    "[shellscript]": {
       "editor.tabSize": 3
    },
-   "files.associations": {
-      //"*.r": "c11",
-      // "*.ri": "c11"
-   },
    "files.exclude": {
       "**/*.la": true,
       "**/*.lo": true,
@@ -33,10 +29,66 @@
       "${workspaceFolder}/src/h",
       "${workspaceFolder}/rt/include"
    ],
-   //"C_Cpp.default.intelliSenseMode": "linux-gcc-x64",
-   //"C_Cpp.default.compilerPath": "/usr/bin/gcc",
    "C_Cpp.default.defines": [ ],
    "editor.tabSize": 3,
-   "editor.detectIndentation": false
-
+   "editor.detectIndentation": false,
+   "terminal.integrated.defaultProfile.windows": "MSYS2-UCRT64",
+   "terminal.integrated.profiles.windows": {
+      "PowerShell": {
+         "source": "PowerShell",
+         "icon": "terminal-powershell"
+      },
+      "Command Prompt": {
+         "path": [
+            "${env:windir}\\Sysnative\\cmd.exe",
+            "${env:windir}\\System32\\cmd.exe"
+         ],
+         "args": [ ],
+         "icon": "terminal-cmd"
+      },
+      "MSYS2-MINGW64": {
+         "path": "C:\\msys64\\usr\\bin\\bash.exe",
+         "args": [
+            "--login",
+            "-i"
+         ],
+         "env": {
+            "MSYSTEM": "MINGW64",
+            "CHERE_INVOKING": "1"
+         }
+      },
+      "MSYS2-MINGW32": {
+         "path": "C:\\msys64\\usr\\bin\\bash.exe",
+         "args": [
+            "--login",
+            "-i"
+         ],
+         "env": {
+            "MSYSTEM": "MINGW32",
+            "CHERE_INVOKING": "1"
+         }
+      },
+      "MSYS2-UCRT64": {
+         "path": "C:\\msys64\\usr\\bin\\bash.exe",
+         "args": [
+            "--login",
+            "-i"
+         ],
+         "env": {
+            "MSYSTEM": "UCRT64",
+            "CHERE_INVOKING": "1"
+         }
+      },
+      "MSYS2-CLANG64": {
+         "path": "C:\\msys64\\usr\\bin\\bash.exe",
+         "args": [
+            "--login",
+            "-i"
+         ],
+         "env": {
+            "MSYSTEM": "CLANG64",
+            "CHERE_INVOKING": "1",
+         }
+      }
+   }
 }
diff --git a/README.md b/README.md
@@ -121,18 +121,18 @@ There are two possibilities depending on the choice of the C runtime library.  Y
 the legacy Microsoft Visual C++ Runtime (MSVCRT), which runs on all versions of Windows, or the
 newer Universal C Runtime (UCRT64), which is used by Visual Studio but is only available by default
 on Windows 10 and newer. Starting from version 13.3, binary distributions of Unicon for Windows
-will be built with UCRT64.
+will be built with UCRT64. See msys2 [environemts](https://www.msys2.org/docs/environments/)
+for more details about available environemnts and their C Library options.
 
-UCRT64:
+#### 1. UCRT64:
 
 - Download and run the installer from https://www.msys2.org/. At the time of writing it is called
   `msys2-x86_64-20230127.exe` but it may be updated from that version.
 
 -  Go through the installation process to get a UCRT64 environment.
 -  Using the UCRT64 shell, Install tools required for the build:
 ```
-pacman -S mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-diffutils
-pacman -S make git
+pacman -S --needed base-devel mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-diffutils git
 ```
 - Install the optional libraries for a full build (Unicon will build without them but some features
 will be absent).
@@ -158,7 +158,7 @@ make
 Note that, although the build environment is UCRT64, the resulting Unicon binaries may also be
 run from the standard Windows command line `cmd` terminal.
 
-MSVCRT:
+#### 2. MSVCRT (Legacy):
 
 - Download and run [mingw-get-setup.exe](https://sourceforge.net/projects/mingw/files/Installer/)
 
@@ -172,7 +172,7 @@ Note that you maybe missing the tool "make". TDM MinGW comes with a "make" that
 That file can be found under the insallation directory of MinGW64 inside the bin directory.
 create a copy of that file and name it "make.exe" before continuing.
 
-- Clone the Unicon repository (same options as UCRT64).
+- Clone the Unicon repository (same steps as UCRT64 above).
 
 After that you can use the standard Windows command line `cmd` terminal to build Unicon.
 ```