Remove creation phase

Author: lefessan

.drom

@@ -30,9 +30,14 @@ f7a24abcad0ba9301c03bb64464b1718:.gitignore
 
 # begin context for .ocp-indent
 # file .ocp-indent
-1281376e351d6c2be9ea4c576a29ebd4:.ocp-indent
+6048407431b8d9baf725ae5365d4c2f2:.ocp-indent
 # end context for .ocp-indent
 
+# begin context for .vscode/tasks.json
+# file .vscode/tasks.json
+7884eee2b10cf89cff5d1e466646b046:.vscode/tasks.json
+# end context for .vscode/tasks.json
+
 # begin context for CHANGES.md
 # file CHANGES.md
 7a038eccc259630a7aaa876eceb826ba:CHANGES.md
@@ -45,7 +50,7 @@ cf4da9c43c0026cec0ba46b9cfe8407e:LICENSE.md
 
 # begin context for Makefile
 # file Makefile
-9018881cf0682f4f7f262417b0d4f9ff:Makefile
+ae9611fad30a07ccb4a010556d51bdea:Makefile
 # end context for Makefile
 
 # begin context for Makefile.drom
@@ -55,7 +60,7 @@ cf4da9c43c0026cec0ba46b9cfe8407e:LICENSE.md
 
 # begin context for README.md
 # file README.md
-5d523350230459e853bc57803b729e29:README.md
+616ddd2660258447be65bdb664b9241d:README.md
 # end context for README.md
 
 # begin context for docs/README.txt
@@ -65,7 +70,7 @@ bfbacf00053bb9ab2a6e2ce94ed4a642:docs/README.txt
 
 # begin context for docs/doc/index.html
 # file docs/doc/index.html
-8c90147085379063e18134a7f18f079b:docs/doc/index.html
+c63c3154117c3bd726dc9e43be11eb2d:docs/doc/index.html
 # end context for docs/doc/index.html
 
 # begin context for docs/favicon.png
@@ -80,7 +85,7 @@ e739f3026aa997af4026bc428f4c9ef6:docs/favicon.png
 
 # begin context for docs/sphinx/index.html
 # file docs/sphinx/index.html
-8a2ddf0ce1706457ec54652cf0f5ffac:docs/sphinx/index.html
+ef9e026800aab220e275ed07ba543275:docs/sphinx/index.html
 # end context for docs/sphinx/index.html
 
 # begin context for docs/style.css
@@ -145,7 +150,7 @@ cda3f8bad69d9c6e8cbeab1c720d739a:scripts/static-build.sh
 
 # begin context for sphinx/_static/css/fixes.css
 # file sphinx/_static/css/fixes.css
-68b329da9893e34099c7d8ad5cb9c940:sphinx/_static/css/fixes.css
+20bbe7a5dbb3c3278a1511d960616fe5:sphinx/_static/css/fixes.css
 # end context for sphinx/_static/css/fixes.css
 
 # begin context for sphinx/about.rst
@@ -155,7 +160,7 @@ a44c87f3a364dd95f55427fe40b2c5d1:sphinx/about.rst
 
 # begin context for sphinx/conf.py
 # file sphinx/conf.py
-67496ee935ab27fdabb4544f4f81eeb6:sphinx/conf.py
+2879960e5d438acce665f7ba2b86232c:sphinx/conf.py
 # end context for sphinx/conf.py
 
 # begin context for sphinx/index.rst
@@ -200,7 +205,7 @@ bb6803d414fd5a5479ed6381914604de:src/drom/package.toml
 
 # begin context for src/drom_lib/dune
 # file src/drom_lib/dune
-42d9d18b7b63adfd834f4de13c4fd892:src/drom_lib/dune
+58c7f2af17bf6b1f3147556ad9d3d275:src/drom_lib/dune
 # end context for src/drom_lib/dune
 
 # begin context for src/drom_lib/index.mld
@@ -220,7 +225,7 @@ ad0048099dd6df9d2c73875be2ba28e7:src/drom_lib/version.mlt
 
 # begin context for src/toml.7.1.0/dune
 # file src/toml.7.1.0/dune
-0841a2e47118b9fcd9b900f84ff66c34:src/toml.7.1.0/dune
+502af698659280707ee9d214481f322e: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
@@ -245,7 +250,7 @@ ad0048099dd6df9d2c73875be2ba28e7:src/toml.7.1.0/version.mlt
 
 # begin context for test/expect-tests/dune
 # file test/expect-tests/dune
-d7e2675a767e30edf28d061c94f0ec62:test/expect-tests/dune
+e3b544fe12c7afd17f5f252466dab4fb:test/expect-tests/dune
 # end context for test/expect-tests/dune
 
 # begin context for test/expect-tests/dune.drom
@@ -265,7 +270,7 @@ f15fedac6f43c154bcd0348b776ac08c:test/expect-tests/dune_
 
 # begin context for test/inline-tests/dune
 # file test/inline-tests/dune
-a0d7baa94246a5122e55a255dcefa9d0:test/inline-tests/dune
+e3b544fe12c7afd17f5f252466dab4fb:test/inline-tests/dune
 # end context for test/inline-tests/dune
 
 # begin context for test/inline-tests/dune.drom
@@ -285,7 +290,7 @@ a0d7baa94246a5122e55a255dcefa9d0:test/inline-tests/dune
 
 # begin context for test/output-tests/dune
 # file test/output-tests/dune
-b5ea41e29d37e997b482b1bf7f5953d7:test/output-tests/dune
+9d7eeeedaff73d803089021ce5e81364:test/output-tests/dune
 # end context for test/output-tests/dune
 
 # begin context for test/output-tests/dune.drom

.ocp-indent

@@ -1,4 +1,3 @@
-
 # -*- conf -*-
 # This is an example configuration file for ocp-indent
 #

.vscode/tasks.json

@@ -0,0 +1,25 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "ocaml: dune build",
+            "type": "shell",
+            "command": "dune build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "ocaml: dune runtest -f",
+            "type": "shell",
+            "command": "dune runtest -f",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        }
+    ]
+}

Makefile

@@ -1,88 +1,15 @@
-# Generated by "drom project"
-.PHONY: all build build-deps fmt fmt-check install dev-deps test
-.PHONY: clean distclean
+# This file was created by `drom new`
 
-DEV_DEPS := merlin ocamlformat odoc ppx_expect ppx_inline_test
-
-
-SPHINX_TARGET:=_drom/docs/sphinx
-
-ODOC_TARGET:=_drom/docs/doc/.
-
-
-# Use these non-generated files to include more rules here (and
-# Makefile.trailer at the end)
--include Makefile.header
 -include Makefile.config
 
+# 'build' is a target from 'Makefile.drom'
 all: build
 
-build:
-	./scripts/before.sh build
-	opam exec -- dune build @install
-	./scripts/copy-bin.sh drom drom_lib drom_toml
-	./scripts/after.sh build
-
-build-deps:
-	if ! [ -e _opam ]; then \
-	   opam switch create . 4.14.1 ; \
-	fi
-	opam install ./*.opam --deps-only
-
-
-.PHONY: doc-common odoc view sphinx
-doc-common: build
-	mkdir -p _drom/docs
-	rsync -auv docs/. _drom/docs/.
-
-sphinx: doc-common
-	./scripts/before.sh sphinx ${SPHINX_TARGET}
-	sphinx-build sphinx ${SPHINX_TARGET}
-	./scripts/after.sh sphinx  ${SPHINX_TARGET}
-
-odoc: 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}
-
-doc: doc-common odoc sphinx
-
-view:
-	xdg-open file://$$(pwd)/_drom/docs/index.html
-
-fmt:
-	opam exec -- dune build @fmt --auto-promote
-
-fmt-check:
-	opam exec -- dune build @fmt
-
-install:
-	opam pin -y --no-action -k path .
-	opam install -y .
-
-opam:
-	opam pin -k path .
-
-uninstall:
-	opam uninstall .
-
-dev-deps:
-	opam install ./*.opam --deps-only --with-doc --with-test
-
-test:
-	./scripts/before.sh test
-	opam exec -- dune build @runtest
-	./scripts/after.sh test
+# Makefile.drom is managed by "drom project", you can use
+# DROMNS to prefix all of its rules (namespace)
 
-clean:
-	rm -rf _build
-	./scripts/after.sh clean
+# DROMNS:=drom-
+include Makefile.drom
 
-distclean: clean
-	rm -rf _opam _drom
-	./scripts/after.sh distclean
 
--include Makefile.trailer
 

README.md

@@ -14,3 +14,48 @@ will generate files for Github Actions CI and Github pages.
 * General Documentation: https://ocamlpro.github.io/drom/sphinx
 * API Documentation: https://ocamlpro.github.io/drom/doc
 * Sources: https://github.com/ocamlpro/drom
+
+
+## Simple Example
+
+You can create a new OCaml project with:
+
+```
+$ drom new my-client --skeleton mini_prg
+Creating project "my-client" with skeleton "mini_prg", license "LGPL2"
+  and sources in src/my-client:
+Creating directory my-client
+Using skeleton "program" for package "my-client"
+[master (root-commit) 8d83262] Initial commit
+
+└── my-client/
+    ├── .drom             (drom state, do not edit)
+    ├── .github/
+    │   └── workflows/
+    │       └── workflow.yml
+    ├── .gitignore
+    ├── CHANGES.md
+    ├── LICENSE.md
+    ├── Makefile
+    ├── README.md
+    ├── drom.toml    <────────── project config EDIT !
+    ├── dune
+    ├── dune-project
+    ├── opam/
+    │   └── my-client.opam
+    ├── scripts/
+    │   ├── after.sh
+    │   ├── before.sh
+    │   └── copy-bin.sh
+    └── src/
+        └── my-client/
+            ├── dune
+            ├── main.ml
+            ├── package.toml    <────────── package config EDIT !
+            └── version.mlt
+```
+
+This project uses the minimalist `mini_prg` skeleton, but other skeletons
+like `program` or `library` have more files.
+
+

docs/doc/index.html

@@ -1,4 +1,3 @@
-
 <h1>API documentation for drom</h1>
 <p>You need to run the following commands in the project to generate this doc:
 <pre>

docs/sphinx/index.html

@@ -1,4 +1,3 @@
-
 <h1>Sphinx doc for drom</h1>
 <p>You need to run the following commands in the project to generate this doc:
 <pre>

sphinx/_static/css/fixes.css

@@ -1 +0,0 @@
-

sphinx/conf.py

@@ -220,4 +220,4 @@
 
 # entry point for setup
 def setup(app):
-    app.add_stylesheet('css/fixes.css')
+    app.add_css_file('css/fixes.css')

src/drom_lib/commandBuild.ml

@@ -26,19 +26,20 @@ let action ~args () =
        | Program ->
            try
              let src = "_build/default" // package.dir // "main.exe" in
-             if Sys.file_exists package.name then begin
-               if Sys.is_directory package.name then begin
+             let executable_name = package.name ^ ".exe" in
+             if Sys.file_exists executable_name then begin
+               if Sys.is_directory executable_name then begin
                  Printf.eprintf "Warning: %S is an existing directory. Could not copy %s\n%!" package.name src;
                  Printf.eprintf "  You should rename this directory to another name.\n%!";
                  raise Exit
                end;
-               Sys.remove package.name;
+               Sys.remove executable_name;
              end;
              if Sys.file_exists src then begin
                let s = EzFile.read_file src in
-               EzFile.write_file package.name s;
+               EzFile.write_file executable_name s;
                incr n;
-               Unix.chmod package.name 0o755
+               Unix.chmod executable_name 0o755
 
              end;
            with Exit -> ()