From 09de02514efe866b73c3c146defc1364a28caef5 Mon Sep 17 00:00:00 2001 From: rswindell <> Date: Sat, 20 Sep 2003 07:08:29 +0000 Subject: [PATCH] beta_version is now declared in sbbs.h. Created system.beta_version property, string if alpha or beta version. Versions built from cvs will now be labled as "alpha". --- src/sbbs3/atcodes.cpp | 2 -- src/sbbs3/js_system.c | 11 +++++++++-- src/sbbs3/postmsg.cpp | 2 -- src/sbbs3/sbbs.h | 8 +++++++- src/sbbs3/ver.cpp | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp index 544317f617..d234ebbdd0 100644 --- a/src/sbbs3/atcodes.cpp +++ b/src/sbbs3/atcodes.cpp @@ -38,8 +38,6 @@ #include "sbbs.h" #include "cmdshell.h" -extern "C" const char* beta_version; - /****************************************************************************/ /* Returns 0 if invalid @ code. Returns length of @ code if valid. */ /****************************************************************************/ diff --git a/src/sbbs3/js_system.c b/src/sbbs3/js_system.c index 0bd6b25658..35a6757723 100644 --- a/src/sbbs3/js_system.c +++ b/src/sbbs3/js_system.c @@ -1499,8 +1499,6 @@ static JSClass js_node_class = { ,JS_FinalizeStub /* finalize */ }; -extern const char* beta_version; - JSObject* DLLCALL js_CreateSystemObject(JSContext* cx, JSObject* parent ,scfg_t* cfg, time_t uptime, char* host_name) { @@ -1554,6 +1552,15 @@ JSObject* DLLCALL js_CreateSystemObject(JSContext* cx, JSObject* parent if(!JS_SetProperty(cx, sysobj, "revision", &val)) return(NULL); + SAFECOPY(str,beta_version); + truncsp(str); + if((js_str=JS_NewStringCopyZ(cx, str))==NULL) + return(NULL); + val = STRING_TO_JSVAL(js_str); + if(!JS_SetProperty(cx, sysobj, "beta_version", &val)) + return(NULL); + + sprintf(str,"%s%c%s",VERSION,REVISION,beta_version); truncsp(str); #if defined(_DEBUG) diff --git a/src/sbbs3/postmsg.cpp b/src/sbbs3/postmsg.cpp index 028abf8a71..e1435204a3 100644 --- a/src/sbbs3/postmsg.cpp +++ b/src/sbbs3/postmsg.cpp @@ -37,8 +37,6 @@ #include "sbbs.h" -extern "C" const char* beta_version; - static char* program_id() { static char str[128]; diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h index 520804a553..9782cf869a 100644 --- a/src/sbbs3/sbbs.h +++ b/src/sbbs3/sbbs.h @@ -980,7 +980,7 @@ BOOL md(char *path); /* ver.cpp */ char* socklib_version(char* str); - + /* sortdir.cpp */ int fnamecmp_a(char **str1, char **str2); /* for use with resort() */ int fnamecmp_d(char **str1, char **str2); @@ -1000,6 +1000,12 @@ extern char lastuseron[LEN_ALIAS+1]; /* Name of user last online */ } #endif +extern +#ifdef __cplusplus + "C" +#endif + const char* beta_version; + /* Global data */ #if defined(__FLAT__) || defined(_WIN32) diff --git a/src/sbbs3/ver.cpp b/src/sbbs3/ver.cpp index 5c6df3e1cd..bc55ffeec2 100644 --- a/src/sbbs3/ver.cpp +++ b/src/sbbs3/ver.cpp @@ -37,7 +37,7 @@ #include "sbbs.h" -extern "C" const char* beta_version = " beta"; /* Space if non-beta, " beta" otherwise */ +extern "C" const char* beta_version = " alpha"; /* Space if non-beta, " beta" otherwise */ #if defined(_WINSOCKAPI_) extern WSADATA WSAData; -- GitLab