Added version to client log, removed build_date
This commit is contained in:
parent
db02de2d8b
commit
d4ae65dbb5
@ -73,8 +73,6 @@ public class LibFreeRDP
|
||||
|
||||
private static native String freerdp_get_version();
|
||||
|
||||
private static native String freerdp_get_build_date();
|
||||
|
||||
private static native String freerdp_get_build_revision();
|
||||
|
||||
private static native String freerdp_get_build_config();
|
||||
|
@ -1029,11 +1029,6 @@ static jstring JNICALL jni_freerdp_get_version(JNIEnv* env, jclass cls)
|
||||
return (*env)->NewStringUTF(env, freerdp_get_version_string());
|
||||
}
|
||||
|
||||
static jstring JNICALL jni_freerdp_get_build_date(JNIEnv* env, jclass cls)
|
||||
{
|
||||
return (*env)->NewStringUTF(env, freerdp_get_build_date());
|
||||
}
|
||||
|
||||
static jstring JNICALL jni_freerdp_get_build_revision(JNIEnv* env, jclass cls)
|
||||
{
|
||||
return (*env)->NewStringUTF(env, freerdp_get_build_revision());
|
||||
@ -1047,7 +1042,6 @@ static jstring JNICALL jni_freerdp_get_build_config(JNIEnv* env, jclass cls)
|
||||
static JNINativeMethod methods[] = {
|
||||
{ "freerdp_get_jni_version", "()Ljava/lang/String;", &jni_freerdp_get_jni_version },
|
||||
{ "freerdp_get_version", "()Ljava/lang/String;", &jni_freerdp_get_version },
|
||||
{ "freerdp_get_build_date", "()Ljava/lang/String;", &jni_freerdp_get_build_date },
|
||||
{ "freerdp_get_build_revision", "()Ljava/lang/String;", &jni_freerdp_get_build_revision },
|
||||
{ "freerdp_get_build_config", "()Ljava/lang/String;", &jni_freerdp_get_build_config },
|
||||
{ "freerdp_get_last_error_string", "(J)Ljava/lang/String;",
|
||||
|
@ -233,7 +233,7 @@ int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc,
|
||||
if (!freerdp_client_settings_post_process(settings))
|
||||
status = -1;
|
||||
|
||||
WLog_DBG(TAG, "This is %s", freerdp_get_build_config());
|
||||
WLog_DBG(TAG, "This is %s %s", freerdp_get_version_string(), freerdp_get_build_config());
|
||||
return status;
|
||||
}
|
||||
|
||||
|
@ -3427,7 +3427,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
|
||||
}
|
||||
|
||||
static BOOL freerdp_client_load_static_channel_addin(rdpChannels* channels, rdpSettings* settings,
|
||||
char* name, void* data)
|
||||
const char* name, void* data)
|
||||
{
|
||||
PVIRTUALCHANNELENTRY entry = NULL;
|
||||
PVIRTUALCHANNELENTRYEX entryEx = NULL;
|
||||
|
@ -460,7 +460,6 @@ extern "C"
|
||||
|
||||
FREERDP_API void freerdp_get_version(int* major, int* minor, int* revision);
|
||||
FREERDP_API const char* freerdp_get_version_string(void);
|
||||
FREERDP_API const char* freerdp_get_build_date(void);
|
||||
FREERDP_API const char* freerdp_get_build_revision(void);
|
||||
FREERDP_API const char* freerdp_get_build_config(void);
|
||||
|
||||
|
@ -511,12 +511,6 @@ const char* freerdp_get_version_string(void)
|
||||
return FREERDP_VERSION_FULL;
|
||||
}
|
||||
|
||||
const char* freerdp_get_build_date(void)
|
||||
{
|
||||
static char build_date[] = __DATE__ " " __TIME__;
|
||||
return build_date;
|
||||
}
|
||||
|
||||
const char* freerdp_get_build_config(void)
|
||||
{
|
||||
static const char build_config[] =
|
||||
|
@ -33,11 +33,6 @@ int TestVersion(int argc, char* argv[])
|
||||
if (strncmp(git, GIT_REVISION, sizeof(GIT_REVISION)))
|
||||
return -1;
|
||||
|
||||
build = freerdp_get_build_date();
|
||||
|
||||
if (!build)
|
||||
return -1;
|
||||
|
||||
build = freerdp_get_build_config();
|
||||
|
||||
if (!build)
|
||||
|
@ -78,7 +78,6 @@
|
||||
|
||||
WINPR_API void winpr_get_version(int* major, int* minor, int* revision);
|
||||
WINPR_API const char* winpr_get_version_string(void);
|
||||
WINPR_API const char* winpr_get_build_date(void);
|
||||
WINPR_API const char* winpr_get_build_revision(void);
|
||||
WINPR_API const char* winpr_get_build_config(void);
|
||||
|
||||
|
@ -36,11 +36,6 @@ int TestVersion(int argc, char* argv[])
|
||||
if (strncmp(git, GIT_REVISION, sizeof(GIT_REVISION)))
|
||||
return -1;
|
||||
|
||||
build = winpr_get_build_date();
|
||||
|
||||
if (!build)
|
||||
return -1;
|
||||
|
||||
build = winpr_get_build_config();
|
||||
|
||||
if (!build)
|
||||
|
@ -51,13 +51,6 @@ const char* winpr_get_version_string(void)
|
||||
return WINPR_VERSION_FULL;
|
||||
}
|
||||
|
||||
const char* winpr_get_build_date(void)
|
||||
{
|
||||
static char build_date[] = __DATE__ " " __TIME__;
|
||||
|
||||
return build_date;
|
||||
}
|
||||
|
||||
const char* winpr_get_build_revision(void)
|
||||
{
|
||||
return GIT_REVISION;
|
||||
|
Loading…
Reference in New Issue
Block a user