Skip to content

Commit b1529a0

Browse files
OldesOldes
committed
FEAT: improved interactive build script to work on Linux (prebuild r3 binary included - version libc-2.3)
1 parent 459138e commit b1529a0

File tree

5 files changed

+56
-31
lines changed

5 files changed

+56
-31
lines changed

‎make-Linux.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
./make/prebuild/r3-make-linux -qs make/make.r3

‎make/make.r3

+46-21
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ cmd-actions: [
1717

1818
settings: []
1919

20-
rebol-tool: join "prebuild\r3-make" switch/default system/version/4 [
20+
rebol-tool: to-local-file join %prebuild/r3-make switch/default system/version/4 [
2121
1 [%-amiga ]
2222
2 [
2323
append settings [
24-
"OSX - PPC" [0.2.04 %..\build\osx-ppc\ ""]
25-
"OSX - Intel" [0.2.05 %..\build\osx-intel\ ""]
26-
"OSX - Intel x64" [0.2.40 %..\build\osx-intel-x64\ ""]
24+
"OSX - PPC" [0.2.04 %../build/osx-ppc/ ""]
25+
"OSX - Intel" [0.2.05 %../build/osx-intel/ ""]
26+
"OSX - Intel x64" [0.2.40 %../build/osx-intel-x64/ ""]
2727
]
2828
%-osx ]
2929
3 [
@@ -34,14 +34,14 @@ rebol-tool: join "prebuild\r3-make" switch/default system/version/4 [
3434
%-win.exe]
3535
4 [
3636
append settings [
37-
"Linux libc 2.3" [0.4.02 %../build/linux/ ""]
38-
"Linux libc 2.5" [0.4.03 %../build/linux/ ""]
39-
"Linux libc 2.11" [0.4.04 %../build/linux/ ""]
40-
"Linux PPC" [0.4.10 %../build/linux/ ""]
41-
"Linux ARM" [0.4.20 %../build/linux/ ""]
42-
"Linux ARM bionic (Android)" [0.4.21 %../build/linux/ ""]
43-
"Linux MIPS" [0.4.30 %../build/linux/ ""]
44-
"Linux x64" [0.4.40 %../build/linux/ ""]
37+
"Linux libc 2.3" [0.4.02 %../build/linux-libc-2.3/ ""]
38+
"Linux libc 2.5" [0.4.03 %../build/linux-libc-2.5/ ""]
39+
"Linux libc 2.11" [0.4.04 %../build/linux-libc-2.11/ ""]
40+
"Linux PPC" [0.4.10 %../build/linux-ppc/ ""]
41+
"Linux ARM" [0.4.20 %../build/linux-arm/ ""]
42+
"Linux ARM bionic (Android)" [0.4.21 %../build/linux-bionic/ ""]
43+
"Linux MIPS" [0.4.30 %../build/linux-mips/ ""]
44+
"Linux x64" [0.4.40 %../build/linux-libc-x64/ ""]
4545
]
4646
%-linux ]
4747
5 [%-haiku ]
@@ -50,6 +50,18 @@ rebol-tool: join "prebuild\r3-make" switch/default system/version/4 [
5050
13 [%-android]
5151
][ %"" ]
5252

53+
either system/version/4 = 3 [;Windows
54+
MV: {move /Y }
55+
BIN_SUFFIX: %.exe
56+
LIB_SUFFIX: %.dll
57+
LS: {dir }
58+
][
59+
MV: {mv -f }
60+
LS: {ls -la }
61+
BIN_SUFFIX: %""
62+
LIB_SUFFIX: %.so
63+
]
64+
5365
i: 1
5466
foreach [name data] settings [
5567
set [OS_ID BUILD_DIR TOOLS] data
@@ -62,13 +74,17 @@ foreach [name data] settings [
6274
append cmd-menu {^-^[[1;32;49mq^[[0m: Quit^/}
6375

6476
eval-cmd: func[cmd [string! block!] /local err][
65-
out: copy ""
6677
if block? cmd [cmd: rejoin cmd]
6778
prin "^[[1;33;49m"
68-
print [cmd "^[[0m^[[36m"]
69-
call/wait/shell cmd out
79+
print [cmd "^[[0m"]
80+
call/wait/shell cmd
7081
print "^[[0m"
71-
;print out
82+
]
83+
84+
move-file: func[file [file!] dir [file!]][
85+
if exists? file [
86+
eval-cmd reform [MV to-local-file file to-local-file dir]
87+
]
7288
]
7389

7490
menu?: true
@@ -83,12 +99,21 @@ forever [
8399
if val [
84100
eval-cmd [rebol-tool " -qs ../src/tools/make-make.r " OS_ID]
85101
eval-cmd [{make TOOLS=} TOOLS { all}]
86-
87102
make-dir/deep BUILD_DIR
88-
eval-cmd [{move /Y r3.exe } to-local-file BUILD_DIR]
89-
eval-cmd [{move /Y host.exe } to-local-file BUILD_DIR]
90-
eval-cmd [{move /Y libr3.dll } to-local-file BUILD_DIR]
91-
eval-cmd [{dir } to-local-file BUILD_DIR]
103+
104+
r3.bin: join %./r3 BIN_SUFFIX
105+
either exists? r3.bin [
106+
eval-cmd [to-local-file r3.bin " -v"]
107+
eval-cmd [to-local-file r3.bin { --do "print {^^/^^[[1;32m### I'm READY ###^^[[0m^^/}"}]
108+
109+
move-file join %./r3 BIN_SUFFIX BUILD_DIR
110+
move-file join %./host BIN_SUFFIX BUILD_DIR
111+
move-file join %./libr3 LIB_SUFFIX BUILD_DIR
112+
113+
eval-cmd [LS to-local-file BUILD_DIR]
114+
][
115+
print {^/^[[1;31mBUILD FAILED!^[[0m^/}
116+
]
92117
menu?: true
93118
]
94119
]

‎make/prebuild/r3-make-linux

565 KB
Binary file not shown.

‎src/tools/make-make.r

+1-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ all:
113113
$(MAKE) r3$(BIN_SUFFIX)
114114
$(MAKE) lib
115115
$(MAKE) host$(BIN_SUFFIX)
116-
$(MAKE) testdo
117116
118117
prep:
119118
$(REBOL) $T/make-headers.r
@@ -147,7 +146,7 @@ purge:
147146
$(MAKE) host$(BIN_SUFFIX)
148147
149148
testdo:
150-
r3$(BIN_SUFFIX) --do "print {^^/^^[[1;32m### I'm READY ###^^[[0m^^/}"
149+
$(CD)r3$(BIN_SUFFIX) --do "print {^^/^^[[1;32m### I'm READY ###^^[[0m^^/}"
151150
152151
test:
153152
$(CP) r3$(BIN_SUFFIX) $(UP)/src/tests/

‎src/tools/systems.r

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ systems: [
2626
[0.2.40 "osx_x64" posix [LEN +O1 NPS PIC NCM HID STX -LM]]
2727
[0.3.01 "win32" win32 [LEN +O2 UNI M32 W32 CON S4M EXE DIR -LM]]
2828
[0.3.40 "win32_x64" win32 [LEN +O2 UNI M64 P64 W32 CON S4M EXE DIR -LM]]
29-
[0.4.02 "linux" posix [LEN +O2 LDL ST1 -LM]] ; libc 2.3
30-
[0.4.03 "linux" posix [LEN +O2 HID LDL ST1 -LM]] ; libc 2.5
31-
[0.4.04 "linux" posix [LEN +O2 HID LDL ST1 M32 -LM]] ; libc 2.11
32-
[0.4.10 "linux_ppc" posix [BEN +O1 HID LDL ST1 -LM]]
33-
[0.4.20 "linux_arm" posix [LEN +O2 HID LDL ST1 -LM]]
34-
[0.4.21 "linux_arm" posix [LEN +O2 HID LDL ST1 -LM PIE]] ; bionic (Android)
35-
[0.4.30 "linux_mips" posix [LEN +O2 HID LDL ST1 -LM]]
36-
[0.4.40 "linux_x64" posix [LEN +O2 HID LDL ST1 -LM]]
29+
[0.4.02 "linux" posix [LEN +O2 PIC LDL ST1 -LM]] ; libc 2.3
30+
[0.4.03 "linux" posix [LEN +O2 PIC HID LDL ST1 -LM]] ; libc 2.5
31+
[0.4.04 "linux" posix [LEN +O2 PIC HID LDL ST1 M32 -LM]] ; libc 2.11
32+
[0.4.10 "linux_ppc" posix [BEN +O1 PIC HID LDL ST1 -LM]]
33+
[0.4.20 "linux_arm" posix [LEN +O2 PIC HID LDL ST1 -LM]]
34+
[0.4.21 "linux_arm" posix [LEN +O2 PIE HID LDL ST1 -LM]] ; bionic (Android)
35+
[0.4.30 "linux_mips" posix [LEN +O2 PIC HID LDL ST1 -LM]]
36+
[0.4.40 "linux_x64" posix [LEN +O2 PIC HID LDL ST1 -LM]]
3737
[0.5.75 "haiku" posix [LEN +O2 ST1 NWK]]
3838
[0.7.02 "freebsd" posix [LEN +O1 ST1 -LM]]
3939
[0.7.40 "freebsd_x64" posix [LEN +O1 ST1 -LM]]

0 commit comments

Comments
 (0)