diff --git a/INSTALL-McStas/Windows/README.md b/INSTALL-McStas/Windows/README.md index e7ffc4e55..4e7097ef2 100644 --- a/INSTALL-McStas/Windows/README.md +++ b/INSTALL-McStas/Windows/README.md @@ -1,24 +1,28 @@ # Installation of McStas 3.7.6 on Windows 64 bit Intel systems (some support for arm64) ## *IMPORTANT: active internet connection required during installation* -* Please use either of: - 1. **Recommended:** - * As **Administrator**, run our new [`install_msvc_for_conda.bat`](install_msvc_for_conda.bat) batch script to install MSVC and required packages to your system. Alternatively, [install MSVC manually](VScode_manual_install) - * Use the [`mcstas-conda`](mcstas-conda.bat) batch script to install the latest mcstas from `conda-forge` - * Once install has completed, please use the `mcstas-shell-conda` or `mcgui-conda` shortcuts on the desktop. The first one issues a McStas terminal, the latter start `mcgui` directly also. - * Option 1 functions also on `arm64` Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++. - 2. **New MSVC-bundle solution:** - * As **Administrator**, run our new [`install_msvc_for_conda.bat`](install_msvc_for_conda.bat) batch script to install MSVC and required packages to your system. Alternatively, [install MSVC manually](VScode_manual_install) - * Please remove any existing MinGW-based version of McStas 3.7.6 before proceeding! - * install the new MSVC based [McStas 3.7.6 MSVC metapackage](https://download.mcstas.org/mcstas-3.7.6/Windows/MSVC/McStas-Metapackage-3.7.6-MSVC-win64.exe) - * Option 2 should be fully functional on `arm64` processors. - 3. **WSL:** - * Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there. - * Option 3 is fully functional on `arm64` processors. - 4. **Legacy MinGW-bundle solution:** - * Please remove any MSVC-based version of McStas 3.7.6 before proceeding! - * install the legacy-style MinGW based [McStas 3.7.6 MinGW metapackage](https://download.mcstas.org/mcstas-3.7.6/Windows/MinGW/McStas-Metapackage-3.7.6-MinGW-win64.exe) - * Option 4 should be fully functional on `arm64` processors. +###Please use either of:### + +**OPTION 1: Recommended:** +* As **Administrator**, run our new [`install_msvc_for_conda.bat`](install_msvc_for_conda.bat) batch script to install MSVC and required packages to your system. Alternatively, [install MSVC manually](VScode_manual_install) +* Use the [`mcstas-conda`](mcstas-conda.bat) batch script to install the latest mcstas from `conda-forge` +* Once install has completed, please use the `mcstas-shell-conda` or `mcgui-conda` shortcuts on the desktop. The first one issues a McStas terminal, the latter start `mcgui` directly also. +* Option 1 functions also on `arm64` Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++. + +**OPTION 2: New MSVC-bundle solution:** +* As **Administrator**, run our new [`install_msvc_for_conda.bat`](install_msvc_for_conda.bat) batch script to install MSVC and required packages to your system. Alternatively, [install MSVC manually](VScode_manual_install) +* Please remove any existing MinGW-based version of McStas 3.7.6 before proceeding! +* install the new MSVC based [McStas 3.7.6 MSVC metapackage](https://download.mcstas.org/mcstas-3.7.6/Windows/MSVC/McStas-Metapackage-3.7.6-MSVC-win64.exe) +* Option 2 should be fully functional on `arm64` processors. + +**OPTION 3: WSL** +* Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there. +* Option 3 is fully functional on `arm64` processors. + +**OPTION 4: Legacy MinGW-bundle solution:** +* Please remove any MSVC-based version of McStas 3.7.6 before proceeding! +* install the legacy-style MinGW based [McStas 3.7.6 MinGW metapackage](https://download.mcstas.org/mcstas-3.7.6/Windows/MinGW/McStas-Metapackage-3.7.6-MinGW-win64.exe) +* Option 4 should be fully functional on `arm64` processors. If you are `conda-forge` knowledgable already, you may also simply install a new environment as explained in [conda-forge](../conda/README.md) diff --git a/INSTALL-McStas/Windows/install_msvc_for_conda.bat b/INSTALL-McStas/Windows/install_msvc_for_conda.bat index 8844bf7fa..b0bb99575 100644 --- a/INSTALL-McStas/Windows/install_msvc_for_conda.bat +++ b/INSTALL-McStas/Windows/install_msvc_for_conda.bat @@ -49,12 +49,20 @@ setlocal EnableExtensions DisableDelayedExpansion :: --------------------------------------------------------------------------- :: 0. Admin check :: --------------------------------------------------------------------------- +echo McCode helper-script for installation of MSVC and utilities +echo . net session >nul 2>&1 if %errorlevel% neq 0 ( - echo [ERROR] This script must be run as Administrator. + echo WARNING: + echo . + echo Your user is not Administrator + echo . + echo If possible, please attempt a rerun of this script as Administrator, echo Right-click the file and choose "Run as administrator". + echo . + echo Use ^C to cancel / use any other key to attempt with current permissions pause - exit /b 1 + echo ... Proceeding with current permissions... ) echo. @@ -119,7 +127,7 @@ if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" ( :: --------------------------------------------------------------------------- echo. echo [STEP 1/2] Installing Visual Studio 2022 Build Tools ... -echo (This downloads ~2–4 GB and may take 10–30 minutes.) +echo (This downloads ~2 to 4 GB and may take 10 to 30 minutes.) echo. winget install ^ diff --git a/INSTALL-McXtrace/Windows/README.md b/INSTALL-McXtrace/Windows/README.md index 8bdc44567..93468d03a 100644 --- a/INSTALL-McXtrace/Windows/README.md +++ b/INSTALL-McXtrace/Windows/README.md @@ -1,24 +1,28 @@ # Installation of McXtrace 3.7.6 on Windows 64 bit Intel systems (some support for arm64) ## *IMPORTANT: active internet connection required during installation* -* Please use either of: - 1. **Recommended:** - * As **Administrator**, run our new [`install_msvc_for_conda.bat`](install_msvc_for_conda.bat) batch script to install MSVC and required packages to your system. Alternatively, [install MSVC manually](VScode_manual_install) - * Use the [`mcxtrace-conda`](mcxtrace-conda.bat) batch script to install the latest mcxtrace from `conda-forge` - * Once install has completed, please use the `mcxtrace-shell-conda` or `mxgui-conda` shortcuts on the desktop. The first one issues a McXtrace terminal, the latter start `mxgui` directly also. - * Option 1 functions also on `arm64` Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++. - 2. **New MSVC-bundle solution:** - * As **Administrator**, run our new [`install_msvc_for_conda.bat`](install_msvc_for_conda.bat) batch script to install MSVC and required packages to your system. Alternatively, [install MSVC manually](VScode_manual_install) - * Please remove any MinGW-based version of McXtrace 3.7.6 before proceeding! - * install the new MSVC based [McXtrace 3.7.6 MSVC metapackage](https://download.mcxtrace.org/mcxtrace-3.7.6/Windows/MSVC/McXtrace-Metapackage-3.7.6-MSVC-win64.exe) - * Option 2 should be fully functional on `arm64` processors. - 3. **WSL:** - * Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there. - * Option 3 is fully functional on `arm64` processors. - 4. **Legacy MinGW-bundle solution:** - * Please remove any MSVC-based version of McXtrace 3.7.6 before proceeding! - * install the legacy-style MinGW based [McXtrace 3.7.6 metapackage](https://download.mcxtrace.org/mcxtrace-3.7.6/Windows/MinGW/McXtrace-Metapackage-3.7.6-MinGW-win64.exe) - * Option 4 should be fully functional on `arm64` processors. +###Please use either of:### + +**OPTION 1: Recommended:** +* As **Administrator**, run our new [`install_msvc_for_conda.bat`](install_msvc_for_conda.bat) batch script to install MSVC and required packages to your system. Alternatively, [install MSVC manually](VScode_manual_install) +* Use the [`mcxtrace-conda`](mcxtrace-conda.bat) batch script to install the latest mcxtrace from `conda-forge` +* Once install has completed, please use the `mcxtrace-shell-conda` or `mxgui-conda` shortcuts on the desktop. The first one issues a McXtrace terminal, the latter start `mxgui` directly also. +* Option 1 functions also on `arm64` Windows, but will require installation of Visual Studio including both arm64 and x64_64 build tools for c++. + +**OPTION 2: New MSVC-bundle solution:** +* As **Administrator**, run our new [`install_msvc_for_conda.bat`](install_msvc_for_conda.bat) batch script to install MSVC and required packages to your system. Alternatively, [install MSVC manually](VScode_manual_install) +* Please remove any MinGW-based version of McXtrace 3.7.6 before proceeding! +* install the new MSVC based [McXtrace 3.7.6 MSVC metapackage](https://download.mcxtrace.org/mcxtrace-3.7.6/Windows/MSVC/McXtrace-Metapackage-3.7.6-MSVC-win64.exe) +* Option 2 should be fully functional on `arm64` processors. + +**OPTION 3: WSL** +* Use the directions available in [WSL](WSL/README.md) to install the "Windows subsystem for Linux" and run the Linux Debian binaries there. +* Option 3 is fully functional on `arm64` processors. + +**OPTION 4: Legacy MinGW-bundle solution:** +* Please remove any MSVC-based version of McXtrace 3.7.6 before proceeding! +* install the legacy-style MinGW based [McXtrace 3.7.6 metapackage](https://download.mcxtrace.org/mcxtrace-3.7.6/Windows/MinGW/McXtrace-Metapackage-3.7.6-MinGW-win64.exe) +* Option 4 should be fully functional on `arm64` processors. If you are `conda-forge` knowledgable already, you may also simply install a new environment as explained in [conda-forge](../conda/README.md) diff --git a/INSTALL-McXtrace/Windows/install_msvc_for_conda.bat b/INSTALL-McXtrace/Windows/install_msvc_for_conda.bat index 8844bf7fa..b0bb99575 100644 --- a/INSTALL-McXtrace/Windows/install_msvc_for_conda.bat +++ b/INSTALL-McXtrace/Windows/install_msvc_for_conda.bat @@ -49,12 +49,20 @@ setlocal EnableExtensions DisableDelayedExpansion :: --------------------------------------------------------------------------- :: 0. Admin check :: --------------------------------------------------------------------------- +echo McCode helper-script for installation of MSVC and utilities +echo . net session >nul 2>&1 if %errorlevel% neq 0 ( - echo [ERROR] This script must be run as Administrator. + echo WARNING: + echo . + echo Your user is not Administrator + echo . + echo If possible, please attempt a rerun of this script as Administrator, echo Right-click the file and choose "Run as administrator". + echo . + echo Use ^C to cancel / use any other key to attempt with current permissions pause - exit /b 1 + echo ... Proceeding with current permissions... ) echo. @@ -119,7 +127,7 @@ if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" ( :: --------------------------------------------------------------------------- echo. echo [STEP 1/2] Installing Visual Studio 2022 Build Tools ... -echo (This downloads ~2–4 GB and may take 10–30 minutes.) +echo (This downloads ~2 to 4 GB and may take 10 to 30 minutes.) echo. winget install ^