Prefer DOF parameters over Isabelle options

This commit is contained in:
Makarius Wenzel 2022-12-03 12:37:58 +01:00
parent d93e1383d4
commit aee8ba1df1
3 changed files with 5 additions and 6 deletions

View File

@ -4,7 +4,3 @@ section "Isabelle/DOF"
public option dof_ontologies : string = "Isabelle_DOF.technical_report Isabelle_DOF.scholarly_paper"
-- "Isabelle/DOF ontologies (separated by blanks)"
(*for install-afp only*)
option dof_isabelle : string = "2022"
option dof_afp : string = "afp-2022-10-27"

View File

@ -151,7 +151,7 @@ fi
ACTUAL_ISABELLE_VERSION=`$ISABELLE_TOOL version`
ISABELLE_VERSION="Isabelle$($ISABELLE_TOOL options -g dof_isabelle)"
ISABELLE_VERSION="Isabelle$($ISABELLE_TOOL dof_param -b isabelle_version)"
if [ ${ISABELLE_VERSION} = "Isabelle" ];
then
@ -163,7 +163,7 @@ fi
AFP_DATE="$($ISABELLE_TOOL options -g dof_afp)"
AFP_DATE="$($ISABELLE_TOOL dof_param -b afp_version)"
AFP_URL="https://www.isa-afp.org/release/"$AFP_DATE".tar.gz"
echo ""

View File

@ -40,6 +40,8 @@ object DOF {
val isabelle_version = "2022"
val isabelle_url = "https://isabelle.in.tum.de/website-Isabelle2022"
val afp_version = "afp-2022-10-27"
// Isabelle/DOF version: "Unreleased" for development, semantic version for releases
val version = "Unreleased"
@ -80,6 +82,7 @@ object DOF {
val parameters: List[Parameter] =
List(
Parameter("isabelle_version", isabelle_version),
Parameter("afp_version", afp_version),
Parameter("dof_version", version))
def print_parameters(names: List[String],