From 361fd40c4e1a3c68f05735e2f8e03f65c5a3a2d7 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 23 Feb 2021 13:46:05 +0100 Subject: Generate the website from guix --- Makefile.am | 3 +- guix/vkraus/packages/web-client-with-cache.scm | 92 +++++++++++++++++++++----- website.scm | 3 + 3 files changed, 81 insertions(+), 17 deletions(-) create mode 100644 website.scm diff --git a/Makefile.am b/Makefile.am index 3a5125f..aecdf2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,8 @@ EXTRA_DIST = web-client-with-cache.org \ doc/style.css \ doc/fdl.texi \ .guix-channel \ - guix/vkraus/packages/web-client-with-cache.scm + guix/vkraus/packages/web-client-with-cache.scm \ + website.scm moddir = $(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION) godir = $(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache diff --git a/guix/vkraus/packages/web-client-with-cache.scm b/guix/vkraus/packages/web-client-with-cache.scm index e74984f..46b31e9 100644 --- a/guix/vkraus/packages/web-client-with-cache.scm +++ b/guix/vkraus/packages/web-client-with-cache.scm @@ -18,7 +18,8 @@ #:use-module (gnu packages emacs) #:use-module (gnu packages emacs-xyz) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages texinfo)) + #:use-module (gnu packages texinfo) + #:use-module (gnu packages tex)) (define-public (make-web-client-with-cache version commit hash) (package @@ -42,17 +43,7 @@ (call-with-output-file ".tarball-version" (lambda (port) (display ,version port))) - #t)) - (add-after - 'build 'build-html - (lambda* args - (invoke "make" "html" - "-j" (number->string (parallel-job-count))))) - (add-after - 'install 'install-html - (lambda* args - (invoke "make" "install-html" - "-j" (number->string (parallel-job-count)))))))) + #t))))) (native-inputs `(("emacs" ,emacs) ("emacs-org" ,emacs-org) @@ -70,10 +61,79 @@ (description "Uses client-side Cache-Control, ETag, and Last-Modified to cache web resources in memory.") (home-page "https://labo.planete-kraus.eu/web-client-with-cache.git/") - (license 'none))) + (license license:gpl3+))) (define-public guile-web-client-with-cache (make-web-client-with-cache - "0.3.2" - "0.3.2" - "0l615kf7xq5xn6b5i6ybhzwmmg0pz2q8hp2p1if9by1ybd3rf31b")) + "0.3.3" + "0.3.3" + "1afifbkfa6jml98q8c5xnikr6w95pg463dbp287l6pigbwabpyji")) + +(define-public guile-web-client-with-cache-html + (package + (inherit guile-web-client-with-cache) + (name "guile-web-client-with-cache-html") + (arguments + `(#:phases + (modify-phases + %standard-phases + (add-after + 'unpack 'set-version + (lambda* args + (call-with-output-file ".tarball-version" + (lambda (port) + (display ,(package-version guile-web-client-with-cache) port))) + #t)) + (add-after + 'build 'build-html + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "html" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags)))) + (replace + 'install + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "install-html" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags))))))) + (synopsis "HTML documentation for guile-web-client-with-cache") + (description "The manual for guile-web-client-with-cache is provided as a texinfo file, which is converted to HTML."))) + +(define-public guile-web-client-with-cache-dist + (let ((dist (dist-package + guile-web-client-with-cache + (package-source guile-web-client-with-cache) + #:phases + `(modify-phases + %dist-phases + (add-after + 'unpack 'set-version + (lambda* args + (call-with-output-file ".tarball-version" + (lambda (port) + (display ,(package-version guile-web-client-with-cache) port))) + #t)))))) + (package + (inherit dist) + (native-inputs + (cons* `("texlive" ,texlive) + (package-native-inputs dist))) + (synopsis "Release tarball for guile-web-client-with-cache") + (description "This package provides a tarball for the release of web-client-with-cache.")))) + +(define-public guile-web-client-with-cache:website + (directory-union + "website" + (list + (file-append guile-web-client-with-cache-html "/share/doc/web-client-with-cache/web-client-with-cache.html") + (file-union + "downloads" + `(("source.tar.gz" + ,(file-append + guile-web-client-with-cache-dist + (format #f "/web-client-with-cache-~a.tar.gz" + (package-version guile-web-client-with-cache-dist))))))))) diff --git a/website.scm b/website.scm new file mode 100644 index 0000000..afdd93b --- /dev/null +++ b/website.scm @@ -0,0 +1,3 @@ +(use-modules (vkraus packages web-client-with-cache)) + +guile-web-client-with-cache:website -- cgit v1.2.3