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/

Commit a5e3315a authored by Makarius's avatar Makarius Committed by Stefan Berghofer
Browse files

clarified jEdit server mode: start "isabelle why3_jedit" first and let why3ide...

clarified jEdit server mode: start "isabelle why3_jedit" first and let why3ide connect to via "isabelle why3 -i jedit"
parent 87ef312e
......@@ -16,10 +16,16 @@ function usage()
echo " -b batch mode"
echo " -i NAME interactive mode using interface NAME"
echo
echo " Process files generated by Why3"
echo "Process files generated by Why3."
exit 1
}
function fail()
{
echo "$1" >&2
exit 2
}
## utilities
......@@ -61,30 +67,30 @@ done
shift $(($OPTIND - 1))
if [ "$1" = "" ]; then
usage
else
NAME=`dirname "$1"`/`basename "$1" .xml`
fi
[ "$#" != 1 ] && usage
NAME=`dirname "$1"`/`basename "$1" .xml`
if [ "$BATCH" = true ]; then
$ISABELLE_PROCESS -e "use_thy \"$NAME\";" -rq Why3
"$ISABELLE_PROCESS" -e "use_thy \"$NAME\";" -rq Why3
elif [ "$INTERACTIVE" = true ]; then
make_theory "$NAME"
case "$INTERFACE" in
emacs)
"$ISABELLE_TOOL" emacs -L Why3 "$NAME.thy"
"$ISABELLE_TOOL" emacs -L Why3 "${NAME}.thy"
;;
jedit)
"$ISABELLE_TOOL" jedit -l Why3 "$NAME.thy"
;;
jedit-server)
if [ -f "$JEDIT_SETTINGS/server-Why3" ]; then
"$ISABELLE_TOOL" jedit -j-server=server-Why3 -l Pure "$NAME.thy"
if [ -f "$JEDIT_SETTINGS/$WHY3_JEDIT_SERVER" ]; then
"$ISABELLE_TOOL" java -jar "$(jvmpath "$JEDIT_HOME/dist/jedit.jar")" \
"-settings=$(jvmpath "$JEDIT_SETTINGS")" "-server=$WHY3_JEDIT_SERVER" \
-reuseview -wait "$(jvmpath "${NAME}.thy")"
else
"$ISABELLE_TOOL" jedit -j-server=server-Why3 -l Why3 "$NAME.thy" &
"$ISABELLE_TOOL" jedit -l Why3 "${NAME}.thy"
fi
;;
*)
fail "Unknown Isabelle interface: \"$INTERFACE\""
;;
esac
else
usage
......
#!/usr/bin/env bash
#
# DESCRIPTION: Isabelle/jEdit with Why3 session and server port
## diagnostics
PRG="$(basename "$0")"
function usage()
{
echo
echo "Usage: isabelle $PRG [ARGS...]"
echo
echo "Start Isabelle/jEdit with Why3 session and server port, for quick invocation"
echo "via why3ide."
exit 1
}
function fail()
{
echo "$1" >&2
exit 2
}
## main
[ "$1" = "-?" ] && usage
SERVER_FILE="$JEDIT_SETTINGS/$WHY3_JEDIT_SERVER"
if [ -f "$SERVER_FILE" ]; then
fail "Server already running: \"$SERVER_FILE\""
else
exec "$ISABELLE_TOOL" jedit "-j-server=$WHY3_JEDIT_SERVER" -l Why3 "$@"
fi
# -*- shell-script -*- :mode=shellscript:
WHY3_ISABELLE_HOME="$COMPONENT"
WHY3_JEDIT_SERVER="server-Why3"
ISABELLE_TOOLS="$ISABELLE_TOOLS:$WHY3_ISABELLE_HOME/Tools"
......@@ -451,7 +451,7 @@ version_ok = "2013-2"
command = "%l/why3-cpulimit 0 0 -s %e why3 -b %f"
driver = "drivers/isabelle.drv"
in_place = true
editor = "isabelle-jedit-server"
editor = "isabelle-jedit"
[editor pvs]
name = "PVS"
......@@ -470,10 +470,6 @@ command = "emacs23 --eval \"(setq coq-load-path '(\\\"%l/coq-tactic\\\" \
name = "Isabelle/jEdit"
command = "isabelle why3 -i jedit %f"
[editor isabelle-jedit-server]
name = "Isabelle/jEdit (server)"
command = "isabelle why3 -i jedit-server %f"
[editor proofgeneral-isabelle]
name = "Emacs/ProofGeneral/Isabelle"
command = "isabelle why3 -i emacs %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