CHANGE: modified version info

Oldes · Feb 10, 2023 · 759609a · 759609a
1 parent 937c972
commit 759609a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 9 deletions.
diff --git a/make/pre-make.r3 b/make/pre-make.r3
@@ -220,7 +220,7 @@ try/except [
 ][ git-commit: none]
 
 str-version: reform [
- "Rebol" ; probably always same
+ "Rebol"  ; probably always same
  product ; like Core, View, etc...
  version ; triple value product version
  platform ; Linux, Windows, macOS, Android...
@@ -236,6 +236,13 @@ str-version: reform [
  get-libc-version ;; musl, glibc_2.28,... or just none
 ]
 
+
+short-str-version: next ajoin [{
+Rebol/} product SP version SP format-date-time now/utc "(yyyy-MM-dd hh:mm:ss UTC)" {
+Copyright (c) 2012 REBOL Technologies
+Copyright (c) 2012-} now/year { Rebol Open Source Contributors
+Source: https://github.com/Oldes/Rebol3}]
+
 ver3: version ver3/4: none ; trimmed version to just 3 parts
 lib-version: version/1
 

diff --git a/make/tools/make-boot.reb b/make/tools/make-boot.reb
@@ -3,6 +3,7 @@ REBOL [
  Title: "Make primary boot files"
  Rights: {
  Copyright 2012 REBOL Technologies
+ Copyright 2012-2023 Rebol Open Source Contributors
  REBOL is a trademark of REBOL Technologies
  }
  License: {
@@ -548,8 +549,9 @@ emit [{
 #define REBOL_UPD } any [version/3 0] {
 #define REBOL_SYS } any [version/4 0] {
 #define REBOL_VAR } any [version/5 0] {
-#define REBOL_VERSION "} str-version {"
-}]
+// Version visible when used -v argument on start-up (before initialization)
+#define REBOL_VERSION \} string-to-c short-str-version
+]
 
 ;-- Generate Lower-Level String Table ----------------------------------------
 

diff --git a/make/tools/utils.reb b/make/tools/utils.reb
@@ -113,6 +113,16 @@ binary-to-c: func [comp-data /local out data] [
  head out
 ]
 
+string-to-c: func[str /local out][
+ out: copy ""
+ foreach line split str lf [
+ replace/all line #"^"" {\"}
+ append out ajoin [{^/^-"} line {\n"\}] 
+ ]
+ take/last out ;; removes the last slash
+ out
+]
+
 get-libc-version: function[][
  tmp: copy ""
  num: system/catalog/bitsets/numeric

diff --git a/src/core/b-init.c b/src/core/b-init.c
@@ -122,6 +122,7 @@ extern const REBYTE Str_Banner[];
 {
  if (rargs->options & RO_VERS) {
  Out_Str(cb_cast(REBOL_VERSION), 0, FALSE);
+ Out_Str(cb_cast("\n"), 0, FALSE);
  OS_EXIT(0);
  }
 }
@@ -366,10 +367,16 @@ extern const REBYTE Str_Banner[];
 /*
 // version: native [
 // "Return Rebol version string"
+// /data "loadable version"
 // ]
 ***********************************************************************/
 {
- const REBYTE*version = BOOT_STR(RS_VERSION, 0);
+ const REBYTE*version;
+ if (D_REF(1)) {
+ version = BOOT_STR(RS_VERSION, 0);
+ } else {
+ version = cb_cast(REBOL_VERSION);
+ }
  Set_String(ds, Copy_Bytes(version, LEN_BYTES(version)));
  return R_RET;
 }

diff --git a/src/mezz/mezz-banner.reb b/src/mezz/mezz-banner.reb
@@ -3,7 +3,7 @@ REBOL [
  Title: "REBOL 3 Mezzanine: Startup Banner"
  Rights: {
  Copyright 2012 REBOL Technologies
- Copyright 2012-2022 Rebol Open Source Developers
+ Copyright 2012-2023 Rebol Open Source Developers
  REBOL is a trademark of REBOL Technologies
  }
  License: {
@@ -55,7 +55,7 @@ sys/boot-banner: make-banner [
  ["REBOL/" system/product #" " system/version " (Oldes branch)"]
  -
  = Copyright: "2012 REBOL Technologies"
- = "" "2012-2022 Rebol Open Source Contributors"
+ = "" "2012-2023 Rebol Open Source Contributors"
  = "" "Apache 2.0 License, see LICENSE."
  = Website: "https://github.com/Oldes/Rebol3"
  -

diff --git a/src/mezz/sys-start.reb b/src/mezz/sys-start.reb
@@ -3,6 +3,7 @@ REBOL [
  Title: "REBOL 3 Boot Sys: Startup"
  Rights: {
  Copyright 2012 REBOL Technologies
+ Copyright 2012-2023 Rebol Open Source Contributors
  REBOL is a trademark of REBOL Technologies
  }
  License: {
@@ -33,7 +34,7 @@ start: func [
  start: 'done ; only once
  init-schemes ; only once
 
- ver: load/as lib/version 'unbound
+ ver: load/as lib/version/data 'unbound
  system/product: ver/2
  system/version: ver/3
  system/platform: ver/4
@@ -46,6 +47,7 @@ start: func [
  system/build/target: ver/11
  system/build/date: ver/12
  system/build/git: ver/13
+ system/build/libc: ver/14
 
  if flags/verbose [system/options/log/rebol: 3] ;maximum log output for system messages
 
@@ -55,8 +57,7 @@ start: func [
  any [flags/verbose flags/usage flags/help]
  ][
  ; basic boot banner only
- prin "^/ "
- print boot-banner: form ver
+ print boot-banner: lib/version
  ]
  if any [do-arg script] [quiet: true]