Просмотр исходного кода

docs: update Windows build instructions

Zaiming (Stone) Shi 4 лет назад
Родитель
Сommit
8a92b9dafa
2 измененных файлов с 5 добавлено и 4 удалено
  1. 1 1
      .github/workflows/build_packages.yaml
  2. 4 3
      Windows.md

+ 1 - 1
.github/workflows/build_packages.yaml

@@ -59,6 +59,7 @@ jobs:
         profile: # only CE for windows
         profile: # only CE for windows
           - emqx
           - emqx
         otp:
         otp:
+          ## gleam-lang/setup-erlang does not yet support the installation of otp24 on windows
           - 23.2
           - 23.2
 
 
     steps:
     steps:
@@ -71,7 +72,6 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@v1
     - uses: ilammy/msvc-dev-cmd@v1
     - uses: gleam-lang/setup-erlang@v1.1.2
     - uses: gleam-lang/setup-erlang@v1.1.2
       id: install_erlang
       id: install_erlang
-      ## gleam-lang/setup-erlang does not yet support the installation of otp24 on windows
       with:
       with:
         otp-version: ${{ matrix.otp }}
         otp-version: ${{ matrix.otp }}
     - name: build
     - name: build

+ 4 - 3
Windows.md

@@ -25,7 +25,7 @@ C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build
 
 
 Depending on your visual studio version and OS, the paths may differ.
 Depending on your visual studio version and OS, the paths may differ.
 The first path is for rebar3 port compiler to find `cl.exe` and `link.exe`
 The first path is for rebar3 port compiler to find `cl.exe` and `link.exe`
-The second path is for Powershell or CMD to setup environment variables.
+The second path is for CMD to setup environment variables.
 
 
 ### Erlang/OTP
 ### Erlang/OTP
 
 
@@ -73,6 +73,7 @@ Some of the unix world tools are required to build EMQ X.  Including:
 * git
 * git
 * curl
 * curl
 * make
 * make
+* cmake
 * jq
 * jq
 * zip / unzip
 * zip / unzip
 
 
@@ -81,14 +82,14 @@ We recommend using [scoop](https://scoop.sh/), or [Chocolatey](https://chocolate
 When using scoop:
 When using scoop:
 
 
 ```
 ```
-scoop install git curl make jq zip unzip
+scoop install git curl make cmake jq zip unzip
 ```
 ```
 
 
 ## Build EMQ X source code
 ## Build EMQ X source code
 
 
 * Clone the repo: `git clone https://github.com/emqx/emqx.git`
 * Clone the repo: `git clone https://github.com/emqx/emqx.git`
 
 
-* Start CMD or Powershell
+* Start CMD console
 
 
 * Execute `vcvarsall.bat x86_amd64` to load environment variables
 * Execute `vcvarsall.bat x86_amd64` to load environment variables