From 5eb538d72e3eeea3169fb8bc97a0a9e5178330dc Mon Sep 17 00:00:00 2001 From: Allan Blanchard <allan.blanchard@cea.fr> Date: Mon, 1 Aug 2022 16:53:57 +0200 Subject: [PATCH] [doc] provide direct files for (E)ACSL versions --- .gitlab-ci.yml | 1 + doc/Makefile | 11 ++++++++++- nix/manuals.nix | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7ee6c797ec..104357272e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -233,6 +233,7 @@ manuals: paths: - manuals/*.pdf - manuals/*.tgz + - manuals/*.txt expire_in: 7 days # Note: the LAST artifact of the ref is always kept ################################################################################ diff --git a/doc/Makefile b/doc/Makefile index 584d88aec76..25ca4a31028 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -149,9 +149,13 @@ all: \ manuals/acsl-implementation$(FC_SUFFIX).pdf \ manuals/acsl$(ACSL_SUFFIX).pdf \ +version: manuals/acsl-version.txt + manuals/acsl-implementation$(FC_SUFFIX).pdf: acsl/acsl-implementation.pdf manuals/acsl$(ACSL_SUFFIX).pdf: acsl/acsl.pdf +manuals/acsl-version.txt: + echo ${ACSL_VERSION} > $@ ################### # E-ACSL # @@ -182,12 +186,17 @@ clean:: all: \ manuals/e-acsl-implementation$(FC_SUFFIX).pdf \ manuals/e-acsl-manual$(FC_SUFFIX).pdf \ - manuals/e-acsl$(EACSL_SUFFIX).pdf \ + manuals/e-acsl$(EACSL_SUFFIX).pdf + +version: manuals/e-acsl-version.txt manuals/e-acsl-implementation$(FC_SUFFIX).pdf: $(EACSL_DOC)/refman/e-acsl-implementation.pdf manuals/e-acsl-manual$(FC_SUFFIX).pdf: $(EACSL_DOC)/userman/main.pdf manuals/e-acsl$(EACSL_SUFFIX).pdf: $(EACSL_DOC)/refman/e-acsl.pdf +manuals/e-acsl-version.txt: + echo ${EACSL_VERSION} > $@ + endif # Note: The makefiles of ACSL/E-ACSL are not parallelizable when producing both diff --git a/nix/manuals.nix b/nix/manuals.nix index 1b9cb776c26..18fc9fbb379 100644 --- a/nix/manuals.nix +++ b/nix/manuals.nix @@ -43,12 +43,13 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - make -C doc NO_SUFFIX=yes all + make -C doc NO_SUFFIX=yes all version ''; installPhase = '' mkdir -p $out cp ./doc/manuals/*.pdf $out cp ./doc/manuals/*.tgz $out + cp ./doc/manuals/*.txt $out ''; } -- GitLab