File tree 2 files changed +12
-3
lines changed
2 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ attempt [do %make-settings.r]
11
11
cmd-menu: {^/^[ [1;33;49mPlease choose version to build:^[ [0m^/ }
12
12
13
13
cmd-actions: [
14
+ "c" [val: none eval-cmd [{make TOOLS=} TOOLS { clean} ]]
14
15
"q" [quit]
15
16
"" [val: none]
16
17
]
@@ -72,6 +73,7 @@ foreach [name data] settings [
72
73
]
73
74
i: i + 1
74
75
]
76
+ append cmd-menu {^-^[ [1;32;49mc^[ [0m: Clean^/ }
75
77
append cmd-menu {^-^[ [1;32;49mq^[ [0m: Quit^/ }
76
78
77
79
eval-cmd : func [ cmd [string! block! ] /local err] [
@@ -89,8 +91,10 @@ move-file: func[file [file!] dir [file!]][
89
91
]
90
92
91
93
menu?: true
94
+ prev: none
92
95
forever [
93
96
if menu? [print cmd-menu]
97
+
94
98
error? try [val: trim/head/tail ask "^[ [1;32;49mBuild version: ^[ [0m" ]
95
99
switch /default val cmd-actions [
96
100
print "What?"
@@ -99,6 +103,11 @@ forever [
99
103
100
104
if val [
101
105
eval-cmd [rebol-tool " -qs ../src/tools/make-make.r " OS_ID]
106
+ if prev <> val [
107
+ ;clean if making different target or for the first run
108
+ eval-cmd [{make TOOLS=} TOOLS { clean} ]
109
+ prev: val
110
+ ]
102
111
eval-cmd [{make TOOLS=} TOOLS { all} ]
103
112
make-dir/deep BUILD_DIR
104
113
Original file line number Diff line number Diff line change @@ -105,10 +105,10 @@ make:
105
105
$(REBOL) $T/make-make.r $(OS_ID)
106
106
107
107
clean:
108
- $(RM) libr3$(LIB_SUFFIX) objs $(RES)
108
+ $(RM) $(RES)
109
+ $(RM) objs
109
110
110
111
all:
111
- $(MAKE) clean
112
112
$(MAKE) prep
113
113
$(MAKE) r3$(BIN_SUFFIX)
114
114
$(MAKE) lib
@@ -411,7 +411,7 @@ unless flag? -SP [ ; Use standard paths:
411
411
either flag? EXE [
412
412
macro+ BIN_SUFFIX %.exe
413
413
macro+ LIB_SUFFIX %.dll
414
- macro+ RES {"objs/ r3.res"}
414
+ macro+ RES {"objs\ r3.res"}
415
415
macro+ RM "DEL /s /q"
416
416
][
417
417
macro+ LIB_SUFFIX %.so
You can’t perform that action at this time.
0 commit comments