cleanup: remove submodules and simplify the Makefile

It's easy to forget to keep the submodules up-to-date with dylan-package.json and not
really worth the continuing trouble. If we need to build Deft on a new platform it's just
not that hard to checkout the dependencies and make the registry.

* Ran into trouble with unified exe not finding libunwind.so so I've reverted back to
  the non-unified build and install regime until we have a new release with housel's fix
  for libunwind (likely 2025.1).

* Removed the source controlled registry files, which were for building with submodules.

* Removed the hack to add the Git version info to `$deft-version`; that will be handled
  with Git filters in a subsequent commit.

Author: cgay

.github/workflows/build-and-test.yml

@@ -55,3 +55,11 @@ jobs:
           ${exe} list
           ${exe} build abc-test-suite
           _build/bin/abc-test-suite
+
+      - name: Run test suite using submodules
+        env:
+          DYLAN_CATALOG: ext/pacman-catalog
+          DYLAN: dylan-root
+        run: |
+          mkdir -p ${DYLAN}
+          make test-submodules

.gitmodules

@@ -1,24 +0,0 @@
-[submodule "ext/sphinx-extensions"]
-	path = ext/sphinx-extensions
-	url = https://github.com/dylan-lang/sphinx-extensions.git
-[submodule "ext/command-line-parser"]
-	path = ext/command-line-parser
-	url = https://github.com/dylan-lang/command-line-parser
-[submodule "ext/json"]
-	path = ext/json
-	url = https://github.com/dylan-lang/json
-[submodule "ext/logging"]
-	path = ext/logging
-	url = https://github.com/dylan-lang/logging
-[submodule "ext/regular-expressions"]
-	path = ext/regular-expressions
-	url = https://github.com/dylan-lang/regular-expressions
-[submodule "ext/uncommon-dylan"]
-	path = ext/uncommon-dylan
-	url = https://github.com/cgay/uncommon-dylan
-[submodule "ext/testworks"]
-	path = ext/testworks
-	url = https://github.com/dylan-lang/testworks
-[submodule "ext/pacman-catalog"]
-	path = ext/pacman-catalog
-	url = https://github.com/dylan-lang/pacman-catalog

Makefile

@@ -1,64 +1,55 @@
 # Low-tech Makefile to build and install deft.
 
 DYLAN		?= $${HOME}/dylan
-install_dir     = $(DYLAN)/install/deft
-install_bin     = $(install_dir)/bin
-install_lib     = $(install_dir)/lib
-link_target     = $(install_bin)/deft-app
-link_source     = $(DYLAN)/bin/dylan
 
-git_version := "$(shell git describe --tags --always --match 'v*')"
+.PHONY: build clean install remove-deft-artifacts test dist distclean
 
-.PHONY: build build-with-version clean install install-debug really-install remove-deft-artifacts test dist distclean
+git_version := $(shell git describe --tags --always --match 'v*')
 
-build: remove-deft-artifacts
-	OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry dylan-compiler -build -unify deft-app
-
-# Hack to add the version to the binary with git tag info. Don't want this to
-# be the normal build because it causes unnecessary rebuilds.
-build-with-version: remove-deft-artifacts
+# Hack to add the version to the binary with Git tag info. During development I (cgay)
+# just build with "deft build" so the unnecessary rebuilds that this would cause aren't
+# an issue.
+build:
+	dylan update
 	file="sources/commands/utils.dylan"; \
 	  orig=$$(mktemp); \
 	  temp=$$(mktemp); \
 	  cp -p $${file} $${orig}; \
-	  cat $${file} | sed "s,/.__./.*/.__./,/*__*/ \"${git_version}\" /*__*/,g" > $${temp}; \
+	  cat $${file} | sed "s,/.__./.*/.__./,/*__*/ \"${git_version}\ built on $$(date -Iseconds)\" /*__*/,g" > $${temp}; \
 	  mv $${temp} $${file}; \
-	  OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry \
-	    dylan-compiler -build -unify deft-app; \
+	  OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry dylan-compiler -build 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:
+install: build
 	mkdir -p $(DYLAN)/bin
-	cp _build/sbin/deft-app $(DYLAN)/bin/deft
-	ln -f $(DYLAN)/bin/deft $(DYLAN)/bin/deft-app
-	ln -f $(DYLAN)/bin/deft $(DYLAN)/bin/dylan
-
-install: build-with-version really-install
-
-# Build and install without the version hacking above.
-install-debug: build really-install
-
-# Deft needs to be buildable with submodules so that it can be built on
-# new platforms without having to manually install deps.
-test: build
-	OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry \
-	  dylan-compiler -build deft-test-suite \
-	  && DYLAN_CATALOG=ext/pacman-catalog _build/bin/deft-test-suite
+	mkdir -p $(DYLAN)/install/deft/bin
+	mkdir -p $(DYLAN)/install/deft/lib
+	cp _build/bin/deft-app $(DYLAN)/install/deft/bin/deft
+	cp -r _build/lib/lib* $(DYLAN)/install/deft/lib/
+	# For unified exe these could be hard links but for now they must be symlinks so
+	# that the relative paths to ../lib are correct. With --unify I ran into the
+	# "libunwind.so not found" bug.
+	ln -s -f $$(realpath $(DYLAN)/install/deft/bin/deft) $(DYLAN)/bin/deft
+	# For temp backward compatibility...
+	ln -s -f $$(realpath $(DYLAN)/install/deft/bin/deft) $(DYLAN)/bin/deft-app
+	ln -s -f $$(realpath $(DYLAN)/install/deft/bin/deft) $(DYLAN)/bin/dylan
+
+test:
+	dylan update
+	OPEN_DYLAN_USER_REGISTRIES=${PWD}/registry dylan-compiler -build deft-test-suite \
+	  && _build/bin/deft-test-suite
 
 dist: distclean install
 
-# Sometimes I use deft to develop deft, so this makes sure to clean
-# up its artifacts.
-remove-deft-artifacts:
+clean:
 	rm -rf _packages
-	find registry -not -path '*/generic/*' -type f -exec rm {} \;
-
-clean: remove-deft-artifacts
+	rm -rf registry
 	rm -rf _build
 	rm -rf _test
+	rm -rf *~
 
 distclean: clean
-	rm -rf $(install_dir)
-	rm -f $(link_source)
+	rm -rf $(DYLAN)/install/deft
+	rm $(DYLAN)/bin/deft
+	rm $(DYLAN)/bin/deft-app
+	rm $(DYLAN)/bin/dylan

dylan-package.json

@@ -1,15 +1,15 @@
 {
     "name": "deft",
-    "version": "0.12.0",
+    "version": "0.13.0",
     "license": "MIT",
-    "category": "language-tools",
+    "category": "development tools",
     "contact": "[email protected]",
     "description": "Manage Dylan workspaces, packages, and registries",
     "keywords": ["workspace", "package"],
     "dependencies": [
         "[email protected]",
-        "json@1.0",
-        "logging@2.1",
+        "json@1.1",
+        "logging@2.2",
         "[email protected]",
         "[email protected]"
     ],