diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ce1960f69..778c36c7e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,7 +18,7 @@ jobs: nsis-version: 3.08 - name: Build IME Text Service run: | - .\build.bat + .\build_github_ci.bat - name: Build the installer run: | cmd /C "C:\Program Files (x86)\NSIS\Bin\makensis.exe" ".\installer\installer.nsi" diff --git a/README.md b/README.md index b48ad7ec2..e763dbf92 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,14 @@ - https://github.com/dongyuwei/PIME/releases -## Build and compile with `Visual Studio 17 2022` +## Build and compile with Visual Studio 2019 1. 安装 cmake(tested with `cmake version 3.25.0-rc2`) -2. 项目根目录下执行 `./build.bat`, 这个是用来构建PIME Text Service,对应于 C++ 部分代码。 -3. 使用 NSIS 构建安装文件: +2. 项目根目录下执行 ./build.bat +3. 使用 NSIS 构建 install exe 文件: 1. Compile NSI scripts - 2. File -> Load script... -> installer/installer.nsi, 这个用于打包 Python 输入法代码,编译成 .exe 文件。 -4. CI 构建可参考 appveyor.yml 及 .github/workflows/ci.yaml + 2. File -> Load script... -> installer/installer.nsi +4. CI 构建可参考 appveyor.yml ## 更好的 IPC 架構 diff --git a/build.bat b/build.bat index 9c3d2e618..a153a1907 100644 --- a/build.bat +++ b/build.bat @@ -1,5 +1,5 @@ -cmake . -Bbuild -G "Visual Studio 17 2022" -A Win32 +cmake . -Bbuild -G"Visual Studio 16 2019" -A Win32 cmake --build build --config Release -cmake . -Bbuild64 -G "Visual Studio 17 2022" -A x64 -cmake --build build64 --config Release --target PIMETextService \ No newline at end of file +cmake . -Bbuild64 -G"Visual Studio 16 2019" -A x64 +cmake --build build64 --config Release --target PIMETextService diff --git a/build_github_ci.bat b/build_github_ci.bat new file mode 100644 index 000000000..9c3d2e618 --- /dev/null +++ b/build_github_ci.bat @@ -0,0 +1,5 @@ +cmake . -Bbuild -G "Visual Studio 17 2022" -A Win32 +cmake --build build --config Release + +cmake . -Bbuild64 -G "Visual Studio 17 2022" -A x64 +cmake --build build64 --config Release --target PIMETextService \ No newline at end of file diff --git a/build_vs2019.bat b/build_vs2019.bat deleted file mode 100644 index a153a1907..000000000 --- a/build_vs2019.bat +++ /dev/null @@ -1,5 +0,0 @@ -cmake . -Bbuild -G"Visual Studio 16 2019" -A Win32 -cmake --build build --config Release - -cmake . -Bbuild64 -G"Visual Studio 16 2019" -A x64 -cmake --build build64 --config Release --target PIMETextService