time for sirdi

2022-05-02 20:51:19 +02:00 · 2022-05-02 20:51:19 +02:00 · 9ae0e36a65
parent f503cf5734
commit 9ae0e36a65
16 changed files with 99 additions and 109 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,4 @@
 build
+.build
 depends
 *~
--- a/31
+++ b/31
@ -1,27 +1,28 @@
 all: quox

-quox: exe
-	cp exe/build/exec/quox .
+quox:
+	(cd exe; sirdi build)
+	ln -sf exe/build/exec/main $@
+
+quox-tests:
+	(cd tests; sirdi build)
+	ln -sf tests/build/exec/main $@

 .PHONY: lib
 lib:
-	idris2 --build quox.ipkg
-
-.PHONY: exe
-exe:
-	$(MAKE) -C exe exe
+	sirdi build

 .PHONY: test
-test:
-	$(MAKE) -C tests test
+test: quox-tests
+	./quox-tests -V 14

 .PHONY: prove
-prove:
-	$(MAKE) -C tests prove
+prove: quox-tests
+	prove ./quox-tests

 .PHONY: clean
 clean:
-	$(RM) -r build depends
-	$(RM) quox
-	$(MAKE) -C exe clean
-	$(MAKE) -C tests clean
+	$(RM) quox quox-tests
+	sirdi clean
+	(cd exe; sirdi clean)
+	(cd tests; sirdi clean)
--- a/exe/Makefile
+++ b/exe/Makefile
@ -1,17 +0,0 @@
-all: test
-
-.PHONY: lib
-lib:
-	$(MAKE) -C .. lib
-
-depends/quox: lib
-	mkdir -p depends
-	ln -sf ../../build/ttc depends/quox
-
-.PHONY: test
-exe: depends/quox
-	idris2 --build quox-exe.ipkg
-
-.PHONY: clean
-clean:
-	$(RM) -r build depends
--- a/exe/quox-exe.ipkg
+++ b/exe/quox-exe.ipkg
@ -1,6 +0,0 @@
-package quox-exe
-
-executable = quox
-main = Main
-
-depends = base, contrib, quox
--- a/exe/sirdi.json
+++ b/exe/sirdi.json
@ -0,0 +1,14 @@
+[
+   {
+      "name" : "quox-exe",
+
+      "deps" : [
+        { "name" : "base",    "legacy" : true },
+        { "name" : "contrib", "legacy" : true },
+        { "name" : "quox",    "local"  : ".." }
+      ],
+
+      "main" : "Main",
+      "modules" : ["Main"]
+   }
+]
--- a/exe/src/Main.idr
+++ b/exe/src/Main.idr
--- a/quox.ipkg
+++ b/quox.ipkg
@ -1,39 +0,0 @@
-package quox
-version = 0
-license = "acsl"
-authors = "rhiannon morris"
-- homepage = "..."
-sourceloc = "https://git.rhiannon.website/rhi/quox"
-
-depends = base, contrib
-
-sourcedir = "src"
-modules =
-  Quox.Error,
-  Quox.NatExtra,
-  Quox.OPE,
-  Quox.Pretty,
-
-  Quox.Syntax,
-  Quox.Syntax.Dim,
-  Quox.Syntax.DimEq,
-  Quox.Syntax.Qty,
-  Quox.Syntax.Shift,
-  Quox.Syntax.Subst,
-  Quox.Syntax.Term,
-  Quox.Syntax.Term.Base,
-  Quox.Syntax.Term.Pretty,
-  Quox.Syntax.Term.Reduce,
-  Quox.Syntax.Term.Split,
-  Quox.Syntax.Term.Subst,
-  Quox.Syntax.Universe,
-  Quox.Syntax.Var,
-  Quox.Lexer,
-
-  Quox.Context,
-  Quox.Equal,
-  Quox.Name,
-  Quox.Reduce,
-
-  Quox.Typing,
-  Quox.Typechecker
--- a/sirdi.json
+++ b/sirdi.json
@ -0,0 +1,47 @@
+[
+   {
+      "name" : "quox",
+      "version" : "0.0.0",
+      "passthru": {
+        "license" : "acsl",
+        "authors" : ["rhiannon morris"],
+        "sourceloc" : "https://git.rhiannon.website/rhi/quox"
+      },
+
+      "deps" : [
+        { "name" : "base",    "legacy" : true },
+        { "name" : "contrib", "legacy" : true }
+      ],
+
+      "modules" : [
+        "Quox.Error",
+        "Quox.NatExtra",
+        "Quox.OPE",
+        "Quox.Pretty",
+
+        "Quox.Syntax",
+        "Quox.Syntax.Dim",
+        "Quox.Syntax.DimEq",
+        "Quox.Syntax.Qty",
+        "Quox.Syntax.Shift",
+        "Quox.Syntax.Subst",
+        "Quox.Syntax.Term",
+        "Quox.Syntax.Term.Base",
+        "Quox.Syntax.Term.Pretty",
+        "Quox.Syntax.Term.Reduce",
+        "Quox.Syntax.Term.Split",
+        "Quox.Syntax.Term.Subst",
+        "Quox.Syntax.Universe",
+        "Quox.Syntax.Var",
+        "Quox.Lexer",
+
+        "Quox.Context",
+        "Quox.Equal",
+        "Quox.Name",
+        "Quox.Reduce",
+
+        "Quox.Typing",
+        "Quox.Typechecker"
+      ]
+   }
+]
--- a/tests/Makefile
+++ b/tests/Makefile
@ -1,26 +0,0 @@
-all: test
-
-.PHONY: lib
-lib:
-	$(MAKE) -C .. lib
-
-depends/quox: lib
-	mkdir -p depends
-	ln -sf ../../build/ttc depends/quox
-
-.PHONY: build-tests
-build-tests: depends/quox
-	idris2 --build tests.ipkg
-
-.PHONY: test
-test: build-tests
-	build/exec/quox-tests -V 14
-
-.PHONY: prove
-prove: build-tests
-	prove build/exec/quox-tests
-
-
-.PHONY: clean
-clean:
-	$(RM) -r build depends
--- a/tests/sirdi.json
+++ b/tests/sirdi.json
@ -0,0 +1,21 @@
+[
+   {
+      "name" : "quox-tests",
+
+      "deps" : [
+        { "name" : "base",    "legacy" : true },
+        { "name" : "contrib", "legacy" : true },
+        { "name" : "quox",    "local"  : ".." }
+      ],
+
+      "main" : "Tests",
+      "modules" : [
+        "Tests",
+        "Options",
+        "TAP",
+
+        "Tests.Lexer",
+        "Tests.Equal"
+      ]
+   }
+]
--- a/tests/src/Options.idr
+++ b/tests/src/Options.idr
--- a/tests/src/TAP.idr
+++ b/tests/src/TAP.idr
--- a/tests/src/Tests.idr
+++ b/tests/src/Tests.idr
--- a/tests/src/Tests/Equal.idr
+++ b/tests/src/Tests/Equal.idr
--- a/tests/src/Tests/Lexer.idr
+++ b/tests/src/Tests/Lexer.idr
--- a/tests/tests.ipkg
+++ b/tests/tests.ipkg
@ -1,6 +0,0 @@
-package quox-tests
-
-executable = quox-tests
-main = Tests
-
-depends = base, contrib, quox