Changeset 2 in code for trunk

Timestamp:

Nov 3, 2021, 10:29:57 PM (3 years ago)

Author:

fox

Message:

Samhain 21

Converter

• type selection
• subdir conversion
• htm extension

Gemini

• index.gmi
• topics and latest
• gmi.atom feed

Add pull (http(s)) operation

• peers.pub.conf and peers.priv.conf

HTML5 format & fixes by Novaburst
Phony target (thanks Gergely)

May

Basic unit renamed from Note to Text.
New modular text-parser, internal to Logarion, for generic notation parsing. The default input format is now a much plainer text.
Logarion created texts have part of the UUID in filename.
Logarion's index re-written in Messagepack format. Removed indices command. They are generated during convert.

Location:

trunk

Files:

• CONTRIBUTING.md (deleted)
• Makefile (modified) (1 diff)
• README.md (deleted)
• cli (added)
• cli/atom.ml (added)
• cli/cli.ml (added)
• cli/convert.ml (added)
• cli/dune (added)
• cli/gemini.ml (added)
• cli/html.ml (added)
• doc/logarion.odocl (deleted)
• dune-project (added)
• http (added)
• http/dune (added)
• http/http.ml (added)
• lib (added)
• lib/archive.ml (added)
• lib/category.ml (added)
• lib/date.ml (added)
• lib/dune (added)
• lib/file_store.ml (added)
• lib/header_pack.ml (added)
• lib/id.ml (added)
• lib/peers.ml (added)
• lib/person.ml (added)
• lib/store.ml (added)
• lib/string_set.ml (added)
• lib/text.ml (added)
• lib/topic_set.ml (added)
• logarion.opam (modified) (1 diff)
• readme (added)
• share/config.toml (deleted)
• share/sass/fonts/orbitron.sass (deleted)
• share/sass/layout.sass (deleted)
• share/sass/main-dark.sass (deleted)
• share/sass/main-light.sass (deleted)
• share/static/main.css (deleted)
• share/template/frontpage.mustache (deleted)
• share/template/header.mustache (deleted)
• share/template/item.mustache (deleted)
• share/template/list.mustache (deleted)
• share/template/note.mustache (deleted)
• src/confix/config.ml (deleted)
• src/confix/confixToml.ml (deleted)
• src/confix/jbuild (deleted)
• src/converters/atom.ml (deleted)
• src/converters/html.ml (deleted)
• src/converters/jbuild (deleted)
• src/converters/template.ml (deleted)
• src/core/archive.ml (deleted)
• src/core/jbuild (deleted)
• src/core/lpath.ml (deleted)
• src/core/meta.ml (deleted)
• src/core/note.ml (deleted)
• src/core/store.ml (deleted)
• src/jbuild (deleted)
• src/logarion_cli.ml (deleted)
• src/store/file.ml (deleted)
• src/store/jbuild (deleted)

trunk/Makefile

@@ -1 @@
-all: cli
+all:
+        dune build
 
 cli:
-        dune build src/logarion_cli.exe
+        dune build cli/cli.exe
 
 clean:
         dune clean
 
-theme-dark:
-        sassc share/sass/main-dark.sass > share/static/main.css
+tgz:
+        dune subst
+        dune build
+        cp _build/default/cli/cli.exe txt
+        strip txt
+        tar czvf "logarion-$(shell date -r _build/default/cli/cli.exe "+%y-%m-%d")-$(shell uname -s)-$(shell uname -m)-$(shell git rev-parse --short HEAD).tar.gz" txt ReadMe
+        rm txt
 
-theme-light:
-        sassc share/sass/main-light.sass > share/static/main.css
-
-tgz:
-        cp _build/default/src/logarion_cli.exe logarion
-        strip logarion
-        tar czvf "logarion-$(shell ./logarion --version)-$(shell uname -s)-$(shell uname -m)-$(shell git rev-parse --short HEAD).tar.gz" share logarion
+.PHONY: cli

trunk/logarion.opam

@@ -1 @@
-opam-version: "1.2"
-name: "logarion"
-version: "0.5.0"
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+synopsis: "Texts archival and exchange"
+maintainer: ["fox@orbitalfox.eu"]
+authors: ["orbifx"]
+license: "EUPL-1.2"
 homepage: "https://logarion.orbitalfox.eu"
-dev-repo: "git://orbitalfox.eu/logarion"
-bug-reports: "mailto:logarion@lists.orbitalfox.eu?subject=[Issue]"
-maintainer: "Stavros Polymenis <sp@orbitalfox.eu>"
-authors: "Stavros Polymenis <sp@orbitalfox.eu>"
-license: "EUPL"
-build: [
-  ["dune" "build" "--root" "." "-j" jobs "@install"]
-]
+bug-reports: "mailto:logarion@lists.orbitalfox.eu?subject=Issue:"
 depends: [
-  "dune" {build}
+  "dune" {>= "2.0"}
+  "re"
+  "cmdliner"
+  "bos"
   "ptime"
   "uuidm"
   "uri"
-  "re"
-  "emile"
-  "omd"
-  "lwt"
-  "mustache"
-  "tyxml"
-
-  "cmdliner"
-  "bos"
-  "toml"
-  "fpath"
+  "text_parse"
+  "msgpck"
+  "cohttp-lwt-unix"
+  "tls"
 ]
+build: [
+  ["dune" "subst"] {pinned}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git://orbitalfox.eu/logarion"