mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added FREERDP/WINPR prefix to define GIT_REVISION

Browse Source
This commit is contained in:
Armin Novak 2021-05-18 12:31:59 +02:00 committed by akallabeth
parent 2b19576fc7
commit 6f2c6625e4
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/common/cmdline.c
View File

@ -270,7 +270,7 @@ static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, U
BOOL freerdp_client_print_version(void) BOOL freerdp_client_print_version(void)
{ {
printf("This is FreeRDP version %s (%s)\n", FREERDP_VERSION_FULL, GIT_REVISION); printf("This is FreeRDP version %s (%s)\n", FREERDP_VERSION_FULL, FREERDP_GIT_REVISION);
return TRUE; return TRUE;
} }

2
client/iOS/Misc/Utils.m
View File

@ -247,7 +247,7 @@ NSMutableArray *FilterHistory(NSArray *history, NSString *filterStr)
#pragma mark Version Info #pragma mark Version Info
NSString *TSXAppFullVersion() NSString *TSXAppFullVersion()
{ {
return [NSString stringWithUTF8String:GIT_REVISION]; return [NSString stringWithUTF8String:FREERDP_GIT_REVISION];
} }
#pragma mark iPad/iPhone detection #pragma mark iPad/iPhone detection

2
include/freerdp/version.h.in
View File

@ -27,6 +27,6 @@
#define FREERDP_API_VERSION "${FREERDP_API_VERSION}" #define FREERDP_API_VERSION "${FREERDP_API_VERSION}"
#define FREERDP_VERSION "${FREERDP_VERSION}" #define FREERDP_VERSION "${FREERDP_VERSION}"
#define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}" #define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}"
#define GIT_REVISION "${GIT_REVISION}" #define FREERDP_GIT_REVISION "${GIT_REVISION}"
#endif /* FREERDP_VERSION_H */ #endif /* FREERDP_VERSION_H */

2
libfreerdp/core/freerdp.c
View File

@ -524,7 +524,7 @@ const char* freerdp_get_build_config(void)
const char* freerdp_get_build_revision(void) const char* freerdp_get_build_revision(void)
{ {
return GIT_REVISION; return FREERDP_GIT_REVISION;
} }
static wEventType FreeRDP_Events[] = { static wEventType FreeRDP_Events[] = {

2
libfreerdp/core/test/TestVersion.c
View File

@ -30,7 +30,7 @@ int TestVersion(int argc, char* argv[])
if (!git) if (!git)
return -1; return -1;
if (strncmp(git, GIT_REVISION, sizeof(GIT_REVISION))) if (strncmp(git, FREERDP_GIT_REVISION, sizeof(FREERDP_GIT_REVISION)))
return -1; return -1;
build = freerdp_get_build_config(); build = freerdp_get_build_config();

2
server/proxy/freerdp_proxy.c
View File

@ -88,7 +88,7 @@ int main(int argc, char* argv[])
WLog_INFO(TAG, "freerdp-proxy version info:"); WLog_INFO(TAG, "freerdp-proxy version info:");
WLog_INFO(TAG, "\tFreeRDP version: %s", FREERDP_VERSION_FULL); WLog_INFO(TAG, "\tFreeRDP version: %s", FREERDP_VERSION_FULL);
WLog_INFO(TAG, "\tGit commit: %s", GIT_REVISION); WLog_INFO(TAG, "\tGit commit: %s", FREERDP_GIT_REVISION);
WLog_DBG(TAG, "\tBuild config: %s", freerdp_get_build_config()); WLog_DBG(TAG, "\tBuild config: %s", freerdp_get_build_config());
if (argc >= 2) if (argc >= 2)

2
server/shadow/shadow_server.c
View File

@ -124,7 +124,7 @@ int shadow_server_command_line_status_print(rdpShadowServer* server, int argc, c
if (status == COMMAND_LINE_STATUS_PRINT_VERSION) if (status == COMMAND_LINE_STATUS_PRINT_VERSION)
{ {
WLog_INFO(TAG, "FreeRDP version %s (git %s)", FREERDP_VERSION_FULL, GIT_REVISION); WLog_INFO(TAG, "FreeRDP version %s (git %s)", FREERDP_VERSION_FULL, FREERDP_GIT_REVISION);
return COMMAND_LINE_STATUS_PRINT_VERSION; return COMMAND_LINE_STATUS_PRINT_VERSION;
} }
else if (status == COMMAND_LINE_STATUS_PRINT_BUILDCONFIG) else if (status == COMMAND_LINE_STATUS_PRINT_BUILDCONFIG)

2
winpr/include/winpr/version.h.in
View File

@ -27,6 +27,6 @@
#define WINPR_API_VERSION "${WINPR_API_VERSION}" #define WINPR_API_VERSION "${WINPR_API_VERSION}"
#define WINPR_VERSION "${WINPR_VERSION}" #define WINPR_VERSION "${WINPR_VERSION}"
#define WINPR_VERSION_FULL "${WINPR_VERSION_FULL}" #define WINPR_VERSION_FULL "${WINPR_VERSION_FULL}"
#define GIT_REVISION "${GIT_REVISION}" #define WINPR_GIT_REVISION "${GIT_REVISION}"
#endif // _WINPR_VERSION_H_ #endif // _WINPR_VERSION_H_

2
winpr/libwinpr/utils/test/TestVersion.c
View File

@ -33,7 +33,7 @@ int TestVersion(int argc, char* argv[])
if (!git) if (!git)
return -1; return -1;
if (strncmp(git, GIT_REVISION, sizeof(GIT_REVISION))) if (strncmp(git, WINPR_GIT_REVISION, sizeof(WINPR_GIT_REVISION)))
return -1; return -1;
build = winpr_get_build_config(); build = winpr_get_build_config();

2
winpr/libwinpr/utils/winpr.c
View File

@ -53,7 +53,7 @@ const char* winpr_get_version_string(void)
const char* winpr_get_build_revision(void) const char* winpr_get_build_revision(void)
{ {
return GIT_REVISION; return WINPR_GIT_REVISION;
} }
const char* winpr_get_build_config(void) const char* winpr_get_build_config(void)