Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit a45f6871 authored by Jean-Christophe Filliâtre's avatar Jean-Christophe Filliâtre
Browse files

configure: src/config.ml is now built from src/config.sh.in (and not from src/config.ml.in)

parent d8377cef
......@@ -81,7 +81,7 @@ EXTCMXA = $(addsuffix .cmxa,$(EXTLIBS))
all: @OCAMLBEST@
.PHONY: byte opt clean depend all
.PHONY: byte opt clean depend all install
#############
# Why library
......@@ -199,6 +199,10 @@ clean::
rm -f src/main.cm[iox] src/main.annot src/main.o
rm -f bin/why.byte bin/why.opt
install::
mkdir -p $(BINDIR)
cp -f bin/why.@OCAMLBEST@ $(BINDIR)/why3
########
# Whyml
########
......@@ -475,9 +479,14 @@ bin/why3-cpulimit: src/tools/@CPULIMIT@.c
clean::
rm -f bin/why3-cpulimit src/tools/*~
install::
mkdir -p $(BINDIR)
cp -f bin/why3-cpulimit $(BINDIR)
#########
# drivers
#########
#Only generated drivers
DIR_DRIVERS := drivers/
......@@ -557,6 +566,12 @@ testl-type: bin/whyml.byte
# installation
###############
install::
mkdir -p $(LIBDIR)/why3
cp -f --parents theories/*.why theories/*/*.why $(LIBDIR)/why3/
cp -f --parents drivers/*.drv $(LIBDIR)/why3/
cp -f why.conf $(LIBDIR)/why3/
## install: install-binary install-lib install-man
##
## BINARYFILES = $(BINARY) bin/why-ide.$(OCAMLBEST)
......@@ -856,9 +871,12 @@ headers:
Makefile: Makefile.in config.status
./config.status --file $@
src/config.ml: src/config.ml.in config.status
src/config.sh: src/config.sh.in config.status
./config.status --file $@
src/config.ml: src/config.sh config.status
LIBDIR=$(LIBDIR) src/config.sh
doc/version.tex: doc/version.tex.in config.status
./config.status --file $@
......
......@@ -336,9 +336,10 @@ dnl AC_SUBST(PDFVIEWER)
# Finally create the Makefile from Makefile.in
dnl AC_OUTPUT(Makefile)
AC_CONFIG_FILES(Makefile src/config.ml doc/version.tex)
AC_CONFIG_FILES(Makefile src/config.sh doc/version.tex)
AC_OUTPUT
chmod a-w Makefile src/config.ml doc/version.tex
chmod a-w Makefile src/config.sh doc/version.tex
chmod a+x src/config.sh
# Summary
......
(**************************************************************************)
(* *)
(* Copyright (C) 2010- *)
(* Francois Bobot *)
(* Jean-Christophe Filliatre *)
(* Johannes Kanig *)
(* Andrei Paskevich *)
(* *)
(* This software is free software; you can redistribute it and/or *)
(* modify it under the terms of the GNU Library General Public *)
(* License version 2.1, with the special exception on linking *)
(* described in file LICENSE. *)
(* *)
(* This software is distributed in the hope that it will be useful, *)
(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *)
(* *)
(**************************************************************************)
# 21 "src/config.ml.in"
let why_version = "@VERSION@"
let why_builddate = "@BUILDDATE@"
let why_plugins = ("@enable_plugins@" = "yes")
module Dynlink_ = struct
let is_native = true
let loadfile_private _ = assert false
type error
exception Error of error
let error_message _ = (assert false : string)
end
module Dynlink = struct
include @DYNLINK@
end
F=src/config.ml
echo "let why_version = \"@VERSION@\"" > $F
echo "let why_builddate = \"@BUILDDATE@\"" >> $F
echo "let why_plugins = (\"@enable_plugins@\" = \"yes\")" >> $F
echo "let why_libdir = \"$LIBDIR/why3\"" >> $F
echo "
module Dynlink_ = struct
let is_native = true
let loadfile_private _ = assert false
type error
exception Error of error
let error_message _ = (assert false : string)
end
module Dynlink = struct
include @DYNLINK@
end
" >> $F
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment