Merge pull request #33 from cgay/dev

Makefile: create both deft exe symlink deft-app for back compat
dylan-lang · Dec 8, 2024 · d98c4e5 · d98c4e5
2 parents 1843af9 + 5fdb4bc
commit d98c4e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -46,7 +46,7 @@ jobs:
           DYLAN_CATALOG: ext/pacman-catalog
           DYLAN: dylan-root
         run: |
-          exe="$(realpath ${DYLAN}/bin/deft-app)"
+          exe="$(realpath ${DYLAN}/bin/deft)"
           export DYLAN_CATALOG="$(realpath ${DYLAN_CATALOG})"
           ${exe} new library --force-package abc [email protected]
           cd abc

diff --git a/Makefile b/Makefile
@@ -27,9 +27,12 @@ build-with-version: remove-deft-artifacts
 	    dylan-compiler -build -unify deft-app; \
 	  cp -p $${orig} $${file}
 
+# Until the install-deft GitHub Action is no longer referring to deft-app
+# we also create a link named deft-app.
 really-install:
 	mkdir -p $(DYLAN)/bin
-	cp _build/sbin/deft-app $(DYLAN)/bin/
+	cp _build/sbin/deft-app $(DYLAN)/bin/deft
+	ln -f $(DYLAN)/bin/deft $(DYLAN)/bin/deft-app
 
 install: build-with-version really-install