Skip to content

Commit

Permalink
Revert "CI use VS 2022, local use VS2019"
Browse files Browse the repository at this point in the history
This reverts commit 566cd17.
  • Loading branch information
dongyuwei committed Aug 23, 2024
1 parent 566cd17 commit 54c8e60
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 架構

Expand Down
6 changes: 3 additions & 3 deletions build.bat
Original file line number Diff line number Diff line change
@@ -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
cmake . -Bbuild64 -G"Visual Studio 16 2019" -A x64
cmake --build build64 --config Release --target PIMETextService
5 changes: 5 additions & 0 deletions build_github_ci.bat
Original file line number Diff line number Diff line change
@@ -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
5 changes: 0 additions & 5 deletions build_vs2019.bat

This file was deleted.

0 comments on commit 54c8e60

Please sign in to comment.