CHANGE: updated banner and license output

Oldes · Nov 10, 2020 · 42ef0d5 · 42ef0d5
1 parent 77a4122
commit 42ef0d5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/src/boot/sysobj.reb b/src/boot/sysobj.reb
@@ -18,16 +18,11 @@ REBOL [
 
 product:  'core
 
-; Next three fields are updated during build:
+; Next four fields are updated during build:
 platform: none
 version:  0.0.0
-build:    1
-
-license: {Copyright 2012 REBOL Technologies
-REBOL is a trademark of REBOL Technologies
-Licensed under the Apache License, Version 2.0.
-See: http://www.apache.org/licenses/LICENSE-2.0
-}
+build:    0
+license: none
 
 catalog: object [
 	; Static (non-changing) values, blocks, objects

diff --git a/src/mezz/mezz-banner.reb b/src/mezz/mezz-banner.reb
@@ -13,17 +13,19 @@ REBOL [
 
 make-banner: func [
 	"Build startup banner."
-	fmt /local str star spc a b s
+	fmt /local str star spc a b s sf
 ][
 	if string? fmt [return fmt] ; aleady built
-	str: make string! 200
+	str: make string! 2000
 	star: format/pad [$30.107 74 $0] "" #"*"
 
 	spc: format [$30.107 "**" 70 "**" $0] ""
+	sf: [$30.107 "**  " $35 68 $30.107 "**" $0]
 	parse fmt [
 		some [
 			[
-				set a string! (s: format [$30.107 "**  " $35 68 $30.107 "**" $0] a)
+				set a string! (s: format sf a)
+			  | set a block!  (s: format sf ajoin a)
 			  | '= set a [string! | word! | set-word!] [
 			  			b:
 						  path! (b: get b/1)
@@ -49,32 +51,45 @@ if #"/" <> first system/options/home [
 sys/boot-banner: make-banner [
 	*
 	-
-	"REBOL 3.0 (Oldes branch)"
+	["REBOL 3." system/version/2 #"." system/version/3 " (Oldes branch)"]
 	-
 	= Copyright: "2012 REBOL Technologies"
 	= "" "2012-2020 Rebol Open Source Contributors"
 	= "" "Apache 2.0 License, see LICENSE."
 	= Website:  "https://github.com/Oldes/Rebol3"
 	-
-	= Version:  system/version
 	= Platform: [ajoin [system/platform " (" system/build/os ")"]]
 	= Build:    system/build/date
-	= Warning:  "For testing purposes only. Use at your own risk."
 	-
 	= Home:     [to-local-file system/options/home]
 	-
 	*
 ]
 
+system/license: make-banner [
+	*
+	-
+	= Copyright: "2012 REBOL Technologies"
+	= "" "2012-2020 Rebol Open Source Contributors"
+	= "" "Licensed under the Apache License, Version 2.0."
+	= "" "https://www.apache.org/licenses/LICENSE-2.0"
+	-
+	= Notice: "https://github.com/Oldes/Rebol3/blob/master/NOTICE"
+	-
+	*
+]
+
+
 sys/boot-help:
-{^[[1;33;49mImportant notes^[[0m:
+{^[[1;33mImportant notes^[[0m:
 
   * Sandbox and security are not fully available.
   * Direct access to TCP HTTP required (no proxies).
+  * Use at your own risk.
 
-^[[1;33;49mSpecial functions^[[0m:
+^[[1;33mSpecial functions^[[0m:
 
-  ^[[1;32;49mHelp^[[0m  - show built-in help information
+  ^[[1;32mHelp^[[0m  - show built-in help information
 }
 
 ;print make-banner boot-banner halt