merge with stable 0.4.1

src/plugins/e-acsl/VERSION

-0.4+dev
+0.4.1

src/plugins/e-acsl/doc/Changelog

@@ -15,6 +15,10 @@
 #   E-ACSL: the Whole E-ACSL plug-in
 ###############################################################################
 
+########################
+Plugin E-ACSL 0.4.1 Neon
+########################
+
 -* E-ACSL       [2014/08/05] Fix bug #1838 about memset.
 -* E-ACSL       [2014/08/05] Fix bug #1818 about initialization of globals.
 -* E-ACSL       [2014/08/04] Fix bug #1696 by clarifying the manual.

src/plugins/e-acsl/doc/refman/Makefile

+VERSION_FILE=../../VERSION
+
 MAIN=main
 DEPS_MODERN=macros_modern.tex eacslversion.tex biblio.bib \
 	intro_modern.tex speclang_modern.tex \
@@ -19,7 +21,7 @@ e-acsl: e-acsl-implementation.pdf e-acsl.pdf main.pdf
 all: e-acsl
 
 LANGUAGE_VERSION=1.8
-EACSL_VERSION= 0.4
+EACSL_VERSION=$(shell cat $(VERSION_FILE))
 
 EACSL_DIR=../..
 DISTRIB_DIR=$(HOME)/frama-c/doc/www/distrib
@@ -32,7 +34,7 @@ install: e-acsl-implementation.pdf e-acsl.pdf
 
 include $(EACSL_DIR)/doc/support/MakeLaTeXModern
 
-eacslversion.tex: Makefile
+eacslversion.tex: Makefile $(VERSION_FILE)
 	rm -f $@
 	echo '\\newcommand{\\eacslversion}{$(EACSL_VERSION)}' > $@
 	chmod a-w $@

src/plugins/e-acsl/doc/refman/eacslversion.tex

-\newcommand{\eacslversion}{0.4}
+\newcommand{\eacslversion}{0.4.1}

src/plugins/e-acsl/doc/userman/Makefile

 MAIN=main
 
 C_CODE=$(wildcard examples/*.[ci])
+VERSION_FILE=../../VERSION
 
 DEPS_MODERN=eacslversion.tex biblio.bib macros.tex \
 	introduction.tex \
 	provides.tex \
 	limitations.tex \
 	changes.tex \
-	$(C_CODE)
-
+	$(C_CODE) \
+	$(VERSION_FILE)
 
 default: main.pdf
 
 main.pdf: $(DEPS_MODERN)
 
-EACSL_VERSION= 0.4+dev
-FC_VERSION= Neon-20140301
+EACSL_VERSION= $(shell cat $(VERSION_FILE))
+FC_VERSION= Neon
 
 EACSL_DIR=../..
 DISTRIB_DIR=$(HOME)/frama-c/doc/www/distrib

src/plugins/e-acsl/doc/userman/eacslversion.tex

-\newcommand{\eacslversion}{0.4+dev\xspace}
-\newcommand{\fcversion}{Neon-20140301\xspace}
+\newcommand{\eacslversion}{0.4.1\xspace}
+\newcommand{\fcversion}{Neon\xspace}

src/plugins/e-acsl/doc/userman/main.tex

@@ -17,8 +17,8 @@
 \includegraphics[height=14mm]{cealistlogo.jpg}
 \end{flushleft}
 \vfill
-\title{\framac's \eacsl Plug-in}{Release \eacslversion compatible 
-  with \fcversion}
+\title{\eacsl Plug-in}{Release \eacslversion compatible 
+  with \framac \fcversion}
 \author{Julien Signoles}
 \begin{tabular}{l}
 CEA LIST, Software Safety Laboratory, Saclay, F-91191 \\