CHANGE: deprecated system/options/module-paths replaced with system/options/modules

Author: Oldes

src/boot/sysobj.reb

@@ -33,6 +33,8 @@ options: object [  ; Options supplied to REBOL during startup
 	boot:           ; The path to the executable
 	path:           ; Where script was started or the startup dir
 	home:           ; Path of home directory
+	data:           ; Path of application data directory
+	modules:        ; Path of extension modules
 		none
 
 	flags:          ; Boot flag bits (see system/catalog/boot-flags)
@@ -51,7 +53,7 @@ options: object [  ; Options supplied to REBOL during startup
 	binary-base: 16    ; Default base for FORMed binary values (64, 16, 2)
 	decimal-digits: 15 ; Max number of decimal digits to print.
 	probe-limit: 16000 ; Max probed output size
-	module-paths: [%./]
+	module-paths: none ;@@ DEPRECATED!
 	default-suffix: %.reb ; Used by IMPORT if no suffix is provided
 	file-types: []
 	mime-types: none

src/mezz/sys-load.reb

@@ -670,11 +670,14 @@ load-module: function [
 ]
 
 locate-extension: function[name [word!]][
-	foreach path system/options/module-paths [
-		file: append to file! name %.rebx
-		if exists? path/:file [ return path/:file ]
-		file: repend to file! name [#"-" system/build/os #"-" system/build/arch %.rebx]
-		if exists? path/:file [ return path/:file ]
+	path: system/options/modules
+	foreach test [
+		[path name %.rebx]
+		[path name #"-" system/build/arch %.rebx]
+		[path name #"-" system/build/os #"-" system/build/arch %.rebx]
+	][
+		if exists? file: as file! ajoin test [return file]
+		sys/log/debug 'REBOL ["Not found extension file:" file]
 	]
 	none
 ]
@@ -739,10 +742,8 @@ import: function [
 		word? module [
 			; Module (as word!) is not loaded already, so let's try to find it.
 			file: append to file! module system/options/default-suffix
-			foreach path system/options/module-paths [
-				if set [name: mod:] apply :load-module [
-					path/:file version ver check sum no-share no-lib /import /as module
-				] [break]
+			set [name: mod:] apply :load-module [
+				system/options/modules/:file version ver check sum no-share no-lib /import /as module
 			]
 			unless name [
 				; try to locate as an extension...

src/mezz/sys-start.reb

@@ -98,6 +98,21 @@ start: func [
 		path                  ; Directory where we started (O: not sure with this one)
 	]
 
+	;- 4. /data - directory of any application data (modules, cache...)
+	data: either system/platform = 'Windows [
+		append dirize to-rebol-file any [get-env "APPDATA" home] %Rebol/
+	][	append copy home %.rebol/]
+
+	;- 5. /modules - directory of extension module files
+	modules: append copy data %modules/
+
+	;; for now keep the old `module-paths`, but let user know, that it's deprecated now!
+	module-paths: does [
+		sys/log/error 'REBOL "`system/options/module-paths` is deprecated and will be removed!"
+		sys/log/error 'REBOL "Use `system/options/modules` as a path to the directory instead!"
+		self/module-paths: reduce [modules]
+	]
+
 	if file? script [ ; Get the path (needed for SECURE setup)
 		script: any [to-real-file script script]
 		script-path: split-path script
@@ -169,6 +184,7 @@ start: func [
 					file throw
 					(path) [allow read]
 					(home) [allow read]
+					(data) [allow read write]
 					(first script-path) allow
 				]
 			]

src/tests/units/module-test.r3

@@ -10,7 +10,8 @@ Rebol [
 
 ; extend module-paths with units/files/ directory
 ; so modules there can be located
-supplement system/options/module-paths join what-dir %units/files/
+orig-modules-dir: system/options/modules
+system/options/modules: join what-dir %units/files/
 
 
 ===start-group=== "module keywords"
@@ -409,3 +410,6 @@ probe all [
 
 ~~~end-file~~~
 
+;restore the original path
+system/options/modules: orig-modules-dir
+