Cleanup

Signed-off-by: Sora Morimoto <sora@morimoto.io>

.github/workflows/ci.yml

@@ -86,5 +86,4 @@ jobs:
             satysfi-external: git+https://github.com/gfngfn/satysfi-external-repo.git
             default: git+https://github.com/ocaml/opam-repository.git
 
-      - name: Lint opam
-        uses: ocaml/setup-ocaml/lint-opam@v3
+      - uses: ocaml/setup-ocaml/lint-opam@v3

.gitignore

@@ -1,72 +1,6 @@
-.DS_Store
-\#*
-.\#*
-*~
-*.exe
-*.tex
-*.log
-*.aux
-*.dvi
-*.pdf
-*.out
-*.html
-obsolete/*.txt
-old/
-*.png
-satysfi
-*.ttf
-*.otf
-*.ttc
-*.dfont
-*.afm
-*.t1a
-*.svg
-!/logo/macrodown.svg
-*.dat
-*.ttx
-*.jpg
-!/demo/satysfi-logo.jpg
-!/tests/images/satysfi-logo-cmyk.jpg
-!/tests/images/satysfi-logo-gray.jpg
-!/tests/images/satysfi-logo-rgb.jpg
-!/tests/images/peppers-cmyk.jpg
-!/tests/images/peppers-gray.jpg
-!/tests/images/peppers-rgb.jpg
-*.satysfi-aux
-external/
-
-# Created by https://www.toptal.com/developers/gitignore/api/ocaml
-# Edit at https://www.toptal.com/developers/gitignore?templates=ocaml
-
-### OCaml ###
-*.annot
-*.cmo
-*.cma
-*.cmi
-*.a
-*.o
-*.cmx
-*.cmxs
-*.cmxa
-
-# ocamlbuild working directory
-_build/
-
-# ocamlbuild targets
-*.byte
-*.native
-
-# oasis generated files
-setup.data
-setup.log
-
-# Merlin configuring file for Vim and Emacs
-.merlin
-
-# Dune generated files
-*.install
-
-# Local OPAM switch
-_opam
-
-# End of https://www.toptal.com/developers/gitignore/api/ocaml
+/_build/
+/_opam/
+/lib-satysfi/dist/fonts/
+/temp/IPAexfont00401/
+/temp/latinmodern-math-1959/
+/temp/*.zip

Makefile

@@ -1,27 +1,17 @@
 PREFIX=/usr/local
 LIBDIR=$(PREFIX)/share/satysfi
-TARGET=satysfi
 BINDIR=$(PREFIX)/bin
-RM=rm -f
-DUNE=dune
 
-.PHONY: all install lib uninstall clean
+.PHONY: all clean install uninstall
 
 all:
-	$(DUNE) build --root .
-	cp _build/install/default/bin/$(TARGET) .
+	dune build
 
-install: $(TARGET)
-	mkdir -p $(BINDIR)
-	install $(TARGET) $(BINDIR)
+clean:
+	dune clean
 
-#preliminary:
-#	[ -d .git ] && git submodule update -i || echo "Skip git submodule update -i"
+install:
+	dune install --bindir=$(BINDIR)
 
 uninstall:
-	rm -rf $(BINDIR)/$(TARGET)
-	rm -rf $(LIBDIR)
-
-clean:
-	$(DUNE) clean
-	$(RM) satysfi
+	dune uninstall --bindir=$(BINDIR)

download-fonts.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 set -ue
 

dune-project

@@ -4,8 +4,6 @@
 
 (name satysfi)
 
-(version 0.0.11)
-
 (license LGPL-3.0-only)
 
 (authors "Takashi Suwa")
@@ -40,19 +38,16 @@
   (core_kernel
    (and
     (>= v0.15)
-    (< v0.17)))
+    (< v0.18)))
   (cppo
    (and
-    :build
     (>= 1.6.4)
-    (< 1.7.0)))
+    (< 1.7)))
+  dune-build-info
   (menhir
-   (and
-    :build
-    (>= 20231231)))
+   (>= 20231231))
   (menhirLib
    (>= 20231231))
-  (ocamlfind :build)
   (omd
    (and
     (>= 1.3.2)
@@ -67,7 +62,6 @@
     (< 6.0)))
   (re
    (and
-    :build
     (>= 1.10.4)
     (< 2.0)))
   (uutf

install-libs.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 LIBDIR=${1:-/usr/local/share/satysfi}
 

satysfi.opam

@@ -1,6 +1,5 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.0.11"
 synopsis: "A statically-typed, functional typesetting system"
 description:
   "SATySFi is a typesetting system equipped with a statically-typed, functional programming language. It consists mainly of two “layers” ― the text layer and the program layer. The former is for writing documents in LaTeX-like syntax. The latter, which has OCaml-like syntax, is for defining functions and commands. SATySFi enables you to write documents markuped with flexible commands of your own making. In addition, its informative type error reporting will be a good help to your writing."
@@ -15,27 +14,31 @@ depends: [
   "batteries" {>= "3.6.0" & < "4.0"}
   "camlimages" {>= "5.0.1" & < "5.0.5"}
   "camlpdf" {= "2.3.1+satysfi"}
-  "core_kernel" {>= "v0.15" & < "v0.17"}
-  "cppo" {build & >= "1.6.4" & < "1.7.0"}
-  "menhir" {build & >= "20231231"}
+  "core_kernel" {>= "v0.15" & < "v0.18"}
+  "cppo" {>= "1.6.4" & < "1.7"}
+  "dune-build-info"
+  "menhir" {>= "20231231"}
   "menhirLib" {>= "20231231"}
-  "ocamlfind" {build}
   "omd" {>= "1.3.2" & < "2.0"}
   "otfed" {>= "0.3.1" & < "0.4"}
   "ppx_deriving" {>= "5.2.1" & < "6.0"}
-  "re" {build & >= "1.10.4" & < "2.0"}
+  "re" {>= "1.10.4" & < "2.0"}
   "uutf" {>= "1.0.3" & < "2.0"}
   "yojson-with-position" {= "1.4.2+satysfi"}
   "odoc" {with-doc}
 ]
-dev-repo: "git+https://github.com/gfngfn/SATySFi.git"
 build: [
-  ["mkdir" "-p" "temp"]
-  [make "-f" "Makefile" "PREFIX=%{prefix}%"]
-]
-install: [
-  [make "-f" "Makefile" "install" "PREFIX=%{prefix}%"]
-]
-remove: [
-  [make "-f" "Makefile" "uninstall" "PREFIX=%{prefix}%"]
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
+dev-repo: "git+https://github.com/gfngfn/SATySFi.git"

src/dune

@@ -12,6 +12,7 @@
   camlpdf
   core_kernel
   core_kernel.pairing_heap
+  dune-build-info
   menhirLib
   otfed
   uutf
@@ -47,16 +48,6 @@
  (flags
   (--table --explain)))
 
-(rule
- (targets version.ml)
- (deps
-  ../tools/genversion/genversion.exe
-  (:src ../satysfi.opam))
- (action
-  (with-stdout-to
-   %{targets}
-   (run %{deps}))))
-
 (rule
  (targets types.ml)
  (deps

src/version.ml

@@ -0,0 +1,4 @@
+let version =
+  match Build_info.V1.version () with
+  | None -> "dev"
+  | Some v -> Build_info.V1.Version.to_string v