Skip to content

Commit cbb39f1

Browse files
committed
Makefile: Use deft command instead of dylan
1 parent 6c3cb2c commit cbb39f1

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ git_version := $(shell git describe --tags --always --match 'v*')
1010
# just build with "deft build" so the unnecessary rebuilds that this would cause aren't
1111
# an issue.
1212
build:
13-
dylan update
13+
deft update
1414
file="sources/commands/version.dylan"; \
1515
orig=$$(mktemp); \
1616
temp=$$(mktemp); \
1717
cp -p $${file} $${orig}; \
1818
cat $${file} | sed "s|_NO_VERSION_SET_|${git_version} built on $$(date -Iseconds)|g" > $${temp}; \
1919
mv $${temp} $${file}; \
20-
dylan build deft-app; \
20+
deft build deft-app; \
2121
cp -p $${orig} $${file}
2222

2323
install: build
@@ -35,9 +35,8 @@ install: build
3535
ln -s -f $$(realpath $(DYLAN)/install/deft/bin/deft) $(DYLAN)/bin/dylan
3636

3737
test:
38-
dylan update
39-
OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry dylan-compiler -build deft-test-suite \
40-
&& _build/bin/deft-test-suite
38+
deft update
39+
deft test
4140

4241
dist: distclean install
4342

@@ -46,7 +45,7 @@ clean:
4645
rm -rf registry
4746
rm -rf _build
4847
rm -rf _test
49-
rm -rf *~
48+
find . -name '*~' -exec rm -f {} \;
5049

5150
distclean: clean
5251
rm -rf $(DYLAN)/install/deft

0 commit comments

Comments
 (0)