diff --git a/Common/base.pri b/Common/base.pri index c38101edab..0a5a356bb9 100644 --- a/Common/base.pri +++ b/Common/base.pri @@ -11,6 +11,9 @@ BUILD_NUMBER = $$(BUILD_NUMBER) DEFINES += INTVER=$$VERSION +WIN_VERSION = $$replace(VERSION, \., ",") +DEFINES += WIN_INTVER=$$WIN_VERSION + PUBLISHER_NAME = $$(PUBLISHER_NAME) isEmpty(PUBLISHER_NAME){ PUBLISHER_NAME = $$cat(copyright.txt) @@ -36,6 +39,8 @@ win32 { CURRENT_YEAR = $$system(date +%Y) } +DEFINES += COPYRIGHT_YEAR=$${CURRENT_YEAR} + QMAKE_TARGET_COMPANY = $$PUBLISHER_NAME QMAKE_TARGET_COPYRIGHT = Copyright (C) $${PUBLISHER_NAME} $${CURRENT_YEAR}. All rights reserved diff --git a/DesktopEditor/doctrenderer/app_builder/docbuilder.pro b/DesktopEditor/doctrenderer/app_builder/docbuilder.pro index 7bcdd05fec..e414a3f70d 100644 --- a/DesktopEditor/doctrenderer/app_builder/docbuilder.pro +++ b/DesktopEditor/doctrenderer/app_builder/docbuilder.pro @@ -5,18 +5,6 @@ TARGET = docbuilder CONFIG += console CONFIG -= app_bundle -PRODUCT_VERSION=$$(PRODUCT_VERSION) -BUILD_NUMBER=$$(BUILD_NUMBER) - -isEmpty(PRODUCT_VERSION) { - BINARYVERSION = 0.0.0.0 -} -else { - BINARYVERSION = $$(PRODUCT_VERSION).$$(BUILD_NUMBER) -} - -DEFINES += INTVER=$$BINARYVERSION - TEMPLATE = app CORE_ROOT_DIR = $$PWD/../../../../core diff --git a/DesktopEditor/doctrenderer/app_builder/version.h b/DesktopEditor/doctrenderer/app_builder/version.h index 9dd5387df8..8022bac07e 100644 --- a/DesktopEditor/doctrenderer/app_builder/version.h +++ b/DesktopEditor/doctrenderer/app_builder/version.h @@ -1,14 +1,17 @@ #ifndef VERSION_H #define VERSION_H -#define VER_FILEVERSION 1,0,0,2 -#define VER_FILEVERSION_STR "1.0.0.2\0" +#define VER_STRINGIFY(d) #d +#define TO_STR(v) VER_STRINGIFY(v) + +#define VER_FILEVERSION WIN_INTVER +#define VER_FILEVERSION_STR TO_STR(WIN_INTVER)"\0" #define VER_PRODUCTVERSION VER_FILEVERSION #define VER_PRODUCTVERSION_STR "1.0\0" #define VER_COMPANYNAME_STR "Ascensio System SIA\0" -#define VER_LEGALCOPYRIGHT_STR "Ascensio System SIA 2016\0" +#define VER_LEGALCOPYRIGHT_STR "Ascensio System SIA " TO_STR(COPYRIGHT_YEAR) "\0" #define VER_COMPANYDOMAIN_STR "www.onlyoffice.com\0" #define ABOUT_COPYRIGHT_STR VER_LEGALCOPYRIGHT_STR