Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 45 additions & 39 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
branches:
- main
- insider
- canary
permissions:
actions: write

Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:
matrix:
platform: [Win32, x64, ARM64]
fail-fast: false
runs-on: windows-latest
runs-on: windows-2022

steps:
- name: Checkout code
Expand Down Expand Up @@ -162,7 +163,7 @@ jobs:

package:
name: Package
runs-on: windows-latest
runs-on: windows-2022
needs: build

steps:
Expand Down Expand Up @@ -280,15 +281,15 @@ jobs:
run: |
$branchName = $Env:GITHUB_REF_NAME

if ($branchName -ieq 'main' -or $branchName -ieq 'insider')
if ($branchName -ieq 'dev')
{
"signing_policy_slug=release-signing" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
"**使用正式证书签名**" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
"signing_policy_slug=test-signing" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
"**使用测试证书签名**" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
}
else
{
"signing_policy_slug=test-signing" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
"**使用测试证书签名**" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
"signing_policy_slug=release-signing" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
"**使用正式证书签名**" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
}

- name: 提交给 SignPath 签名
Expand Down Expand Up @@ -411,36 +412,40 @@ jobs:

$content = @"
"${{ steps.softwareChannel.outputs.VALUE }}": {
"edition_date": "${{ steps.softwareDate.outputs.VALUE }}",
"edition_code": "",
"hash": {
"md5": "$md5_1",
"sha256": "$sha256_1",
"md5 64": "$md5_2",
"sha256 64": "$sha256_2",
"md5 Arm64": "$md5_3",
"sha256 Arm64": "$sha256_3"
},
"path": [
"https://vip.123pan.cn/1709404/version_identification/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}.zip",
"http://home.alan-crl.top/version_identification/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}.zip"
],
"path64": [
"https://vip.123pan.cn/1709404/version_identification/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}64.zip",
"http://home.alan-crl.top/version_identification/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}64.zip"
],
"pathArm64": [
"https://vip.123pan.cn/1709404/version_identification/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}Arm64.zip",
"http://home.alan-crl.top/version_identification/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}Arm64.zip"
],
"size": {
"file": $size1,
"file64": $size2,
"fileArm64": $size3
},
"representation": "Inkeys.exe"
}
"@
"edition_date": "${{ steps.softwareDate.outputs.VALUE }}",
"edition_code": "",
"inkeys3": false,
"hash": {
"md5": "$md5_1",
"sha256": "$sha256_1",
"md5 64": "$md5_2",
"sha256 64": "$sha256_2",
"md5 Arm64": "$md5_3",
"sha256 Arm64": "$sha256_3"
},
"path": [
"https://get.smart-teach.cn/d/Ningbo-S3/shared/AlanCRL/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}.zip",
"http://home.alan-crl.top/Inkeys/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}.zip",
"https://vip.123pan.cn/1709404/Inkeys/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}.zip"
],
"path64": [
"https://get.smart-teach.cn/d/Ningbo-S3/shared/AlanCRL/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}64.zip",
"http://home.alan-crl.top/Inkeys/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}64.zip",
"https://vip.123pan.cn/1709404/Inkeys/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}64.zip"
],
"pathArm64": [
"https://get.smart-teach.cn/d/Ningbo-S3/shared/AlanCRL/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}Arm64.zip",
"http://home.alan-crl.top/Inkeys/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}Arm64.zip",
"https://vip.123pan.cn/1709404/Inkeys/Version/InkeysUpdate${{ steps.softwareDate.outputs.VALUE }}Arm64.zip"
],
"size": {
"file": $size1,
"file64": $size2,
"fileArm64": $size3
},
"representation": "Inkeys.exe"
}
"@
Set-Content -Path "packageUpload\update.txt" -Value $content -Encoding UTF8

- name: Write Tips
Expand Down Expand Up @@ -607,7 +612,7 @@ jobs:

- name: Upload to WebDAV with rclone
id: upload_webdav
timeout-minutes: 60
timeout-minutes: 120
continue-on-error: true
shell: pwsh
run: |
Expand All @@ -621,7 +626,7 @@ jobs:
# 开始上传
Write-Host "开始上传到 WebDAV..."
Write-Host "进度将每 10 秒更新一次"
Write-Host "超时时间: 15 分钟"
Write-Host "超时时间: 120 分钟"
Write-Host "目标路径: /Inkeys/PackageHistory/$Env:GITHUB_REF_NAME"
Write-Host ""

Expand Down Expand Up @@ -675,6 +680,7 @@ jobs:

- name: Verify upload
shell: pwsh
continue-on-error: true
run: |
if ("${{ secrets.WEBDAV_API_TOKEN }}" -ne "")
{
Expand Down
13 changes: 12 additions & 1 deletion GithubRes/CompilationProcess_en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

For general build requirements, you only need to build `智绘教.vcxproj`. There is an associated project, `PptCOM.csproj`, which serves as the PPT integration module for 智绘教Inkeys.
The `智绘教.vcxproj` project depends on the library (dll/tlb) generated by `PptCOM.csproj`, but `PptCOM.csproj` has already been built, so you can directly build `智绘教.vcxproj`. This means that only a C++ desktop environment is needed; there's no need to set up a C# environment.
Note: If you only need to build `智绘教.vcxproj`, you should uncheck `PptCOM` under `Solution Configuration->Project dependencies->智绘教`
**Note: If you only need to build `智绘教.vcxproj`, you should uncheck `PptCOM` under `Solution Configuration->Project dependencies->智绘教`**

### Build the Main Project `智绘教.vcxproj`
智绘教Inkeys is completely open-source, with all source code and resources available.
Expand All @@ -25,6 +25,17 @@ Note: If you only need to build `智绘教.vcxproj`, you should uncheck `PptCOM`

---

### FAQ

In certain special environments, compilation may fail.

- **error LNK2001: unresolved external symbol `std_search_1`**
This occurs in VS 2022 17.8.x (MSVC v143.35 – v143.41).

We recommend using **17.14.x** to match the version installed by the project developers (optional).

---

### Build the Subsidiary Project `PptCOM.csproj`

#### Environment Preparation
Expand Down
11 changes: 10 additions & 1 deletion GithubRes/CompilationProcess_zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

对于一般的构建需求来说,你只需要构建 `智绘教.vcxproj` 即可,而该项目有一个附属项目 `PptCOM.csproj` 是 智绘教Inkeys 的 PPT 联动模块。
`智绘教.vcxproj` 依赖于 `PptCOM.csproj` 生成的类库(dll/tlb),但 `PptCOM.csproj` 已经被编译好了,可以直接构建 `智绘教.vcxproj`。这意味着只需要 C++ 桌面环境,而不用准备 C# 环境。
注意:如果只需要编译 `智绘教.vcxproj` 你需要在 `解决方案配置->项目依赖项->智绘教` 中取勾 `PptCOM`!
**注意:如果只需要编译 `智绘教.vcxproj` 你需要在 `解决方案配置->项目依赖项->智绘教` 中取勾 `PptCOM`!**

### 编译主项目 `智绘教.vcxproj`
智绘教Inkeys 采用完全开源方式,所有源码和资源全部开源
Expand All @@ -25,6 +25,15 @@

---

### FAQ
某些特殊环境可能会导致无法编译。
- **error LNK2001: 无法解析的外部符号 `std_search_1`**
在 VS 2022 17.8.x(MSVC v143.35 ~ v143.41)中会导致无法编译。

推荐使用 **17.14.x**,与项目开发者所安装的版本保持一致。(非必须)

---

### 编译附属项目 `PptCOM.csproj`

#### 准备环境
Expand Down
79 changes: 73 additions & 6 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,10 +1,77 @@
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/)
and licensed under the Apache License 2.0.
The development of this software makes use of a number of excellent third-party open source libraries. We would like to express our sincere gratitude to the contributors of these open source projects. Below is a non-exhaustive list of third-party components included in this software and their license information:

Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
Component: abseil/abseil-cpp (https://github.com/abseil/abseil-cpp)
License: Apache License 2.0
Copyright / Notes:

-----
Component: aksalj/hashlibpp (https://github.com/aksalj/hashlibpp)
License: See accompanying file(s)
Copyright / Notes: Copyright (c) 2007-2011 Benjamin Gr¸delbach

This product includes software developed by Carnegie Mellon University and Intel Corporation as part of the libcuckoo project (https://github.com/efficient/libcuckoo), and licensed under the Apache License, Version 2.0.
Component: Alan-CRL/DesktopDrawpadBlocker (https://github.com/Alan-CRL/DesktopDrawpadBlocker)
License: GNU General Public License v3.0
Copyright / Notes:

Copyright 2013, Carnegie Mellon University and Intel Corporation.
Component: cameron314/concurrentqueue (https://github.com/cameron314/concurrentqueue)
License: See accompanying file(s)
Copyright / Notes: Copyright (c) 2013-2016, Cameron Desrochers. All rights reserved.

Component: efficient/libcuckoo (https://github.com/efficient/libcuckoo)
License: See accompanying file(s)
Copyright / Notes: Copyright (C) 2013, Carnegie Mellon University and Intel Corporation

Component: gabime/spdlog (https://github.com/gabime/spdlog)
License: MIT License
Copyright / Notes: Copyright (c) 2016 Gabi Melman.

Component: google/ink-stroke-modeler (https://github.com/google/ink-stroke-modeler)
License: Apache License 2.0
Copyright / Notes:

Component: martinus/unordered_dense (https://github.com/martinus/unordered_dense)
License: MIT License
Copyright / Notes: Copyright (c) 2022 Martin Leitner-Ankerl

Component: mohabouje/WinToast (https://github.com/mohabouje/WinToast)
License: MIT License
Copyright / Notes: Copyright (C) 2016-2023 WinToast v1.3.0 - Mohammed Boujemaoui <mohabouje@gmail.com>

Component: nothings/stb (https://github.com/nothings/stb)
License: MIT License
Copyright / Notes: Copyright (c) 2017 Sean Barrett

Component: ocornut/imgui (https://github.com/ocornut/imgui)
License: MIT License
Copyright / Notes: Copyright (c) 2014-2025 Omar Cornut

Component: openssl/openssl (https://github.com/openssl/openssl)
License: Apache License 2.0
Copyright / Notes: Copyright (c) 1998-2025 The OpenSSL Project Authors. Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.

Component: sammycage/lunasvg (https://github.com/sammycage/lunasvg)
License: MIT License
Copyright / Notes: Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors

Component: sammycage/plutovg (https://github.com/sammycage/plutovg)
License: MIT License
Copyright / Notes: Copyright (c) 2020-2025 Samuel Ugochukwu <sammycageagle@gmail.com>

Component: yhirose/cpp-httplib (https://github.com/yhirose/cpp-httplib)
License: MIT License
Copyright / Notes: Copyright (c) 2017 yhirose

Component: Zip Utils (https://www.codeproject.com/Articles/7530/Zip-Utils-Clean-Elegant-Simple-Cplusplus-Win)
License:
Copyright / Notes:

Component: zouhuidong/HiEasyX (https://github.com/zouhuidong/HiEasyX)
License: MIT License
Copyright / Notes: Copyright (c) 2022 zouhuidong

For the complete list of all third-party libraries used by this software and their corresponding license files, please refer to the following links:

Main component notices (NOTICE):
./NOTICE

Third-party license files:
./ThirdpartyLicenses/
Loading
Loading