Skip to content

Commit 466e7bf

Browse files
KangLinKangLin
committed
Modify install.nsi
Modify tag.sh
1 parent 063075f commit 466e7bf

File tree

11 files changed

+44
-30
lines changed

11 files changed

+44
-30
lines changed

‎App/MFC/ChineseChess/ChineseChess.rc‎

12 Bytes
Binary file not shown.

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CONFIGURE_FILE(
2222
ADD_CUSTOM_TARGET(uninstall
2323
"${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")
2424

25-
SET(BUILD_VERSION "v1.0.1")
25+
SET(BUILD_VERSION "v1.0.2")
2626
# Find Git Version Patch
2727
IF(EXISTS "${CMAKE_SOURCE_DIR}/.git")
2828
if(NOT GIT)
@@ -171,7 +171,7 @@ add_subdirectory(Src)
171171
option(BUILD_APP_MFC "Build MFC chinese chess applaction" ON)
172172
if(BUILD_APP_MFC AND MSVC)
173173
add_subdirectory(App/MFC/ChineseChess)
174-
endif(BUILD_APP_MFC)
174+
endif()
175175

176176
add_custom_target(install-runtime
177177
COMMAND

‎Install/Install.nsi‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
; HM NIS Edit Wizard helper defines
44
!define PRODUCT_NAME "ChineseChessControl"
5-
!define PRODUCT_VERSION "v1.0.1"
5+
!define PRODUCT_VERSION "v1.0.2"
66
!define PRODUCT_PUBLISHER "KangLin studio"
77
!define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}"
88
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
@@ -159,8 +159,10 @@ SectionEnd
159159

160160
Section -AdditionalIcons
161161
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
162-
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
163162

163+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
164+
IfFileExists "$INSTDIR\bin\ChineseChess.exe" 0 +2
165+
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\ChineseChess.lnk" "$INSTDIR\bin\ChineseChess.exe"
164166
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
165167
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
166168
SectionEnd

‎README.md‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,17 @@
2424
##### 功能
2525
- [x] 中国象棋 ActivX 控件
2626
- [ ] Qt 中国象棋控件
27-
- [ ] 中国象棋博弈库与通信协议
28-
- [ ] 中国象棋程序
29-
+ [ ] 单机版本
30-
+ [ ] 联网版本
27+
- [ ] 中国象棋博弈引擎与通信协议
28+
- [x] 中国象棋程序
29+
+ [x] 单机版本
30+
+ [x] MFC 版本
31+
+ [ ] Qt 版本
32+
+ [ ] 联网版本。欢迎使用本项目库应用到你的中国象棋程序。
33+
34+
*图例：*
35+
36+
+ [x] 表示已完成的功能
37+
+ [ ] 表示尚未完成的功能
3138

3239
[![Build status](https://ci.appveyor.com/api/projects/status/lxs0mxtdl238yrq4?svg=true)](https://ci.appveyor.com/project/KangLin/chinesechesscontrol)
3340

@@ -38,23 +45,23 @@
3845
#### [下载安装包](https://github.com/KangLin/ChineseChessControl/releases/latest)
3946

4047
- windows x86
41-
- [MSVC 2017 x86 v1.0.1](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.1/ChineseChessControl-Setup-msvc1916-x86-v1.0.1.exe)
42-
- [MSVC 2015 x86 v1.0.1](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.1/ChineseChessControl-Setup-msvc1900-x86-v1.0.1.exe)
43-
- [MSVC 2013 x86 v1.0.1](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.1/ChineseChessControl-Setup-msvc1800-x86-v1.0.1.exe)
48+
- [MSVC 2017 x86 v1.0.2](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.2/ChineseChessControl-Setup-msvc1916-x86-v1.0.2.exe)
49+
- [MSVC 2015 x86 v1.0.2](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.2/ChineseChessControl-Setup-msvc1900-x86-v1.0.2.exe)
50+
- [MSVC 2013 x86 v1.0.2](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.2/ChineseChessControl-Setup-msvc1800-x86-v1.0.2.exe)
4451

4552
- windows x86_64
46-
- [MSVC 2019 x86_64 v1.0.1](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.1/ChineseChessControl-Setup-msvc1925-x86_64-v1.0.1.exe)
47-
- [MSVC 2017 x86_64 v1.0.1](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.1/ChineseChessControl-Setup-msvc1916-x86_64-v1.0.1.exe)
48-
- [MSVC 2015 x86_64 v1.0.1](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.1/ChineseChessControl-Setup-msvc1900-x86_64-v1.0.1.exe)
49-
- [MSVC 2013 x86_64 v1.0.1](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.1/ChineseChessControl-Setup-msvc1800-x86_64-v1.0.1.exe)
53+
- [MSVC 2019 x86_64 v1.0.2](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.2/ChineseChessControl-Setup-msvc1925-x86_64-v1.0.2.exe)
54+
- [MSVC 2017 x86_64 v1.0.2](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.2/ChineseChessControl-Setup-msvc1916-x86_64-v1.0.2.exe)
55+
- [MSVC 2015 x86_64 v1.0.2](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.2/ChineseChessControl-Setup-msvc1900-x86_64-v1.0.2.exe)
56+
- [MSVC 2013 x86_64 v1.0.2](https://github.com/KangLin/ChineseChessControl/releases/download/v1.0.2/ChineseChessControl-Setup-msvc1800-x86_64-v1.0.2.exe)
5057

5158
Windows安装包，支持 Windows xp 以上系统。安装完成后，使用请详见：[开发者文档](Documents/Developer.md#调试)
5259

5360
#### 贡献
54-
欢迎大家参与本项目开发，使用本项目。
55-
56-
- [问题与讨论](https://github.com/KangLin/ChineseChessControl/issues)
57-
- [感谢贡献者](https://github.com/KangLin/ChineseChessControl/graphs/contributors)
61+
- 欢迎大家参与本项目开发，共同完成[功能](#功能)列表中未完成的功能。
62+
+ [问题与讨论](https://github.com/KangLin/ChineseChessControl/issues)
63+
+ [感谢贡献者](https://github.com/KangLin/ChineseChessControl/graphs/contributors)
64+
- 使用本项目用于你的项目。
5865

5966
##### 捐赠
6067
本软件如果对你有用，或者你喜欢它，请你捐赠，支持作者。谢谢！

‎Src/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ if(IDL_FOUND)
3838
endif()
3939

4040
if(MSVC)
41+
set(CMAKE_MFC_FLAG 2) # 1：用 MFC 静态库 2： 用 MFC DLL
4142
set(LIBS_DEFINES ${LIBS_DEFINES} "_AFXDLL" "_UNICODE" "UNICODE")
4243
LIST(APPEND RCC_FILES ChineseChessControl.def)
4344
endif()

‎Src/ChineseChessControl.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ END
5151
//
5252

5353
VS_VERSION_INFO VERSIONINFO
54-
FILEVERSION 1,0,1,0
55-
PRODUCTVERSION 0,0,0,0
54+
FILEVERSION 1,0,2,0
55+
FILEVERSION 1,0,2,0
5656
FILEFLAGSMASK 0x3fL
5757
#ifdef _DEBUG
5858
FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
7070
VALUE "Comments", "�й�����ؼ� ���ߣ�����"
7171
VALUE "CompanyName", "���ֹ�����"
7272
VALUE "FileDescription", "�й�����ؼ�"
73-
VALUE "FileVersion", "1,0,1,0"
73+
VALUE "FileVersion", "1,0,2,0"
7474
VALUE "InternalName", "�й�����ؼ�"
7575
VALUE "LegalCopyright", "��Ȩ���� (C) 2004-2020 ���ֹ����ң���������Ȩ����"
7676
VALUE "OriginalFilename", "ChineseChessControl.OCX"
7777
VALUE "ProductName", "�й�����ؼ�"
78-
VALUE "ProductVersion", "1,0,1,0"
78+
VALUE "ProductVersion", "1,0,2,0"
7979
END
8080
END
8181
BLOCK "VarFileInfo"
@@ -106,7 +106,7 @@ CAPTION "
106106
FONT 8, "MS Sans Serif", 0, 0, 0x0
107107
BEGIN
108108
ICON IDI_ABOUTDLL,IDC_STATIC,10,10,21,23
109-
LTEXT "�й�����ؼ�, �汾 1.0.1",IDC_STATIC,40,10,170,8
109+
LTEXT "�й�����ؼ�, �汾 1.0.2",IDC_STATIC,40,10,170,8
110110
LTEXT "��Ȩ (C) 2004, ���ֹ�����",IDC_STATIC,40,40,170,8
111111
DEFPUSHBUTTON "OK",IDOK,222,7,32,14,WS_GROUP
112112
LTEXT "���ߣ����֣�[email protected])",IDC_STATIC,40,25,150,8

‎Src/EnumAndStructAndConst.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#if !defined(ENUMANDSTRUCTANDCONST_H)
1010
#define ENUMANDSTRUCTANDCONST_H
1111

12+
#pragma once
13+
1214
#include "common.h"
1315

1416
typedef enum _ENUM_QiZi{

‎Src/GoRule.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,12 @@ ENUM_ReturnValue CGoRule::ChessRule(int ito, int jto, int ifrom, int jfrom, ENUM
103103
case BShuai:
104104
case RShuai:
105105
return ShuaiRule(ito, jto, ifrom, jfrom, ChessBoard);
106-
break;
107106
case BPao:
108107
case RPao:
109108
return PaoRule(ito, jto, ifrom, jfrom, ChessBoard);
110-
break;
111109
case BBing:
112110
case RBing:
113111
return BingRule(ito, jto, ifrom, jfrom, ChessBoard);
114-
break;
115112
default:
116113
return RETURNFALSE;
117114
}

‎Src/XQCtl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ END_PROPPAGEIDS(CXQCtrl)
7474
/////////////////////////////////////////////////////////////////////////////
7575
// Initialize class factory and guid
7676

77-
IMPLEMENT_OLECREATE_EX(CXQCtrl, "ChineseChessControl.1.0.1",
77+
IMPLEMENT_OLECREATE_EX(CXQCtrl, "ChineseChessControl.1.0.2",
7878
0x71ad322, 0x22ba, 0x45bf, 0x9e, 0x1f, 0x15, 0x4e, 0xfa, 0xf4, 0xe4, 0x2b)
7979

8080

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#TODO: Change version
22

3-
version: 'v1.0.1.{build}'
3+
version: 'v1.0..{build}'
44

55
cache:
66
- model

0 commit comments

Comments
 (0)