Skip to content

Commit 6416be5

Browse files
OldesOldes
committed
CHANGE: Migrate extensions: *.r => *.reb & *.rx => *.rebx
This change was proposed years ago by @onetom in rebol#140 and I agree, that the `.r` extension is lost in this century and so lets start with the new one. I'm personally still preferring `.r3` for run-able scripts which requires Rebol3. (cherry picked from commit 298ee37)
1 parent f5a4682 commit 6416be5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+2760
-301
lines changed

‎.gitignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ make/host.exe
77
make/libr3.so
88
make/libr3.dll
99
make/Rebol3.xcworkspace/
10-
src/boot/boot-code.r
11-
src/boot/host-init.r
12-
src/boot/tmp-natives.r
13-
src/boot/tmp-symbols.r
10+
src/boot/boot-code.reb
11+
src/boot/host-init.reb
12+
src/boot/tmp-natives.reb
13+
src/boot/tmp-symbols.reb
1414
src/core/b-boot.c
1515
src/include/ext-types.h
1616
src/include/host-*
@@ -22,7 +22,7 @@ src/include/reb-types.h
2222
src/include/tmp-*
2323
src/tools/reb-lib-doc.txt
2424
src/reb-lib-doc.txt
25-
src/mezz/base-collected.r
25+
src/mezz/base-collected.reb
2626

2727
src/tests/httpd-root/logs/
2828

‎make/make.r3

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if error? set/any 'err try [
66
TOOLS-Win32: ""
77
TOOLS-Win64: ""
88

9-
attempt [do %make-settings.r]
9+
attempt [do %make-settings.reb]
1010

1111
cmd-menu: {^/^[[1;33;49mPlease choose version to build:^[[0m^/}
1212

@@ -114,7 +114,7 @@ forever [
114114
]
115115

116116
if val [
117-
eval-cmd [rebol-tool " -qs ../src/tools/make-make.r " OS_ID]
117+
eval-cmd [rebol-tool " -qs ../src/tools/make-make.reb " OS_ID]
118118
if prev <> val [
119119
;clean if making different target or for the first run
120120
eval-cmd [{make TOOLS=} TOOLS { clean}]

‎make/makefile

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# REBOL Makefile -- Generated by make-make.r (do not edit) on 27-Oct-2017/16:34:34+2:00
1+
# REBOL Makefile -- Generated by make-make.reb (do not edit) on 27-Oct-2017/16:34:34+2:00
22
# This makefile is intentional kept simple to make builds possible on
33
# a wider range of target platforms.
44

55
# To regenerate this file:
66
# make make
77

8-
# To generate this file for a different platform, check systems.r file
8+
# To generate this file for a different platform, check systems.reb file
99
# and provide an OS_ID (from the systems table). Linux 2.5 for example:
1010
# make make OS_ID=0.4.3
1111

@@ -68,7 +68,7 @@ update:
6868
-cd $(UP)/; cvs -q update src
6969

7070
make:
71-
$(REBOL) $T/make-make.r $(OS_ID)
71+
$(REBOL) $T/make-make.reb $(OS_ID)
7272

7373
clean:
7474
$(RM) libr3$(LIB_SUFFIX) objs $(RES)
@@ -81,12 +81,12 @@ all:
8181
$(MAKE) host$(BIN_SUFFIX)
8282

8383
prep:
84-
$(REBOL) $T/make-headers.r
85-
$(REBOL) $T/make-boot.r $(OS_ID)
86-
$(REBOL) $T/make-host-init.r
87-
$(REBOL) $T/make-os-ext.r # ok, but not always
88-
$(REBOL) $T/make-host-ext.r
89-
$(REBOL) $T/make-reb-lib.r
84+
$(REBOL) $T/make-headers.reb
85+
$(REBOL) $T/make-boot.reb $(OS_ID)
86+
$(REBOL) $T/make-host-init.reb
87+
$(REBOL) $T/make-os-ext.reb # ok, but not always
88+
$(REBOL) $T/make-host-ext.reb
89+
$(REBOL) $T/make-reb-lib.reb
9090

9191
### Provide more info if make fails due to no local Rebol build tool:
9292
tmps: $S/include/tmp-bootdefs.h
@@ -116,13 +116,13 @@ testdo:
116116

117117
test:
118118
$(CP) r3$(BIN_SUFFIX) $(UP)/src/tests/
119-
$(R3) $S/tests/test.r
119+
$(R3) $S/tests/test.reb
120120

121121
install:
122122
sudo cp r3$(BIN_SUFFIX) /usr/local/bin
123123

124124
ship:
125-
$(R3) $S/tools/upload.r
125+
$(R3) $S/tools/upload.reb
126126

127127
build: libr3$(LIB_SUFFIX)
128128
$(R3) $S/tools/make-build.r
@@ -194,8 +194,8 @@ host$(BIN_SUFFIX): $(HOST) $(RES)
194194
@echo "export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH"
195195

196196
### File build targets:
197-
b-boot.c: $(SRC)/boot/boot.r
198-
$(REBOL) -sqw $(SRC)/tools/make-boot.r
197+
b-boot.c: $(SRC)/boot/boot.reb
198+
$(REBOL) -sqw $(SRC)/tools/make-boot.reb
199199

200200
objs/a-constants.o: $R/a-constants.c
201201
$(CC) $R/a-constants.c $(RFLAGS) -o objs/a-constants.o

‎make/makefile.vc

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ clean:
3232
all: clean prep r3.exe
3333

3434
prep: objs
35-
$(REBOL) $T/make-headers.r
36-
$(REBOL) $T/make-boot.r $(OS_ID)
37-
$(REBOL) $T/make-host-init.r
38-
$(REBOL) $T/make-os-ext.r # ok, but not always
39-
$(REBOL) $T/make-host-ext.r
40-
$(REBOL) $T/make-reb-lib.r
35+
$(REBOL) $T/make-headers.reb
36+
$(REBOL) $T/make-boot.reb $(OS_ID)
37+
$(REBOL) $T/make-host-init.reb
38+
$(REBOL) $T/make-os-ext.reb # ok, but not always
39+
$(REBOL) $T/make-host-ext.reb
40+
$(REBOL) $T/make-reb-lib.reb
4141
windres --target=pe-i386 r3.rc -O coff -o objs/r3.res
4242

4343
objs:

‎make/msvc/Make-vs-project-view.r3

+13-13
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ END
457457

458458

459459

460-
do %../../src/tools/file-base.r
460+
do %../../src/tools/file-base.reb
461461

462462
forall core [change core join %../../../src/core/ core/1]
463463
forall os [change os join %../../../src/os/ os/1]
@@ -490,25 +490,25 @@ set REBOL=..\..\prebuild\r3-make-win.exe
490490
set T=../../../src/tools
491491
set OS_ID=0.3.1
492492
493-
%REBOL% %T%/make-headers.r
494-
%REBOL% %T%/make-boot.r "%OS_ID% view"
495-
%REBOL% %T%/make-host-init.r
496-
%REBOL% %T%/make-os-ext.r
497-
%REBOL% %T%/make-host-ext.r
498-
%REBOL% %T%/make-reb-lib.r
493+
%REBOL% %T%/make-headers.reb
494+
%REBOL% %T%/make-boot.reb "%OS_ID% view"
495+
%REBOL% %T%/make-host-init.reb
496+
%REBOL% %T%/make-os-ext.reb
497+
%REBOL% %T%/make-host-ext.reb
498+
%REBOL% %T%/make-reb-lib.reb
499499
}
500500

501501
vs/Prebuild-x64: {
502502
set REBOL=..\..\prebuild\r3-make-win.exe
503503
set T=../../../src/tools
504504
set OS_ID=0.3.40
505505
506-
%REBOL% %T%/make-headers.r
507-
%REBOL% %T%/make-boot.r "%OS_ID% view"
508-
%REBOL% %T%/make-host-init.r
509-
%REBOL% %T%/make-os-ext.r
510-
%REBOL% %T%/make-host-ext.r
511-
%REBOL% %T%/make-reb-lib.r
506+
%REBOL% %T%/make-headers.reb
507+
%REBOL% %T%/make-boot.reb "%OS_ID% view"
508+
%REBOL% %T%/make-host-init.reb
509+
%REBOL% %T%/make-os-ext.reb
510+
%REBOL% %T%/make-host-ext.reb
511+
%REBOL% %T%/make-reb-lib.reb
512512
}
513513

514514
vs/make-project/type "Rebol3_View" %./ "Console"

‎make/msvc/Make-vs-project.r3

+13-13
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ END
437437

438438

439439

440-
do %../../src/tools/file-base.r
440+
do %../../src/tools/file-base.reb
441441

442442
forall core [change core join %../../../src/core/ core/1]
443443
forall os [change os join %../../../src/os/ os/1]
@@ -469,25 +469,25 @@ set REBOL=..\..\prebuild\r3-make-win.exe
469469
set T=../../../src/tools
470470
set OS_ID=0.3.1
471471
472-
%REBOL% %T%/make-headers.r
473-
%REBOL% %T%/make-boot.r %OS_ID%
474-
%REBOL% %T%/make-host-init.r
475-
%REBOL% %T%/make-os-ext.r
476-
%REBOL% %T%/make-host-ext.r
477-
%REBOL% %T%/make-reb-lib.r
472+
%REBOL% %T%/make-headers.reb
473+
%REBOL% %T%/make-boot.reb %OS_ID%
474+
%REBOL% %T%/make-host-init.reb
475+
%REBOL% %T%/make-os-ext.reb
476+
%REBOL% %T%/make-host-ext.reb
477+
%REBOL% %T%/make-reb-lib.reb
478478
}
479479

480480
vs/Prebuild-x64: {
481481
set REBOL=..\..\prebuild\r3-make-win.exe
482482
set T=../../../src/tools
483483
set OS_ID=0.3.40
484484
485-
%REBOL% %T%/make-headers.r
486-
%REBOL% %T%/make-boot.r %OS_ID%
487-
%REBOL% %T%/make-host-init.r
488-
%REBOL% %T%/make-os-ext.r
489-
%REBOL% %T%/make-host-ext.r
490-
%REBOL% %T%/make-reb-lib.r
485+
%REBOL% %T%/make-headers.reb
486+
%REBOL% %T%/make-boot.reb %OS_ID%
487+
%REBOL% %T%/make-host-init.reb
488+
%REBOL% %T%/make-os-ext.reb
489+
%REBOL% %T%/make-host-ext.reb
490+
%REBOL% %T%/make-reb-lib.reb
491491
}
492492

493493
vs/make-project/type "Rebol3" %./ "Console"

‎src/boot/actions.r ‎src/boot/actions.reb

File renamed without changes.

‎src/boot/booters.r ‎src/boot/booters.reb

File renamed without changes.

‎src/boot/draw.r ‎src/boot/draw.reb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ REBOL [
1212
Name: draw
1313
Type: extension
1414
Exports: none
15-
Note: "Run make-host-ext.r to convert"
15+
Note: "Run make-host-ext.reb to convert"
1616
]
1717

1818
;don't change order of already defined words unless you know what you are doing

‎src/boot/errors.r ‎src/boot/errors.reb

File renamed without changes.

‎src/boot/graphics.r ‎src/boot/graphics.reb

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ REBOL [
1414
}
1515
Name: graphics
1616
Type: extension
17-
Exports: [] ; added by make-host-ext.r
18-
Note: "Run make-host-ext.r to convert"
17+
Exports: [] ; added by make-host-ext.reb
18+
Note: "Run make-host-ext.reb to convert"
1919
]
2020

2121
words: [

‎src/boot/modes.r ‎src/boot/modes.reb

File renamed without changes.

‎src/boot/natives.r ‎src/boot/natives.reb

File renamed without changes.

‎src/boot/ops.r ‎src/boot/ops.reb

File renamed without changes.

‎src/boot/platforms.r ‎src/boot/platforms.reb

File renamed without changes.

‎src/boot/root.r ‎src/boot/root.reb

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ typesets ; block of TYPESETs used by system; expandable
2727
noneval ; NONE value
2828
noname ; noname function word
2929

30-
boot ; boot block defined in boot.r (GC'd after boot is done)
30+
boot ; boot block defined in boot.reb (GC'd after boot is done)
3131

‎src/boot/shape.r ‎src/boot/shape.reb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ REBOL [
1212
Name: shape
1313
Type: extension
1414
Exports: none
15-
Note: "Run make-host-ext.r to convert"
15+
Note: "Run make-host-ext.reb to convert"
1616
]
1717

1818
;don't change order of already defined words unless you know what you are doing

‎src/boot/strings.r ‎src/boot/strings.reb

File renamed without changes.

‎src/boot/sysobj.r ‎src/boot/sysobj.reb

File renamed without changes.

‎src/boot/task.r ‎src/boot/task.reb

File renamed without changes.

‎src/boot/text.r ‎src/boot/text.reb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ REBOL [
1212
Name: text
1313
Type: extension
1414
Exports: none
15-
Note: "Run make-host-ext.r to convert"
15+
Note: "Run make-host-ext.reb to convert"
1616
]
1717

1818
;don't change order of already defined words unless you know what you are doing

‎src/boot/types-ext.r ‎src/boot/types-ext.reb

File renamed without changes.

‎src/boot/types.r ‎src/boot/types.reb

File renamed without changes.

‎src/boot/typespec.r ‎src/boot/typespec.reb

File renamed without changes.

‎src/boot/version.r ‎src/boot/version.reb

File renamed without changes.

‎src/boot/window.r ‎src/boot/window.reb

File renamed without changes.

‎src/boot/words.r ‎src/boot/words.reb

File renamed without changes.

‎src/core/a-lib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ extern int Do_Callback(REBSER *obj, u32 name, RXIARG *args, RXIARG *result);
311311
Append_Byte(text, 0);
312312

313313
#ifdef DUMP_INIT_SCRIPT
314-
f = _open("host-boot.r", _O_CREAT | _O_RDWR, _S_IREAD | _S_IWRITE );
314+
f = _open("host-boot.reb", _O_CREAT | _O_RDWR, _S_IREAD | _S_IWRITE );
315315
_write(f, STR_HEAD(text), LEN_BYTES(STR_HEAD(text)));
316316
_close(f);
317317
#endif

‎src/core/b-init.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ extern const REBYTE Str_Banner[];
565565
**
566566
*/ static void Init_System_Object(void)
567567
/*
568-
** The system object is defined in boot.r.
568+
** The system object is defined in boot.reb.
569569
**
570570
***********************************************************************/
571571
{
@@ -790,7 +790,7 @@ static void Set_Option_File(REBCNT field, REBYTE* src, REBOOL dir )
790790
**
791791
*/ static void Init_Main_Args(REBARGS *rargs)
792792
/*
793-
** The system object is defined in boot.r.
793+
** The system object is defined in boot.reb.
794794
**
795795
***********************************************************************/
796796
{

‎src/core/c-port.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ SCHEME_ACTIONS *Scheme_Actions; // Initial Global (not threaded)
616616
**
617617
** In order to add a port scheme:
618618
**
619-
** In mezz-ports.r add a make-scheme.
619+
** In mezz-ports.reb add a make-scheme.
620620
** Add an Init_*_Scheme() here.
621621
** Be sure host-devices.c has the device enabled.
622622
**

‎src/core/d-crash.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ enum Crash_Msg_Nums {
8585

8686
// "REBOL PANIC #nnn: put error message here"
8787
// The first few error types only print general error message.
88-
// Those errors > RP_STR_BASE have specific error messages (from boot.r).
88+
// Those errors > RP_STR_BASE have specific error messages (from boot.reb).
8989
if (id < RP_BOOT_DATA) n = CM_DEBUG;
9090
else if (id < RP_INTERNAL) n = CM_BOOT;
9191
else if (id < RP_ASSERTS) n = CM_INTERNAL;
9292
else if (id < RP_DATATYPE) n = CM_ASSERT;
9393
else if (id < RP_STR_BASE) n = CM_DATATYPE;
9494
else if (id > RP_STR_BASE + RS_MAX - RS_ERROR) n = CM_DEBUG;
9595

96-
// Use the above string or the boot string for the error (in boot.r):
96+
// Use the above string or the boot string for the error (in boot.reb):
9797
msg = (REBYTE*)(n >= 0 ? Crash_Msgs[n] : BOOT_STR(RS_ERROR, id - RP_STR_BASE - 1));
9898
Form_Var_Args(buf + LEN_BYTES(buf), (REBCNT)(CRASH_BUF_SIZE - 1 - LEN_BYTES(buf)), msg, args);
9999

‎src/core/m-gc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ static void Mark_Series(REBSER *series, REBCNT depth);
260260

261261
case REB_DATATYPE:
262262
if (VAL_TYPE_SPEC(val)) { // allow it to be zero
263-
CHECK_MARK(VAL_TYPE_SPEC(val), depth); // check typespec.r file
263+
CHECK_MARK(VAL_TYPE_SPEC(val), depth); // check typespec.reb file
264264
}
265265
break;
266266

‎src/core/p-dir.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
**
9191
** Patterns:
9292
** abc/ is true
93-
** abc/*.r is true
94-
** abc/?.r is true
93+
** abc/*.reb is true
94+
** abc/?.reb is true
9595
** abc - ask the file system
9696
**
9797
***********************************************************************/
@@ -300,7 +300,7 @@
300300
//Trap_Security(flags[POL_WRITE], POL_WRITE, path);
301301
SET_NONE(state);
302302
Init_Dir_Path(&dir, path, 0, POL_WRITE);
303-
// !!! add *.r deletion
303+
// !!! add *.reb deletion
304304
// !!! add recursive delete (?)
305305
result = OS_DO_DEVICE(&dir, RDC_DELETE);
306306
///OS_FREE(dir.file.path);

‎src/include/sys-globals.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
//-- Bootstrap variables:
3030
PVAR REBINT PG_Boot_Phase; // To know how far in the boot we are.
3131
PVAR REBINT PG_Boot_Level; // User specified startup level
32-
PVAR REBYTE **PG_Boot_Strs; // Special strings in boot.r (RS_ constants)
32+
PVAR REBYTE **PG_Boot_Strs; // Special strings in boot.reb (RS_ constants)
3333

3434
//-- Various statistics about memory, etc.
3535
PVAR REB_STATS *PG_Reb_Stats;

‎src/include/sys-panics.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
enum reb_panics {
3030

3131
// Boot Errors (very limited environment avaliable)
32-
RP_BOOT_DATA = 1000, // no boot.r text found
32+
RP_BOOT_DATA = 1000, // no boot.reb text found
3333
RP_REBVAL_ALIGNMENT, // not aligned perfectly in memory
3434
RP_BAD_SIZE, // expected size did not match
3535
RP_NO_BUFFER, // buffer not yet allocated
3636
RP_BAD_BOOT_STRING, // boot strings area is invalid
3737
RP_BAD_BOOT_TYPE_BLOCK, // boot block is wrong size
3838
RP_BAD_END_TYPE_WORD, // the end word is not correct
3939
RP_ACTION_OVERFLOW, // more actions than we should have
40-
RE_NATIVE_BOOT, // bad boot.r native ordering
40+
RE_NATIVE_BOOT, // bad boot.reb native ordering
4141
RP_EARLY_ERROR, // error before error handling
4242
RP_BAD_END_CANON_WORD, // END was not found
4343
RP_BAD_TRUE_CANON_WORD, // TRUE was not found
@@ -81,7 +81,7 @@ enum reb_panics {
8181
// Datatype Errors (300 + N --indicates location)
8282
RP_DATATYPE = 1300,
8383

84-
// Documented Errors (keep in-sync with error strings in boot.r!)
84+
// Documented Errors (keep in-sync with error strings in boot.reb!)
8585
RP_STR_BASE = 1400,
8686
RP_NO_MEMORY, // not enough memory: %d bytes
8787
RP_BAD_WIDTH, // invalid series width: %d %d %d

‎src/include/sys-scan.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
***********************************************************************/
2828

2929
/*
30-
** Tokens returned by the scanner. Keep in sync with boot.r strings area.
30+
** Tokens returned by the scanner. Keep in sync with boot.reb strings area.
3131
*/
3232
enum Value_Types {
3333
TOKEN_EOF = 0,

‎src/mezz/base-constants.r ‎src/mezz/base-constants.reb

File renamed without changes.

‎src/mezz/base-debug.r ‎src/mezz/base-debug.reb

File renamed without changes.

0 commit comments

Comments
 (0)