merge master

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.0.11] - 2024-02-05
+### Fixed
+- Improve the dependency description in the `.opam` file ([PR\#426](https://github.com/gfngfn/SATySFi/pull/426)).
+- Avoid `camlimages.5.0.5` due to an installation issue ([PR\#425](https://github.com/gfngfn/SATySFi/pull/425)).
+
 ## [0.0.10] - 2023-10-12
 ### Fixed
 - Fix URLs of Latin Modern fonts for installation ([PR\#412](https://github.com/gfngfn/SATySFi/pull/412) by `caphosra`).
@@ -153,7 +158,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/),
 - Initial version of SATySFi
 
 
-  [Unreleased]: https://github.com/gfngfn/SATySFi/compare/v0.0.10...HEAD
+  [Unreleased]: https://github.com/gfngfn/SATySFi/compare/v0.0.11...HEAD
+  [0.0.11]: https://github.com/gfngfn/SATySFi/compare/v0.0.10...v0.0.11
   [0.0.10]: https://github.com/gfngfn/SATySFi/compare/v0.0.9...v0.0.10
   [0.0.9]: https://github.com/gfngfn/SATySFi/compare/v0.0.8...v0.0.9
   [0.0.8]: https://github.com/gfngfn/SATySFi/compare/v0.0.7...v0.0.8

README-ja.md

@@ -14,7 +14,7 @@
 * 株式会社ドワンゴ（2018年10月–2019年3月．アルバイトとして）
 * [The SATySFi​book](https://booth.pm/ja/items/1127224)を購入頂いた，多くの匿名の支援者の方々
 
-また，2023年10月現在も発展を続けています。
+また，2024年2月現在も発展を続けています。
 
 ## Satyrographos を使ったインストール方法 (初心者向け)
 

README.md

@@ -14,7 +14,7 @@ This software was supported by:
 * Dwango Co., Ltd. (October 2018 – March 2019; as a part-time job), and
 * many anonymous supporters who bought [The SATySFi​book](https://booth.pm/ja/items/1127224),
 
-and its development continues to this day (Oct 2023).
+and its development continues to this day (Feb 2024).
 
 ## Install using Satyrographos (for non-devs)
 

satysfi.opam

@@ -1,6 +1,6 @@
 opam-version: "2.0"
 name: "satysfi"
-version: "0.0.10"
+version: "0.0.11"
 maintainer: "Takashi Suwa"
 authors: [
   "Takashi Suwa"
@@ -20,24 +20,24 @@ remove: [
 ]
 # Packages whose version suffix is "+satysfi" are distributed on satysfi-external-repo.
 depends: [
-  "ocaml" {>= "4.12.0"}
-  "batteries"
-  "camlimages" {>= "5.0.1"}
+  "ocaml" {>= "4.12.0" & < "5.0.0"}
+  "batteries" {>= "3.6.0" & < "4.0.0"}
+  "camlimages" {>= "5.0.1" & < "5.0.5"}
   "camlpdf" {= "2.3.1+satysfi"}
   "cmdliner" {>= "1.1.1"}
-  "core_kernel" {>= "v0.15"}
+  "core_kernel" {>= "v0.15" & < "v0.16"}
   "cppo" {build & >= "1.6.4" & < "1.7.0"}
   "dune" {build}
   "menhir"
   "ocamlfind" {build}
-  "otfed" {= "0.3.1"}
-  "ppx_deriving"
-  "re" {build}
+  "otfed" {>= "0.3.1" & < "0.4"}
+  "ppx_deriving" {>= "5.2.1" & < "6.0.0"}
+  "re" {build & >= "1.10.4" & < "2.0.0"}
   "uutf" {>= "1.0.3" & < "2.0.0"}
   "uunf" {>= "15.0.0" & < "16.0.0"}
   "uuseg" {>= "15.0.0" & < "16.0.0"}
   "yojson-with-position" {= "1.4.2+satysfi"}
-  "omd" {< "2.0.0~"}
+  "omd" {>= "1.3.2" & < "2.0.0~"}
   "ocamlgraph"
   "alcotest" {with-test & >= "1.4.0"}
 ]

src/dune

@@ -4,7 +4,7 @@
  (flags (:standard -bin-annot -thread -safe-string))
  (libraries str
             batteries
-            camlimages
+            camlimages.core
             camlimages.jpeg
             camlimages.png
             camlpdf
@@ -44,6 +44,11 @@
  (modules parser dataParser)
  (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 types.cppo.ml) __insttype.gen.ml __attype.gen.ml __codetype.gen.ml __unliftcode.gen.ml)

tools/genversion/dune

@@ -0,0 +1,3 @@
+(executable
+ (name genversion)
+ (libraries str))

tools/genversion/dune-project

@@ -0,0 +1 @@
+(lang dune 1.0)

tools/genversion/genversion.ml

@@ -0,0 +1,21 @@
+let version_regex = Str.regexp {|^version: ?"\([0-9]+\.[0-9]+\.[0-9]+\)"$|}
+
+let () =
+  let version = ref "" in
+  let opam_file_path = Sys.argv.(1) in
+  let channel_in = open_in opam_file_path in
+  let search_version () =
+    let cond = ref true in
+    while !cond do
+      let line = input_line channel_in in
+      try
+        let _ = Str.search_forward version_regex line 0 in
+        version := Str.matched_group 1 line;
+        cond := false
+      with Not_found ->
+        ()
+    done
+  in
+  search_version ();
+  close_in channel_in;
+  print_endline ("let version = \"" ^ !version ^ "\"")