Skip to content

Commit

Permalink
Bump version 2.3.0.0 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
@Greedysky
Greedysky committed Jun 26, 2021
1 parent ae0cd54 commit 8d5276d
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 35 deletions.
12 changes: 6 additions & 6 deletions TTKCommon/ttkversion.h
View file
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 2020.07.05
#define OCR_VERSION_STR "2.2.0.0"
#define OCR_VERSION_WSTR L"2.2.0.0"
#define OCR_VER_TIME_STR "(2020/07/05)"
//update time 2021.06.06
#define OCR_VERSION_STR "2.3.0.0"
#define OCR_VERSION_WSTR L"2.3.0.0"
#define OCR_VER_TIME_STR "(2021/06/26)"

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

#define OCR_VERSION 0x02200
#define OCR_VERSION 0x02300

#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
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,0,0
PRODUCTVERSION 2,2,0,0
FILEVERSION 2,3,0,0
PRODUCTVERSION 2,3,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.2.0.0"
VALUE "FileVersion", "2.3.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2021"
VALUE "ProductName", "TTKCore"
VALUE "ProductVersion", "2.2.0.0"
VALUE "ProductVersion", "2.3.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion TTKResource/A_extras/TTKRoutine.sh
View file
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.2.0.0:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$dirpath:$dirpath/lib:$dirpath/2.3.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
View file
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,2,0,0
PRODUCTVERSION 2,2,0,0
FILEVERSION 2,3,0,0
PRODUCTVERSION 2,3,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.2.0.0"
VALUE "FileVersion", "2.3.0.0"
VALUE "InternalName", "TTKOCR.exe"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2021"
VALUE "OriginalFilename", "TTKOCR.exe"
VALUE "ProductName", "TTKOCR"
VALUE "ProductVersion", "2.2.0.0"
VALUE "ProductVersion", "2.3.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKService/TTKService.rc
View file
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,2,0,0
PRODUCTVERSION 2,2,0,0
FILEVERSION 2,3,0,0
PRODUCTVERSION 2,3,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.2.0.0"
VALUE "FileVersion", "2.3.0.0"
VALUE "InternalName", "TTKService.exe"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2021"
VALUE "OriginalFilename", "TTKService.exe"
VALUE "ProductName", "TTKService"
VALUE "ProductVersion", "2.2.0.0"
VALUE "ProductVersion", "2.3.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
12 changes: 6 additions & 6 deletions TTKThirdParty/TTKDumper/ttklogger.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
#define CURRENT_TIME QTime::currentTime().toString("hh:mm:ss:zzz")
#define CURRENT_DATE QDate::currentDate().toString("yyyy-MM-dd")

#define TTK_LOGGER_INFO(str) qDebug() << QString("[Info %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_DEBUG(str) qDebug() << QString("[Debug %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_WARN(str) qDebug() << QString("[Warn %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_TRACE(str) qDebug() << QString("[Trace %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_ERROR(str) qDebug() << QString("[Error %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_FATAL(str) qDebug() << QString("[Fatal %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_INFO(str) qDebug() << QString("[INFO %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_DEBUG(str) qDebug() << QString("[DEBUG %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_WARN(str) qDebug() << QString("[WARN %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_TRACE(str) qDebug() << QString("[TRACE %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_ERROR(str) qDebug() << QString("[ERROR %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str
#define TTK_LOGGER_FATAL(str) qDebug() << QString("[FATAL %1 %2]: ").arg(CURRENT_DATE, CURRENT_TIME) << str

#endif // TTKLOGGER_H
8 changes: 4 additions & 4 deletions TTKThirdParty/TTKExtras/TTKExtras.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,0,0
PRODUCTVERSION 2,2,0,0
FILEVERSION 2,3,0,0
PRODUCTVERSION 2,3,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.2.0.0"
VALUE "FileVersion", "2.3.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2021"
VALUE "ProductName", "TTKExtras"
VALUE "ProductVersion", "2.2.0.0"
VALUE "ProductVersion", "2.3.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions TTKUi/TTKUi.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#endif

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,0,0
PRODUCTVERSION 2,2,0,0
FILEVERSION 2,3,0,0
PRODUCTVERSION 2,3,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.2.0.0"
VALUE "FileVersion", "2.3.0.0"
VALUE "LegalCopyright", "Copyright By Greedysky studio(C)2021"
VALUE "ProductName", "TTKUi"
VALUE "ProductVersion", "2.2.0.0"
VALUE "ProductVersion", "2.3.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
4 changes: 2 additions & 2 deletions TTKVersion.pri
View file
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 2020.07.05
TTKOCR = 2.2.0.0
# update time 2021.06.26
TTKOCR = 2.3.0.0

0 comments on commit 8d5276d

Please sign in to comment.