version 0.9.2

CHANGES.md

@@ -1,4 +1,13 @@
 
+Version 0.9.2 (2023-??-??)
+* Packages:
+  * New field `dune-flags`, with value `:standard` by default
+* Package `program` and `driver`:
+  * Field `dune-flags` initialized to `:standard (:include linking.sexp)`
+* Package `js_program`, `js_driver` and `js_library`:
+  * Remove default preprocessor in dune_
+  * Use !{program-name} as dune name
+
 Version 0.9.1 (2023-03-13)
 * Add CHANGES.md
 * `virtual` project skeletons (inherited by all):

README.md

@@ -2,3 +2,17 @@
 
 Versioned files for `drom`
 
+## How to update
+
+1. Modify the files you need to
+2. Push in a branch
+3. Test using `--share-version <local>:<branch>` where `<local>` is a remote
+   to your local GIT repository from
+   `$HOME/.config/drom/shares/7413cde042d5d886501c908e2ea77f6d`
+   and `<branch>` is the branch you want to test
+4. Edit the files:
+   * `VERSION`: the new version of this branch
+   * `LATEST`: a *stable* version that users are advised to use
+   * `DROM_VERSION`: if `drom` must be upgraded to use this version
+5. Push to `master` and remote tag the version
+

VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

skeletons/packages/js_driver/dune_

@@ -1,15 +1,14 @@
 ; generated by drom from package skeleton 'js_driver'
 
 (executable
-  (name main)
+  (name !{library-name})
   (libraries !{dune-libraries} !(package-dune-libraries))
   (modes js)
-  (preprocess (pps js_of_ocaml-ppx))  
   !{dune-stanzas}
   )
 
 (install
- (files (main.bc.js as www/js/!{name}.js))
+ (files (!{library-name}.bc.js as www/js/!{name}.js))
  (section share)
  (package !{name}))
 

skeletons/packages/js_driver/skeleton.toml

@@ -4,4 +4,4 @@ inherits = "virtual"
 
 [file]
 dune_ = { file = "dune", skips = [ "@dune" ] }
-"main.ml" = { skips = [ "@code" ] }
+"main.ml" = { skips = [ "@code" ], create = true }

skeletons/packages/js_library/dune_

@@ -5,7 +5,6 @@
   (public_name !{name})
   (wrapped !{pack-modules})
   (libraries !{dune-libraries} !(package-dune-libraries))
-  (preprocess (pps js_of_ocaml-ppx))
   (modes byte)
   !{dune-stanzas}
   !(package-dune-stanzas)

skeletons/packages/js_library/skeleton.toml

@@ -4,4 +4,4 @@ inherits = "virtual"
 
 [file]
 dune_ = { file = "dune", skips = [ "@dune" ] }
-"main.ml" = { skips = [ "@code" ] }
+"main.ml" = { skips = [ "@code" ], create = true }

skeletons/packages/js_program/dune_

@@ -1,15 +1,14 @@
 ; generated by drom from package skeleton 'js_program'
 
 (executable
-  (name main)
+  (name !{library-name})
   (libraries !{dune-libraries} !(package-dune-libraries))
   (modes js)
-  (preprocess (pps js_of_ocaml-ppx))  
   !{dune-stanzas}
   )
 
 (install
- (files (main.bc.js as www/js/!{name}.js))
+ (files (!{library-name}.bc.js as www/js/!{name}.js))
  (section share)
  (package !{name}))
 

skeletons/packages/js_program/skeleton.toml

@@ -4,4 +4,4 @@ inherits = "virtual"
 
 [file]
 dune_ = { file = "dune", skips = [ "@dune" ] }
-"main.ml" = { skips = [ "@code" ] }
+"main.ml" = { file = "!{library-name}.ml", skips = [ "@code" ], create = true }

skeletons/packages/library/dune_

@@ -4,7 +4,11 @@
   (name !{library-name})
   (public_name !{name})
   (wrapped !{pack-modules})
+  ; use field 'dune-libraries' to add libraries without opam deps
   (libraries !{dune-libraries} !(package-dune-libraries))
+  ; use field 'dune-flags' to set this value
+  (flags (!(dune-flags:default::standard)))
+  ; use field 'dune-stanzas' to add more stanzas here
   !{dune-stanzas}
   !(package-dune-stanzas)
   )
@@ -13,4 +17,5 @@
 (documentation
   (package !{package-name}))
 !{package-dune-installs}
+; use field 'dune-trailer' to add more stuff here
 !(package-dune-trailer)

skeletons/packages/program/dune_

@@ -3,7 +3,10 @@
   (name main)
   (public_name !{program-name})
   (package !{name})
+  ; use field 'dune-libraries' to add libraries without opam deps
   (libraries !{dune-libraries} !(package-dune-libraries))
+  (flags (!(dune-flags:default::standard)))
+  ; use field 'dune-stanzas' to add more stanzas here
   !{dune-stanzas}
   !(package-dune-stanzas)
   )
@@ -28,4 +31,5 @@
 (documentation
   (package !{package-name}))
 !{package-dune-installs}
+; use field 'dune-trailer' to add more stuff here
 !(package-dune-trailer)

skeletons/packages/program/linking_flags.sh

@@ -52,6 +52,8 @@ case $(uname -s) in
     Linux)
         case $(. /etc/os-release && echo $ID) in
             alpine)
+		# Use `static-alpine-clibs` field to add libs more here
+		# (or `static-clibs` for both Linux and Macos)
                 COMMON_LIBS="!(static-alpine-clibs) camlstr unix c"
                 # `m` and `pthread` are built-in musl
                 echo2 '(-noautolink'
@@ -68,6 +70,7 @@ case $(uname -s) in
         esac
         ;;
     Darwin)
+	# Use `static-macos-clibs` field to add libs more here
         COMMON_LIBS="!(static-macos-clibs) unix"
         # `m` and `pthread` are built-in in libSystem
         echo2 '(-noautolink'

skeletons/packages/program/package.toml

@@ -2,3 +2,6 @@
 
 skeleton := "program"
 kind := "program"
+
+[fields]
+dune-flags = ":standard (:include linking.sexp)"

skeletons/projects/virtual/scripts/static-build.sh

@@ -10,7 +10,9 @@ cd $(dirname "$0")/..
 set -o pipefail
 
 git ls-files -z | xargs -0 tar c | \
-  docker run --rm -i \
+docker run --rm -i \
+    # Use `docker-alpine-image` field to replace ocamlpro/ocaml:4.13
+    # and `docker-alpine-packages` to add more apk packages
     !(docker-alpine-image:default:ocamlpro/ocaml:4.13) \
     sh -uexc \
       'tar x >&2 &&

skeletons/projects/virtual/skeleton.toml

@@ -8,6 +8,9 @@ name = "virtual"
 "CHANGES.md" = {
    file = "CHANGES.md", create = true
    }
+"README.md" = {
+   file = "README.md", create = true
+   }
 
 "dot_ocp-indent" = {
    file = ".ocp-indent", create = true,