Fix dune build

.dockerignore

@@ -0,0 +1,85 @@
+# compiled code anywhere
+**/*.native
+**/*.byte
+**/*.o
+**/*.lo
+**/*.cmx
+**/*.cmo
+**/*.cmi
+**/*.a
+**/*.cmxa
+**/*.dSYM/
+**/_build
+
+# system crap
+Dockerfile
+Dockerfile.test
+Dockerfile.web
+.git
+.gitmodules
+.dockerignore
+**/.gitignore
+**/*~
+**/.#*
+**/.DS_Store
+**/.DS_Store?
+**/._*
+**/.Spotlight*
+**/.Trash*
+**/*[Tt]humbs.db
+**/*~
+**/*.bak
+**/*.orig
+**/*.rej
+
+################################################################################
+# libdash ignores
+
+libtool
+# geneated by libtool
+ltmain.sh
+
+# generated by autogen.sh
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+config.h.in
+configure
+depcomp
+install-sh
+missing
+
+# generated by configure
+Makefile
+config.cache
+config.h
+config.log
+config.status
+src/.deps/
+stamp-h1
+
+# generated by make
+src/token_vars.h
+
+# generated files
+ar-lib
+config.*
+src/libdash.a
+
+src/builtins.[ch]
+src/builtins.def
+src/dash
+src/init.c
+src/mkinit
+src/mknodes
+src/mksignames
+src/mksyntax
+src/nodes.[ch]
+src/signames.c
+src/syntax.[ch]
+src/token.h
+
+src/.libs
+src/.deps
+

.github/workflows/build.yml

@@ -0,0 +1,155 @@
+name: Main workflow
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+  schedule:
+    - cron: '5 14 * * *'
+
+jobs:
+  check-version-numbers:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Check version numbers
+        run: ./version.sh
+
+  package-python:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Install dependencies (libtool, aclocal, autoconf)
+        run: |
+           if [ "$RUNNER_OS" = "Linux" ]; then
+             sudo apt-get install libtool automake
+           elif [ "$RUNNER_OS" = "macOS" ]; then
+             brew install libtool autoconf automake
+           else
+             echo Unsupported RUNNER_OS=$RUNNER_OS
+             exit 1
+           fi
+
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v3.4.1
+        env:
+          CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+
+      - name: Upload binary wheel
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ format('bdist.{0}', matrix.os) }}
+          path: wheelhouse/libdash-*.whl
+
+      - name: Build source distribution (Linux only)
+        if: contains(matrix.os, 'ubuntu')
+        run: python setup.py sdist
+
+      - name: Upload source distribution (from Linux)
+        uses: actions/upload-artifact@v4
+        if: contains(matrix.os, 'ubuntu')
+        with:
+          name: sdist
+          path: dist/libdash-*.tar.gz
+
+  build-both-and-compare:
+    strategy:
+      fail-fast: true
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+        ocaml-compiler:
+          - 4.14.x
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Use OCaml ${{ matrix.ocaml-compiler }}
+        uses: avsm/setup-ocaml@v3
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          dune-cache: true
+
+      - name: Install and test OCaml bindings
+        run: opam install --with-test --working-dir .
+
+        # we don't reuse the wheels so that all of the CI runs can happen concurrently
+      - name: Install Python via venv
+        run: |
+           python3 -m venv .venv
+           . .venv/bin/activate
+           python3 -m pip install .
+
+      - name: Test Python bindings
+        run: |
+          . .venv/bin/activate
+          make -C python test
+
+      - name: Compare OCaml and Python bindings
+        run: |
+          . .venv/bin/activate
+          opam exec -- make -C test test
+
+  deploy:
+    needs:
+      - check-version-numbers
+      - package-python
+      - build-both-and-compare
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')
+
+    steps:
+      - name: Download distributions
+        uses: actions/download-artifact@v4
+
+      - name: Rename distributions
+        run: |
+          mkdir dist
+          ls bdist.*/
+          mv bdist.*/libdash-*.whl dist/
+          mv sdist/libdash-*.tar.gz dist/
+          echo Look on my Works, ye Mighty, and despair!
+          ls dist
+
+      - name: Deploy 'latest' release on GH
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: true
+          title: "Python source and binary distributions"
+          files: |
+            dist/*
+
+      - name: Deploy test distribution to Test PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          verbose: true
+          repository_url: https://test.pypi.org/legacy/
+          skip_existing: true
+
+      - name: Deploy tagged release on PyPI
+        if: startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          verbose: true

.github/workflows/canary.yml

@@ -0,0 +1,71 @@
+name: Distribution canary
+
+on:
+#  push:
+  schedule:
+    - cron: '20 13 * * *'
+
+jobs:
+  ocaml:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-14
+          - macos-15
+          - ubuntu-22.04
+          - ubuntu-24.04
+        ocaml-compiler:
+          - 4.14.x
+          - 5.2.x
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Use OCaml ${{ matrix.ocaml-compiler }}
+        uses: avsm/setup-ocaml@v2
+        with:
+          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+
+      - name: Install OCaml bindings from OPAM
+        run: |
+          opam update
+          opam depext libdash
+          opam install libdash
+
+      - name: Test OPAM executables
+        run: test "$(echo hi | opam exec -- shell_to_json | opam exec -- json_to_shell)" = "hi"
+
+  python:
+    strategy:
+      fail-fast: true
+      matrix:
+        os:
+          - macos-12
+          - macos-11
+          - ubuntu-18.04
+          - ubuntu-20.04
+        python-version:
+          - '3.7'
+          - '3.8'
+          - '3.9'
+          - '3.10'
+        repository_url:
+          - https://pypi.org/simple/
+          - https://test.pypi.org/simple/
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Use Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Python bindings from ${{ matrix.repository_url }}
+        run: pip install -v -i "${{ matrix.repository_url }}" --extra-index-url https://pypi.org/simple/ libdash
+
+      - name: Test Python library
+        run: |
+          RT="$(printf 'import libdash\nasts = libdash.parse("-", True)\nfor (ast, lines, linno_before, linno_after) in asts:\n  print(libdash.to_string(ast))\n')"
+          test "$(echo hi | python -c "$RT")" = "hi"

.gitignore

@@ -22,8 +22,15 @@ Makefile
 /stamp-h1
 
 # generated by make
+/src/builtins.h
+/src/nodes.h
+/src/syntax.h
+/src/token.h
 /src/token_vars.h
 
+# generated by dune
+_build
+
 # Apple debug symbol bundles
 *.dSYM/
 
@@ -37,6 +44,20 @@ Makefile
 .DS_Store
 .DS_Store?
 ._*
+.\#*
 .Spotlight*
 .Trash*
 *[Tt]humbs.db
+ar-lib
+config.*
+src/libdash.a
+*.lo
+*.dylib
+m4
+libtool
+ltmain.sh
+ocamlprof.dump
+__pycache__
+libdash.egg-info
+dist
+build