From f02592d1263d70ecba9cad78686c007a7404f195 Mon Sep 17 00:00:00 2001 From: orgin Date: Wed, 13 Apr 2022 11:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8help=E4=B8=AD=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=8F=82=E6=95=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node/node.go | 7 ++++++- util/buildtime/build.go | 41 ++--------------------------------------- 2 files changed, 8 insertions(+), 40 deletions(-) diff --git a/node/node.go b/node/node.go index 8c5d058..1af2a81 100644 --- a/node/node.go +++ b/node/node.go @@ -54,7 +54,12 @@ func usage(val interface{}) error{ return nil } - fmt.Fprintf(os.Stderr, "Welcome to Origin(build time: %s)\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n",buildtime.GetBuildDateTime()) + if len(buildtime.GetBuildDateTime())>0 { + fmt.Fprintf(os.Stderr, "Welcome to Origin(build info: %s)\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n",buildtime.GetBuildDateTime()) + }else{ + fmt.Fprintf(os.Stderr, "Welcome to Origin\nUsage: originserver [-help] [-start node=1] [-stop] [-config path] [-pprof 0.0.0.0:6060]...\n") + } + console.PrintDefaults() return nil } diff --git a/util/buildtime/build.go b/util/buildtime/build.go index 6b7dc4c..9af843d 100644 --- a/util/buildtime/build.go +++ b/util/buildtime/build.go @@ -1,45 +1,8 @@ package buildtime -/* -#include +var BuildTime string -#define OS_YEAR ((((__DATE__ [7] - '0') * 10 + (__DATE__ [8] - '0')) * 10 \ - + (__DATE__ [9] - '0')) * 10 + (__DATE__ [10] - '0')) - -// Retrieve month info -#define OS_MONTH (__DATE__ [2] == 'n' ? (__DATE__ [1] == 'a' ? 1 : 6) \ - : __DATE__ [2] == 'b' ? 2 \ - : __DATE__ [2] == 'r' ? (__DATE__ [0] == 'M' ? 3 : 4) \ - : __DATE__ [2] == 'y' ? 5 \ - : __DATE__ [2] == 'l' ? 7 \ - : __DATE__ [2] == 'g' ? 8 \ - : __DATE__ [2] == 'p' ? 9 \ - : __DATE__ [2] == 't' ? 10 \ - : __DATE__ [2] == 'v' ? 11 : 12) - -// Retrieve day info -#define OS_DAY ((__DATE__ [4] == ' ' ? 0 : __DATE__ [4] - '0') * 10 \ - + (__DATE__ [5] - '0')) - -// Retrieve hour info -#define OS_HOUR ((__TIME__ [0] - '0') * 10 + (__TIME__ [1] - '0')) - -// Retrieve minute info -#define OS_MINUTE ((__TIME__ [3] - '0') * 10 + (__TIME__ [4] - '0')) - -// Retrieve second info -#define OS_SECOND ((__TIME__ [6] - '0') * 10 + (__TIME__ [7] - '0')) - - -char* GetBuildTime() -{ - static char buffer[16] = {0}; - snprintf(buffer, 16,"%04d%02d%02d%02d%02d%02d", OS_YEAR, OS_MONTH, OS_DAY, OS_HOUR, OS_MINUTE, OS_SECOND); - return buffer; -} -*/ -import "C" func GetBuildDateTime() string { - return C.GoString(C.GetBuildTime()) + return BuildTime }