Skip to content

Commit

Permalink
CI: vcpkg version update to d765306b074717dea8dc1c4723e1b025acb61c2d …
Browse files Browse the repository at this point in the history
…, so that fix microsoft/vcpkg#32560
  • Loading branch information
KangLin committed Jul 24, 2023
1 parent 640bed9 commit 80db800
Show file tree
Hide file tree
Showing 21 changed files with 77 additions and 66 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}}
ANDROID_PLATFORM: android-23
ANDROID_NATIVE_API_LEVEL: 23
ChineseChessControl_VERSION: "v2.0.10"
VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2
ChineseChessControl_VERSION: "2.0.11"
VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d
qt_modules: 'qtimageformats qtmultimedia qtscxml qtwebchannel qtwebsockets qtwebview'

# Map the job outputs to step outputs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: build
env:
artifact_path: artifact_path
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ChineseChessControl_VERSION: "v2.0.10"
ChineseChessControl_VERSION: "2.0.11"

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
SOURCE_DIR: ${{github.workspace}}/.cache/source
TOOSL_DIR: ${{github.workspace}}/.cache/tools
INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu
ChineseChessControl_VERSION: "v2.0.10"
ChineseChessControl_VERSION: "2.0.11"
DOXYGEN_VERSION: 1.9.5
artifact_name: build_doxygen

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
SOURCE_DIR: ${{github.workspace}}/.cache/source
TOOSL_DIR: ${{github.workspace}}/.cache/tools
INSTALL_DIR: ${{github.workspace}}/.cache/install_macos
ChineseChessControl_VERSION: "2.0.10"
ChineseChessControl_VERSION: "2.0.11"
artifact_name: build_macos
qt_modules: 'qtwebengine ${{ matrix.qt_modules }}'
VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2
VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d

# Map the job outputs to step outputs
outputs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
SOURCE_DIR: ${{github.workspace}}\.cache\source
TOOSL_DIR: ${{github.workspace}}\.cache\tools
INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw
ChineseChessControl_VERSION: "v2.0.10"
ChineseChessControl_VERSION: "2.0.11"
artifact_name: build_mingw

# Map the job outputs to step outputs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
ChineseChessControl_VERSION: "v2.0.10"
VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2
ChineseChessControl_VERSION: "2.0.11"
VCPKGGITCOMMITID: d765306b074717dea8dc1c4723e1b025acb61c2d
qt_modules: 'qtwebengine ${{matrix.qt_modules}}'

# Map the job outputs to step outputs
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=QtDevelopment
cmake --install . --config ${{matrix.BUILD_TYPE}} --prefix=%CD%\install_develop --component=Development
7z a ChineseChessControl_${{env.ChineseChessControl_VERSION}}_${{matrix.qt_arch}}_Qt${{matrix.qt_version}}_Develop.zip %CD%\install_develop\.
# cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package
cmake --build . --config ${{ matrix.BUILD_TYPE }} --target package
- name: Update artifact
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version != '5.15.2' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
SOURCE_DIR: ${{github.workspace}}/.cache/source
TOOSL_DIR: ${{github.workspace}}/.cache/tools
INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu_${{matrix.BUILD_TYPE}}
ChineseChessControl_VERSION: "2.0.10"
ChineseChessControl_VERSION: "2.0.11"
artifact_name: build_ubuntu

# Map the job outputs to step outputs
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ before_install:
- sudo Xvfb :99 -ac &
- export DISPLAY=:99.0
- mkdir ${SOURCE_DIR}/Tools
- export VERSION="v2.0.10"
- export VERSION="2.0.11"
- echo "QT_USER:$QT_USER"
- echo "QT_PASSWORD:$QT_PASSWORD"
- echo "STOREPASS:$STOREPASS"
Expand Down
1 change: 1 addition & 0 deletions App/MFC/ChineseChessMFC/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ if(CMAKE_MFC_FLAG EQUAL 2)
target_compile_definitions(${PROJECT_NAME} PRIVATE "_AFXDLL")
endif()
target_compile_definitions(${PROJECT_NAME} PRIVATE "_AFXEXT" "_WINDLL"
"WIN32" "_WINDOWS"
"_UNICODE" "UNICODE"
$<$<CONFIG:Debug>:_DEBUG DEBUG>
)
Expand Down
2 changes: 1 addition & 1 deletion App/Qt/ChineseChess/android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.KangLinStudio.ChineseChess"
android:versionName="2.0.10"
android:versionName="2.0.11"
android:versionCode="2"
android:installLocation="auto">

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if(POLICY CMP0021)
endif()

# 设置版本号
SET(ChineseChessControl_VERSION "v2.0.10")
SET(ChineseChessControl_VERSION "2.0.11")
# 用 GIT 得到版本号
IF(EXISTS "${CMAKE_SOURCE_DIR}/.git")
if(NOT GIT)
Expand Down
5 changes: 4 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
- v2.0.11
+ CI: 更新 VCPKG。修复CPAKE错误。详见: https://github.com/microsoft/vcpkg/issues/32560

- v2.0.10
+ 用 QFileDialog::getOpenFileName 替换 RabbitCommon::CDir::GetOpenFileName
+ 用 QFileDialog::getSaveFileName 替换 RabbitCommon::CDir::GetSaveFileName
Expand Down Expand Up @@ -81,7 +84,7 @@
- v1.1.0
+ 重构程序
-[象棋竞赛规则(2011)](Documents/ChineseChessRule2011.pdf)重构棋盘布局
+ 优化程序算可读性
+ 优化程序可读性
+ 优化算法性能

- v1.0.2
Expand Down
2 changes: 1 addition & 1 deletion Install/Install.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "ChineseChessControl"
!define PRODUCT_VERSION "v2.0.10"
!define PRODUCT_VERSION "2.0.11"
!define PRODUCT_PUBLISHER "Kang Lin ([email protected])"
!define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
Expand Down
88 changes: 47 additions & 41 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,62 +78,68 @@
+ [最后版本](https://github.com/KangLin/ChineseChessControl/releases/latest)
+ 当前版本:
- Windows安装包,支持 Windows 7 以上系统。
- ChineseChessControl_v2.0.10_msvc1929_x86_64_Setup.exe
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_msvc1929_x86_64_Setup.exe)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_msvc1929_x86_64_Setup.exe/download)
- ChineseChessControl_v2.0.10_msvc1916_x86_Setup.exe
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_msvc1916_x86_Setup.exe)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_msvc1916_x86_Setup.exe/download)
- chinesechesscontrol_v2.0.1_Windows_x64_setup.exe
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Windows_x64_setup.exe)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Windows_x64_setup.exe/download)
- chinesechesscontrol_v2.0.11_Windows_X86_setup.exe
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Windows_X86_setup.exe)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Windows_X86_setup.exe/download)
- ChineseChessControl_v2.0.11_msvc1929_x86_64_Setup.exe
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_msvc1929_x86_64_Setup.exe)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_msvc1929_x86_64_Setup.exe/download)
- ChineseChessControl_v2.0.11_msvc1916_x86_Setup.exe
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_msvc1916_x86_Setup.exe)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_msvc1916_x86_Setup.exe/download)

- Windows开发包,安装完成后,使用请详见:[开发者文档](Documents/Developer.md#调试)

- ChineseChessControl_v2.0.10_win32_msvc2017_Qt5.12.12_Develop.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_win32_msvc2017_Qt5.12.12_Develop.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_win32_msvc2017_Qt5.12.12_Develop.zip/download)
- ChineseChessControl_v2.0.10_win64_msvc2019_64_qt6.5.1_Develop.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_win64_msvc2019_64_qt6.5.1_Develop.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_win64_msvc2019_64_Qt6.5.1_Develop.zip/download)
- ChineseChessControl_v2.0.11_win32_msvc2017_Qt5.12.12_Develop.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_win32_msvc2017_Qt5.12.12_Develop.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_win32_msvc2017_Qt5.12.12_Develop.zip/download)
- ChineseChessControl_v2.0.11_win64_msvc2019_64_qt6.5.1_Develop.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_win64_msvc2019_64_qt6.5.1_Develop.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_win64_msvc2019_64_Qt6.5.1_Develop.zip/download)

- linux
- chinesechesscontrol_v2.0.10_Linux_x86_64_setup.sh
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/chinesechesscontrol_v2.0.10_Linux_x86_64_setup.sh)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/chinesechesscontrol_v2.0.10_Linux_x86_64_setup.sh/download)
- chinesechesscontrol_v2.0.11_Linux_x86_64_setup.sh
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Linux_x86_64_setup.sh)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Linux_x86_64_setup.sh/download)

- ubuntu
- chinesechesscontrol_v2.0.10_Linux_x86_64_setup.deb
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/chinesechesscontrol_v2.0.10_Linux_x86_64_setup.deb)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/chinesechesscontrol_v2.0.10_Linux_x86_64_setup.deb/download)
- chinesechesscontrol_v2.0.11_Linux_x86_64_setup.deb
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Linux_x86_64_setup.deb)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Linux_x86_64_setup.deb/download)

- Macos
- chinesechesscontrol_v2.0.10_Darwin_x86_64_setup.tar.gz
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/chinesechesscontrol_v2.0.10_Darwin_x86_64_setup.tar.gz)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/chinesechesscontrol_v2.0.10_Darwin_x86_64_setup.tar.gz/download)
- chinesechesscontrol_v2.0.11_Darwin_x86_64_setup.tar.gz
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/chinesechesscontrol_v2.0.11_Darwin_x86_64_setup.tar.gz)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/chinesechesscontrol_v2.0.11_Darwin_x86_64_setup.tar.gz/download)

- Android
- APK
- ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.apk
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.apk)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.apk/download)
- ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.apk
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.apk)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.apk/download)
- ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.apk
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.apk)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.apk/download)
- ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.apk
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.apk)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.apk/download)
- ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.apk
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.apk)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.apk/download)
- ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.apk
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.apk)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.apk/download)
- 开发包
- ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_arm64_v8a_qt6.5.1_Release.zip/download)
- ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_armv7_qt6.5.1_Release.zip/download)
- ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_android_x86_64_qt6.5.1_Release.zip/download)
- ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_arm64_v8a_qt6.5.1_Release.zip/download)
- ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_armv7_qt6.5.1_Release.zip/download)
- ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.zip
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_android_x86_64_qt6.5.1_Release.zip/download)

+ 文档
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.10/ChineseChessControl_v2.0.10_document.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.10/ChineseChessControl_v2.0.10_document.zip/download)
- [从 GITHUB 下载](https://github.com/KangLin/ChineseChessControl/releases/download/v2.0.11/ChineseChessControl_v2.0.11_document.zip)
- [从 Sourceforge 下载](https://sourceforge.net/projects/chinesechesscontrol/files/v2.0.11/ChineseChessControl_v2.0.11_document.zip/download)
+ [在线文档](https://kanglin.github.io/ChineseChessControl/html/index.html)

#### 贡献
Expand Down
2 changes: 1 addition & 1 deletion UI/ActiveX/ChineseChessActiveXCtrl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ END_PROPPAGEIDS(CChineseChessActiveXCtrl)

// 初始化类工厂和 guid

IMPLEMENT_OLECREATE_EX(CChineseChessActiveXCtrl, "ChineseChessActiveX.2.0.10",
IMPLEMENT_OLECREATE_EX(CChineseChessActiveXCtrl, "ChineseChessActiveX.2.0.11",
0xe4e060cb,0xa3aa,0x4278,0xb1,0xed,0xce,0x50,0x20,0xc4,0x2e,0xc7)

// 键入库 ID 和版本
Expand Down
2 changes: 1 addition & 1 deletion UI/ActiveX/ChineseChessActiveXPropPage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ END_MESSAGE_MAP()

// 初始化类工厂和 guid

IMPLEMENT_OLECREATE_EX(CChineseChessActiveXPropPage, "ChineseChessActiveXPropPage.2.0.10",
IMPLEMENT_OLECREATE_EX(CChineseChessActiveXPropPage, "ChineseChessActiveXPropPage.2.0.11",
0x035c7fb0,0x47a0,0x45fb,0xa4,0x5a,0xc2,0x9d,0xcf,0xe9,0xe0,0x01)

// CChineseChessActiveXPropPage::CChineseChessActiveXPropPageFactory::UpdateRegistry -
Expand Down
1 change: 1 addition & 0 deletions UI/MFC/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ if(CMAKE_MFC_FLAG EQUAL 2)
target_compile_definitions(${PROJECT_NAME} PRIVATE "_AFXDLL")
endif()
target_compile_definitions(${PROJECT_NAME} PRIVATE "_AFXEXT" "_WINDLL"
"WIN32" "_WINDOWS"
"_UNICODE" "UNICODE"
$<$<CONFIG:Debug>:_DEBUG DEBUG>
)
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 'v2.0.10.{build}'
version: '2.0.11.{build}'

cache:
- Package
Expand All @@ -10,7 +10,7 @@ environment:
secure: EoBPaPuJ6u9UDYpQWjKhUg==
QT_PASSWORD:
secure: ejAYGgB+3sBispRxUSr0xw==
ChineseChessControl_VERSION: "v2.0.10"
ChineseChessControl_VERSION: "2.0.11"

matrix:
##### msvc 2019 ########
Expand Down
6 changes: 3 additions & 3 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ case ${BUILD_TARGERT} in
esac

if [ -n "$appveyor_build_version" -a -z "$VERSION" ]; then
export VERSION="v2.0.10"
export VERSION="2.0.11"
fi
if [ -z "$VERSION" ]; then
export VERSION="v2.0.10"
export VERSION="2.0.11"
fi
export DEBIAN_VERSION="2.0.10"
export DEBIAN_VERSION="2.0.11"
export UPLOADTOOL_BODY="Release ChineseChess ${VERSION}.<br/> The change see [ChangeLog.md](ChangeLog.md)"
#export UPLOADTOOL_PR_BODY=

Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
chinesechess (2.0.10) stable; urgency=medium
chinesechess (2.0.11) stable; urgency=medium

* Initial Release.

Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: Kang Lin <[email protected]>
Build-Depends: debhelper (>= 6)
Standards-Version:"v2.0.10"
Standards-Version:"2.0.11"
Homepage: https://github.com/KangLin/ChineseChessControl
Vcs-Git: https://github.com/KangLin/ChineseChessControl.git
#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ChineseChessControl.git
Expand Down

0 comments on commit 80db800

Please sign in to comment.