Skip to content

Commit

Permalink
Bump version 2.4.0.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
Greedysky committed Jan 29, 2022
1 parent 1d4451c commit efa5df9
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 30 deletions.
14 changes: 7 additions & 7 deletions TTKCommon/ttkversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
* with this program; If not, see <http://www.gnu.org/licenses/>.
***************************************************************************/

//update time 2021.10.27
#define OCR_VERSION_STR "2.3.1.0"
#define OCR_VERSION_WSTR L"2.3.1.0"
#define OCR_VER_TIME_STR "(2021/10/27)"
//update time 2022.01.29
#define OCR_VERSION_STR "2.4.0.0"
#define OCR_VERSION_WSTR L"2.4.0.0"
#define OCR_VER_TIME_STR "(2022/01/29)"

#define OCR_MAJOR_VERSION 2
#define OCR_MIDLE_VERSION 3
#define OCR_MINOR_VERSION 1
#define OCR_MIDLE_VERSION 4
#define OCR_MINOR_VERSION 0
#define OCR_PATCH_VERSION 0

#define OCR_VERSION 0x02310
#define OCR_VERSION 0x02400

#define TTK_VERSION_CHECK(major, middle, minor, patch) ((major<<12)|(middle<<8)|(minor<<4)|(patch))

Expand Down
8 changes: 4 additions & 4 deletions TTKModule/TTKCore.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,4,0,0
PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "TTKCore"
VALUE "FileVersion", "2.3.1.0"
VALUE "FileVersion", "2.4.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022"
VALUE "ProductName", "TTKCore"
VALUE "ProductVersion", "2.3.1.0"
VALUE "ProductVersion", "2.4.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion TTKResource/A_extras/TTKRoutine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [ "${dirpath%$tmp}" != "/" ]; then
fi
LD_LIBRARY_PATH=$dirpath

export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.3.1.0:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.4.0.0:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$dirpath/plugins:$QT_PLUGIN_PATH

$appname "$@"
8 changes: 4 additions & 4 deletions TTKRun/TTKApp/TTKApp.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
IDI_ICON1 ICON DISCARDABLE "../../TTKResource/lb_app_logo.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,4,0,0
PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -27,12 +27,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "TTKOCR"
VALUE "FileVersion", "2.3.1.0"
VALUE "FileVersion", "2.4.0.0"
VALUE "InternalName", "TTKOCR.exe"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022"
VALUE "OriginalFilename", "TTKOCR.exe"
VALUE "ProductName", "TTKOCR"
VALUE "ProductVersion", "2.3.1.0"
VALUE "ProductVersion", "2.4.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKService/TTKService.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
IDI_ICON1 ICON DISCARDABLE "../TTKResource/lb_app_logo.ico"

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,4,0,0
PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -27,12 +27,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "TTKService"
VALUE "FileVersion", "2.3.1.0"
VALUE "FileVersion", "2.4.0.0"
VALUE "InternalName", "TTKService.exe"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022"
VALUE "OriginalFilename", "TTKService.exe"
VALUE "ProductName", "TTKService"
VALUE "ProductVersion", "2.3.1.0"
VALUE "ProductVersion", "2.4.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKThirdParty/TTKExtras/TTKExtras.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,4,0,0
PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "TTKExtras"
VALUE "FileVersion", "2.3.1.0"
VALUE "FileVersion", "2.4.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022"
VALUE "ProductName", "TTKExtras"
VALUE "ProductVersion", "2.3.1.0"
VALUE "ProductVersion", "2.4.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKUi/TTKUi.rc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,1,0
PRODUCTVERSION 2,3,1,0
FILEVERSION 2,4,0,0
PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL

#ifdef _DEBUG
Expand All @@ -25,10 +25,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Greedysky studio, Ltd."
VALUE "FileDescription", "TTKUi"
VALUE "FileVersion", "2.3.1.0"
VALUE "FileVersion", "2.4.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2022"
VALUE "ProductName", "TTKUi"
VALUE "ProductVersion", "2.3.1.0"
VALUE "ProductVersion", "2.4.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions TTKVersion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ MOC_DIR = ./.build/moc
OBJECTS_DIR = ./.build/obj
RCC_DIR = ./.build/rcc

# update time 2021.10.27
TTKOCR = 2.3.1.0
# update time 2022.01.29
TTKOCR = 2.4.0.0

0 comments on commit efa5df9

Please sign in to comment.