From a78c48955be4d96a09d1829e951517f3e42f0c13 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Wed, 30 Mar 2022 12:11:36 -0400 Subject: [PATCH] prepare for 0.12 --- CHANGES.md | 8 ++++++++ Makefile | 9 +++++++++ src/Tiny_httpd_buf.mli | 2 +- src/Tiny_httpd_dir.mli | 10 +++++----- src/Tiny_httpd_html.ml | 2 +- src/gen/gentags.ml | 2 +- tiny_httpd.opam | 2 +- tiny_httpd_camlzip.opam | 2 +- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 99eac31e..83d24ac0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +## 0.12 + +- add dep on `seq` +- add a `Html` module with combinators to produce html +- add `Tiny_httpd_dir.VFS` to emulate file systems +- add a small program, `tiny-httpd-vfs-pack`, to pack directories and files + (local or behind a URL) into a OCaml module using `VFS` +- show small example of socket activation ## 0.11 diff --git a/Makefile b/Makefile index 39fceab8..85661a75 100644 --- a/Makefile +++ b/Makefile @@ -18,3 +18,12 @@ watch: @dune build @all -w .PHONY: benchs tests build watch + +VERSION=$(shell awk '/^version:/ {print $$2}' tiny_httpd.opam) + +update_next_tag: + @echo "update version to $(VERSION)..." + sed --follow-symlinks -i "s/NEXT_VERSION/$(VERSION)/g" $(wildcard src/**.ml) $(wildcard src/**.mli) \ + $(wildcard src/**/*.ml) $(wildcard src/**/*.mli) + sed --follow-symlinks -i "s/NEXT_RELEASE/$(VERSION)/g" $(wildcard src/**.ml) $(wildcard src/**.mli) \ + $(wildcard src/**/*.ml) $(wildcard src/**/*.mli) diff --git a/src/Tiny_httpd_buf.mli b/src/Tiny_httpd_buf.mli index 24f3c42b..aa93551f 100644 --- a/src/Tiny_httpd_buf.mli +++ b/src/Tiny_httpd_buf.mli @@ -4,7 +4,7 @@ These buffers are used to avoid allocating too many byte arrays when processing streams and parsing requests. - @since NEXT_RELEASE + @since 0.12 *) type t diff --git a/src/Tiny_httpd_dir.mli b/src/Tiny_httpd_dir.mli index 67bf5f51..34e622fd 100644 --- a/src/Tiny_httpd_dir.mli +++ b/src/Tiny_httpd_dir.mli @@ -68,7 +68,7 @@ val config : unit -> config (** Build a config from {!default_config}. - @since NEXT_RELEASE *) + @since 0.12 *) (** [add_dirpath ~config ~dir ~prefix server] adds route handle to the [server] to serve static files in [dir] when url starts with [prefix], @@ -83,7 +83,7 @@ val add_dir_path : This is used to emulate a file system from pure OCaml functions and data, e.g. for resources bundled inside the web server. - @since NEXT_RELEASE + @since 0.12 *) module type VFS = sig val descr : string @@ -118,7 +118,7 @@ end val vfs_of_dir : string -> (module VFS) (** [vfs_of_dir dir] makes a virtual file system that reads from the disk. - @since NEXT_RELEASE + @since 0.12 *) val add_vfs : @@ -127,14 +127,14 @@ val add_vfs : prefix:string -> Tiny_httpd_server.t -> unit (** Similar to {!add_dir_path} but using a virtual file system instead. - @since NEXT_RELEASE + @since 0.12 *) (** An embedded file system, as a list of files with (relative) paths. This is useful in combination with the "tiny-httpd-mkfs" tool, which embeds the files it's given into a OCaml module. - @since NEXT_RELEASE + @since 0.12 *) module Embedded_fs : sig type t diff --git a/src/Tiny_httpd_html.ml b/src/Tiny_httpd_html.ml index 6188fa29..987798d7 100644 --- a/src/Tiny_httpd_html.ml +++ b/src/Tiny_httpd_html.ml @@ -4,7 +4,7 @@ This module provides combinators to produce html. It doesn't enforce the well-formedness of the html, unlike Tyxml, but it's simple and should be reasonably efficient. - @since NEXT_RELEASE + @since 0.12 *) (** @inline *) diff --git a/src/gen/gentags.ml b/src/gen/gentags.ml index 43a6fc2a..19ce5aaa 100644 --- a/src/gen/gentags.ml +++ b/src/gen/gentags.ml @@ -283,7 +283,7 @@ let prelude = {| This output type is used to produce a string reasonably efficiently from a tree of combinators. - @since NEXT_RELEASE + @since 0.12 @open *) module Out : sig type t diff --git a/tiny_httpd.opam b/tiny_httpd.opam index d0ea743a..56345eb9 100644 --- a/tiny_httpd.opam +++ b/tiny_httpd.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "0.11" +version: "0.12" authors: ["Simon Cruanes"] maintainer: "simon.cruanes.2007@m4x.org" license: "MIT" diff --git a/tiny_httpd_camlzip.opam b/tiny_httpd_camlzip.opam index 11da244a..0bc0ff12 100644 --- a/tiny_httpd_camlzip.opam +++ b/tiny_httpd_camlzip.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "0.11" +version: "0.12" authors: ["Simon Cruanes"] maintainer: "simon.cruanes.2007@m4x.org" license: "MIT"