| --- installer-framework-3.2.0/installerfw.pri.orig 2019-12-24 08:11:04.374517300 +0300 |
| +++ installer-framework-3.2.0/installerfw.pri 2019-12-24 08:11:42.049583500 +0300 |
| @@ -126,11 +126,11 @@ |
| |
| DEFINES += NOMINMAX QT_NO_CAST_FROM_ASCII QT_STRICT_ITERATORS QT_USE_QSTRINGBUILDER \ |
| "_GIT_SHA1_=$$GIT_SHA1" \ |
| - IFW_VERSION_STR=$$IFW_VERSION_STR \ |
| - IFW_VERSION=$$IFW_VERSION \ |
| - IFW_VERSION_STR_WIN32=$$IFW_VERSION_STR_WIN32 \ |
| - IFW_VERSION_WIN32=$$IFW_VERSION_WIN32 |
| -DEFINES += IFW_REPOSITORY_FORMAT_VERSION=$$IFW_REPOSITORY_FORMAT_VERSION |
| + IFW_VERSION_STR=\"$$IFW_VERSION_STR\" \ |
| + IFW_VERSION=\"$$IFW_VERSION\" \ |
| + IFW_VERSION_STR_WIN32=\"$$IFW_VERSION_STR_WIN32\" \ |
| + IFW_VERSION_WIN32=\"$$IFW_VERSION_WIN32\" |
| +DEFINES += IFW_REPOSITORY_FORMAT_VERSION=\"$$IFW_REPOSITORY_FORMAT_VERSION\" |
| |
| LIBS += -l7z |
| win32-g++*: LIBS += -lmpr -luuid |
| --- installer-framework-3.2.0/src/sdk/installerbase.rc.orig 2019-12-24 08:42:57.733819600 +0300 |
| +++ installer-framework-3.2.0/src/sdk/installerbase.rc 2019-12-24 08:43:30.462677000 +0300 |
| @@ -1,5 +1,9 @@ |
| #include <windows.h> |
| |
| +#define STRINGIFY_(x) #x |
| +#define STRINGIFY(x) STRINGIFY_(x) |
| +#define IFW_VERSION_STR_WIN32_M STRINGIFY(IFW_VERSION_STR_WIN32) |
| + |
| /* Version info for Windows binary */ |
| VS_VERSION_INFO VERSIONINFO |
| FILEVERSION IFW_VERSION_WIN32 |
| @@ -10,7 +14,7 @@ |
| BEGIN |
| BLOCK "040904B0" |
| BEGIN |
| - VALUE "FileVersion", IFW_VERSION_STR_WIN32 |
| + VALUE "FileVersion", IFW_VERSION_STR_WIN32_M |
| END |
| END |
| END |
