Switch to preprocessor macro for version

This commit is contained in:
z3APA3A 2017-11-07 21:56:03 +03:00
parent 6e715df9e1
commit d60d00b7b6
3 changed files with 16 additions and 11 deletions

View File

@ -1,6 +1,3 @@
#include "src/version.h"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 0,9,0,0 FILEVERSION 0,9,0,0
PRODUCTVERSION 0,9,0,0 PRODUCTVERSION 0,9,0,0
@ -14,12 +11,12 @@ BEGIN
VALUE "Comments", "3proxy - tiny proxy server, http://3proxy.ru/\0" VALUE "Comments", "3proxy - tiny proxy server, http://3proxy.ru/\0"
VALUE "CompanyName", "Vladimir Dubrovin\0" VALUE "CompanyName", "Vladimir Dubrovin\0"
VALUE "FileDescription", "3proxy - tiny proxy server\0" VALUE "FileDescription", "3proxy - tiny proxy server\0"
VALUE "FileVersion", "0.9-devel-" BUILDDATE "\0" VALUE "FileVersion", "0.9-devel\0"
VALUE "InternalName", "3proxy\0" VALUE "InternalName", "3proxy\0"
VALUE "LegalCopyright", "Copyright (C) 2002-2016 Vladimir Dubrovin\0" VALUE "LegalCopyright", "Copyright (C) 2002-2017 Vladimir Dubrovin\0"
VALUE "OriginalFilename", "3proxy.exe\0" VALUE "OriginalFilename", "3proxy.exe\0"
VALUE "ProductName", "3proxy\0" VALUE "ProductName", "3proxy\0"
VALUE "ProductVersion", "0.9-devel-" BUILDDATE "\0" VALUE "ProductVersion", "0.9-devel\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -449,7 +449,7 @@ int MODULEMAINFUNC (int argc, char** argv){
haveerror = 1; haveerror = 1;
conf.threadinit = 0; conf.threadinit = 0;
#endif #endif
fprintf(stderr, "%s of " VERSION " (" BUILDDATE ")\n" fprintf(stderr, "%s of %s\n"
"Usage: %s options\n" "Usage: %s options\n"
"Available options are:\n" "Available options are:\n"
"%s" "%s"
@ -459,7 +459,9 @@ int MODULEMAINFUNC (int argc, char** argv){
"%s" "%s"
"\tExample: %s -i127.0.0.1\n\n" "\tExample: %s -i127.0.0.1\n\n"
"%s", "%s",
argv[0], argv[0], loghelp, childdef.helpmessage, argv[0], argv[0],
conf.stringtable?conf.stringtable[3]: VERSION " (" BUILDDATE ")",
argv[0], loghelp, childdef.helpmessage, argv[0],
#ifdef STDMAIN #ifdef STDMAIN
copyright copyright
#else #else
@ -480,7 +482,7 @@ int MODULEMAINFUNC (int argc, char** argv){
haveerror = 1; haveerror = 1;
conf.threadinit = 0; conf.threadinit = 0;
#endif #endif
fprintf(stderr, "%s of " VERSION " (" BUILDDATE ")\n" fprintf(stderr, "%s of %s\n"
"Usage: %s options" "Usage: %s options"
" [-e<external_ip>] <port_to_bind>" " [-e<external_ip>] <port_to_bind>"
" <target_hostname> <target_port>\n" " <target_hostname> <target_port>\n"
@ -491,7 +493,9 @@ int MODULEMAINFUNC (int argc, char** argv){
"%s" "%s"
"\tExample: %s -d -i127.0.0.1 6666 serv.somehost.ru 6666\n\n" "\tExample: %s -d -i127.0.0.1 6666 serv.somehost.ru 6666\n\n"
"%s", "%s",
argv[0], argv[0], loghelp, childdef.helpmessage, argv[0], argv[0],
conf.stringtable?conf.stringtable[3]: VERSION " (" BUILDDATE ")",
argv[0], loghelp, childdef.helpmessage, argv[0],
#ifdef STDMAIN #ifdef STDMAIN
copyright copyright
#else #else

View File

@ -1,2 +1,6 @@
#ifndef VERSION
#define VERSION "3proxy-0.9-devel" #define VERSION "3proxy-0.9-devel"
#define BUILDDATE "161224021247" #endif
#ifndef BUILDDATE
#define BUILDDATE __DATE__ ", " __TIME__
#endif