Upgrade version to 0.9.3

* Fix `drom new` to use correctly `--drom-share` argument
* Fix drom.toml to use latest drom-share version with fixes for dune
  Should fix github CI
* Use :version in dune files instead of version, starting with drom-version = 0.9.3
* Set OCaml min-version to 4.14
* set directories min-version to 0.6

Author: lefessan

.drom

@@ -5,17 +5,17 @@ version:0.9.0
 
 # hash of toml configuration files
 # used for generation of all files
-cfa41e62814087cf2f340eab496a6542:.
+777b4227c694d4bd7bf7cc4f2dd5d74d:.
 # end context for .
 
 # begin context for .github/workflows/workflow.yml
 # file .github/workflows/workflow.yml
-533318fb1c01b0861406a644a7d9f39c:.github/workflows/workflow.yml
+89b0f9c99502d62badaf5677ea2647e7:.github/workflows/workflow.yml
 # end context for .github/workflows/workflow.yml
 
 # begin context for .gitignore
 # file .gitignore
-33c88a25e8b40f3683f6c03ec26be5db:.gitignore
+f7a24abcad0ba9301c03bb64464b1718:.gitignore
 # end context for .gitignore
 
 # begin context for .ocamlformat
@@ -40,14 +40,19 @@ cfa41e62814087cf2f340eab496a6542:.
 
 # begin context for LICENSE.md
 # file LICENSE.md
-8fc45323c2500fb66e52deb392dda4f2:LICENSE.md
+cf4da9c43c0026cec0ba46b9cfe8407e:LICENSE.md
 # end context for LICENSE.md
 
 # begin context for Makefile
 # file Makefile
 9018881cf0682f4f7f262417b0d4f9ff:Makefile
 # end context for Makefile
 
+# begin context for Makefile.drom
+# file Makefile.drom
+2b07c62bfabf8f45733eafbc696c6146:Makefile.drom
+# end context for Makefile.drom
+
 # begin context for README.md
 # file README.md
 616ddd2660258447be65bdb664b9241d:README.md
@@ -100,22 +105,22 @@ e850a13c004f963e9f5a568eac93c217:dune
 
 # begin context for dune-project
 # file dune-project
-47416b4e7b7e7febc8da32932cae0d54:dune-project
+b7f234c1b0e69daf4fecb2d4ae7922a3:dune-project
 # end context for dune-project
 
 # begin context for opam/drom.opam
 # file opam/drom.opam
-d3c8882f1742f865c2987dea6c7c83e2:opam/drom.opam
+bc3506fc3dfb623406236cd83174b6c6:opam/drom.opam
 # end context for opam/drom.opam
 
 # begin context for opam/drom_lib.opam
 # file opam/drom_lib.opam
-8b323689fcc28f9783fa85ca4a4fac55:opam/drom_lib.opam
+eed1e4462b737abf5b8a26a0e02bfed0:opam/drom_lib.opam
 # end context for opam/drom_lib.opam
 
 # begin context for opam/drom_toml.opam
 # file opam/drom_toml.opam
-81116a1889e6414dee5c2e921961aa77:opam/drom_toml.opam
+7862f6984d902a16bb827bf4335d435f:opam/drom_toml.opam
 # end context for opam/drom_toml.opam
 
 # begin context for scripts/after.sh
@@ -130,12 +135,12 @@ d3c8882f1742f865c2987dea6c7c83e2:opam/drom.opam
 
 # begin context for scripts/copy-bin.sh
 # file scripts/copy-bin.sh
-bb3a9d286f0dc64021db4194427263ee:scripts/copy-bin.sh
+7fe4ada2a2fc5a0ebf9a2f483679a0ae:scripts/copy-bin.sh
 # end context for scripts/copy-bin.sh
 
 # begin context for scripts/static-build.sh
 # file scripts/static-build.sh
-2a405479b3313d79d421c2e7fc282304:scripts/static-build.sh
+cda3f8bad69d9c6e8cbeab1c720d739a:scripts/static-build.sh
 # end context for scripts/static-build.sh
 
 # begin context for sphinx/_static/css/fixes.css
@@ -165,12 +170,12 @@ a44c87f3a364dd95f55427fe40b2c5d1:sphinx/about.rst
 
 # begin context for sphinx/license.rst
 # file sphinx/license.rst
-8f504f01aea592543c0a662b81169d91:sphinx/license.rst
+a02d5245d1626431fbfc4bdb99a413cf:sphinx/license.rst
 # end context for sphinx/license.rst
 
 # begin context for src/drom/dune
 # file src/drom/dune
-efad88968955023a354f16469eb1ae15:src/drom/dune
+68aec4169671c0163b98bb38205d2e4d:src/drom/dune
 # end context for src/drom/dune
 
 # begin context for src/drom/index.mld
@@ -180,7 +185,7 @@ efad88968955023a354f16469eb1ae15:src/drom/dune
 
 # begin context for src/drom/linking_flags.sh
 # file src/drom/linking_flags.sh
-9a3b02ff1d99723e9ee2f3c0e97d7b30:src/drom/linking_flags.sh
+9fdfca3cc53df639758ff04fe09d3243:src/drom/linking_flags.sh
 # end context for src/drom/linking_flags.sh
 
 # begin context for src/drom/main.ml
@@ -195,7 +200,7 @@ efad88968955023a354f16469eb1ae15:src/drom/dune
 
 # begin context for src/drom_lib/dune
 # file src/drom_lib/dune
-a97be0d7328e7c15eb149c454844646a:src/drom_lib/dune
+082a9e012b5cae59a574601cfb9f0788:src/drom_lib/dune
 # end context for src/drom_lib/dune
 
 # begin context for src/drom_lib/index.mld
@@ -210,12 +215,12 @@ a97be0d7328e7c15eb149c454844646a:src/drom_lib/dune
 
 # begin context for src/drom_lib/version.mlt
 # file src/drom_lib/version.mlt
-fc09abbaf032f775d148928fa1398cf9:src/drom_lib/version.mlt
+ad0048099dd6df9d2c73875be2ba28e7:src/drom_lib/version.mlt
 # end context for src/drom_lib/version.mlt
 
 # begin context for src/toml.7.1.0/dune
 # file src/toml.7.1.0/dune
-229a5f90ef7f812db6f3560ccb3d131f:src/toml.7.1.0/dune
+0841a2e47118b9fcd9b900f84ff66c34:src/toml.7.1.0/dune
 # end context for src/toml.7.1.0/dune
 
 # begin context for src/toml.7.1.0/index.mld
@@ -235,14 +240,19 @@ d1b05207fce876a1b44a8b268bcaf226:src/toml.7.1.0/index.mld
 
 # begin context for src/toml.7.1.0/version.mlt
 # file src/toml.7.1.0/version.mlt
-fc09abbaf032f775d148928fa1398cf9:src/toml.7.1.0/version.mlt
+ad0048099dd6df9d2c73875be2ba28e7:src/toml.7.1.0/version.mlt
 # end context for src/toml.7.1.0/version.mlt
 
 # begin context for test/expect-tests/dune
 # file test/expect-tests/dune
 d7e2675a767e30edf28d061c94f0ec62:test/expect-tests/dune
 # end context for test/expect-tests/dune
 
+# begin context for test/expect-tests/dune.drom
+# file test/expect-tests/dune.drom
+6d2c689d437f17d4e99e01df3f4515c6:test/expect-tests/dune.drom
+# end context for test/expect-tests/dune.drom
+
 # begin context for test/expect-tests/dune_
 # file test/expect-tests/dune_
 f15fedac6f43c154bcd0348b776ac08c:test/expect-tests/dune_
@@ -258,6 +268,11 @@ f15fedac6f43c154bcd0348b776ac08c:test/expect-tests/dune_
 a0d7baa94246a5122e55a255dcefa9d0:test/inline-tests/dune
 # end context for test/inline-tests/dune
 
+# begin context for test/inline-tests/dune.drom
+# file test/inline-tests/dune.drom
+4cd12cd1258c38ccd44b225323601ff5:test/inline-tests/dune.drom
+# end context for test/inline-tests/dune.drom
+
 # begin context for test/inline-tests/dune_
 # file test/inline-tests/dune_
 75d7504f9c8002ec5ccdd2458f01da09:test/inline-tests/dune_
@@ -273,6 +288,11 @@ a0d7baa94246a5122e55a255dcefa9d0:test/inline-tests/dune
 b5ea41e29d37e997b482b1bf7f5953d7:test/output-tests/dune
 # end context for test/output-tests/dune
 
+# begin context for test/output-tests/dune.drom
+# file test/output-tests/dune.drom
+a3371489c9d6aee62aeba112ecfddcf0:test/output-tests/dune.drom
+# end context for test/output-tests/dune.drom
+
 # begin context for test/output-tests/dune_
 # file test/output-tests/dune_
 28db2068920c1259cbd67a7c322730ed:test/output-tests/dune_

.github/workflows/workflow.yml

@@ -25,10 +25,14 @@ jobs:
 
         include:
           - os: ubuntu-latest
-            ocaml-compiler: 4.07.0
+            ocaml-compiler: 4.14.0
             skip_test: true
 
 
+# we need permissions to deploy docs
+    permissions:
+      contents: write
+
     runs-on: ${{ matrix.os }}
 
     # use fields.github-workflow-env to add something here
@@ -38,20 +42,19 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Retrieve opam cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-opam
         with:
           path: ~/.opam
-          key: v2-${{ runner.os }}-drom-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }}
+          key: v4-${{ runner.os }}-drom-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }}
 #          restore-keys: |
-#            v2-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}-
+#            v4-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}-
 
       - name: Use OCaml ${{ matrix.ocaml-compiler }}
-        uses: avsm/setup-ocaml@v2
+        uses: avsm/setup-ocaml@v3
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           opam-pin: false
-          opam-depext: false
 
       - name: Set git user
         run: |
@@ -62,14 +65,7 @@ jobs:
 
       - run: opam pin add . -y --no-action
 
-      - run: opam depext -y drom drom_lib drom_toml
-#        if: steps.cache-opam.outputs.cache-hit != 'true'
-
-      - run: opam install -y opam/*.opam --deps-only --with-test
-#        if: steps.cache-opam.outputs.cache-hit != 'true'
-
-#     - run: opam upgrade --fixup
-#        if: steps.cache-opam.outputs.cache-hit == 'true'
+      - run: opam install -y ./opam/*.opam --deps-only --with-test
 
       # Use fields.build-scripts to add more scripts to convert here
       - run: dos2unix scripts/*.sh 

.gitignore

@@ -2,7 +2,6 @@
 *~
 _build
 .merlin
-.vscode
 /_drom
 /_opam
 /_build

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2024 OCamlPro SAS
+Copyright (c) 2025 OCamlPro SAS
 
 This software is distributed under the terms of the
 GNU Lesser General Public License (LGPL) version 2.1 (included below).

Makefile.drom

@@ -0,0 +1,83 @@
+# Maintained by "drom project"
+.PHONY: $(DROMNS)build $(DROMNS)build-deps $(DROMNS)fmt $(DROMNS)fmt-check
+.PHONY: $(DROMNS)install $(DROMNS)dev-deps $(DROMNS)test
+.PHONY: $(DROMNS)clean $(DROMNS)distclean
+
+DROM_DEV_DEPS := merlin ocamlformat odoc ppx_expect ppx_inline_test $(DEV_DEPS)
+
+
+SPHINX_TARGET:=_drom/docs/sphinx
+
+ODOC_TARGET:=_drom/docs/doc/.
+
+
+$(DROMNS)build:
+	./scripts/before.sh build
+	opam exec -- dune build @install
+	./scripts/copy-bin.sh drom drom_lib drom_toml
+	./scripts/after.sh build
+
+$(DROMNS)build-deps:
+	if ! [ -e _opam ]; then \
+	   opam switch create . 4.14.1 ; \
+	fi
+	opam install ./opam/*.opam --deps-only
+
+
+.PHONY: $(DROMNS)doc-common $(DROMNS)odoc $(DROMNS)view
+.PHONY: $(DROMNS)sphinx
+$(DROMNS)doc-common: $(DROMNS)build
+	mkdir -p _drom/docs
+	rsync -auv docs/. _drom/docs/.
+
+$(DROMNS)sphinx: $(DROMNS)doc-common
+	./scripts/before.sh sphinx ${SPHINX_TARGET}
+	sphinx-build sphinx ${SPHINX_TARGET}
+	./scripts/after.sh sphinx  ${SPHINX_TARGET}
+
+$(DROMNS)odoc: $(DROMNS)doc-common
+	mkdir -p ${ODOC_TARGET}
+	./scripts/before.sh odoc ${ODOC_TARGET}
+	opam exec -- dune build @doc
+	rsync -auv --delete _build/default/_doc/_html/. ${ODOC_TARGET}
+	./scripts/after.sh odoc ${ODOC_TARGET}
+
+$(DROMNS)doc: $(DROMNS)doc-common $(DROMNS)odoc $(DROMNS)sphinx
+
+$(DROMNS)view:
+	xdg-open file://$$(pwd)/_drom/docs/index.html
+
+$(DROMNS)fmt:
+	opam exec -- dune build @fmt --auto-promote
+
+$(DROMNS)fmt-check:
+	opam exec -- dune build @fmt
+
+$(DROMNS)install:
+	opam pin -y --no-action -k path .
+	opam install -y .
+
+$(DROMNS)opam:
+	opam pin -k path .
+
+$(DROMNS)uninstall:
+	opam uninstall .
+
+$(DROMNS)dev-deps:
+	opam install ./opam/*.opam --deps-only --with-doc --with-test
+
+$(DROMNS)test:
+	./scripts/before.sh test
+	opam exec -- dune build @runtest
+	./scripts/after.sh test
+
+$(DROMNS)clean:
+	rm -rf _build
+	rm -f *.exe *~
+	./scripts/after.sh clean
+
+$(DROMNS)distclean: $(DROMNS)clean
+	rm -rf _opam _drom
+	./scripts/after.sh distclean
+
+

drom.toml

@@ -1,8 +1,9 @@
 [project]
 create-project = false
-drom-version = "0.1"
+drom-version = "0.9.3"
 share-repo = "https://github.com/OCamlPro/drom-share"
-share-version = "0.9.0"
+#share-repo = "/home/lefessan/GIT/ocp/github/drom-share"
+share-version = "0.9.3"
 
 [project]
 authors = ["Fabrice Le Fessant <fabrice.le_fessant@ocamlpro.com>", "Léo Andrès <leo.andres@ocamlpro.com>"]
@@ -11,11 +12,11 @@ copyright = "OCamlPro SAS"
 edition = "4.14.1"
 github-organization = "ocamlpro"
 license = "LGPL2"
-min-edition = "4.07.0"
+min-edition = "4.14.0"
 name = "drom"
 skeleton = "program"
 synopsis = "The drom tool is a wrapper over opam/dune in an attempt to provide a cargo-like user experience"
-version = "0.9.2"
+version = "0.9.3"
 
 # keys that you could also define:
 # odoc-target = "...odoc-target..."