just one option is enough -- "isabelle jedit" java process may be prefixed directly in the shell;
authorwenzelm
Sun Oct 02 12:29:18 2016 +0200 (2016-10-02)
changeset 63987ac96fe9224f6
parent 63986 c7a4b03727ae
child 63988 2cdc56e8b671
just one option is enough -- "isabelle jedit" java process may be prefixed directly in the shell;
NEWS
src/Doc/JEdit/JEdit.thy
src/Tools/jEdit/lib/Tools/jedit
     1.1 --- a/NEWS	Sat Oct 01 23:05:25 2016 +0200
     1.2 +++ b/NEWS	Sun Oct 02 12:29:18 2016 +0200
     1.3 @@ -972,11 +972,8 @@
     1.4  
     1.5  * System option "ML_process_policy" specifies an optional command prefix
     1.6  for the underlying ML process, e.g. to control CPU affinity on
     1.7 -multiprocessor systems.
     1.8 -
     1.9 -* The "isabelle jedit" tool provides options -P and -p to specify an
    1.10 -optional command prefix for the Java and ML process, respectively (see
    1.11 -also option "ML_process_policy").
    1.12 +multiprocessor systems. The "isabelle jedit" tool allows to override the
    1.13 +implicit default via option -p.
    1.14  
    1.15  
    1.16  
     2.1 --- a/src/Doc/JEdit/JEdit.thy	Sat Oct 01 23:05:25 2016 +0200
     2.2 +++ b/src/Doc/JEdit/JEdit.thy	Sun Oct 02 12:29:18 2016 +0200
     2.3 @@ -238,6 +238,7 @@
     2.4      -l NAME      logic image name
     2.5      -m MODE      add print mode for output
     2.6      -n           no build of session image on startup
     2.7 +    -p CMD       ML process command prefix (process policy)
     2.8      -s           system build mode for session image
     2.9  
    2.10    Start jEdit with Isabelle plugin setup and open FILES
    2.11 @@ -294,6 +295,10 @@
    2.12    name (e.g.\ \<^verbatim>\<open>Isabelle2016\<close>). Thus @{tool jedit_client} can connect to the
    2.13    Isabelle desktop application without further options.
    2.14  
    2.15 +  The \<^verbatim>\<open>-p\<close> option allows to override the implicit default of the system
    2.16 +  option @{system_option_ref ML_process_policy} for ML processes started by
    2.17 +  the Prover IDE, e.g. to control CPU affinity on multiprocessor systems.
    2.18 +
    2.19    The JVM system property \<^verbatim>\<open>isabelle.jedit_server\<close> provides a different server
    2.20    name, e.g.\ use \<^verbatim>\<open>isabelle jedit -Disabelle.jedit_server=\<close>\<open>name\<close> and
    2.21    \<^verbatim>\<open>isabelle jedit_client -s\<close>~\<open>name\<close> to connect later on.
     3.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Sat Oct 01 23:05:25 2016 +0200
     3.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Sun Oct 02 12:29:18 2016 +0200
     3.3 @@ -98,7 +98,6 @@
     3.4    echo "  Options are:"
     3.5    echo "    -D NAME=X    set JVM system property"
     3.6    echo "    -J OPTION    add JVM runtime option (default $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS)"
     3.7 -  echo "    -P CMD       JVM process command prefix (process policy)"
     3.8    echo "    -b           build only"
     3.9    echo "    -d DIR       include session directory"
    3.10    echo "    -f           fresh build"
    3.11 @@ -134,7 +133,6 @@
    3.12  
    3.13  BUILD_ONLY=false
    3.14  BUILD_JARS="jars"
    3.15 -JAVA_PROCESS_POLICY=""
    3.16  ML_PROCESS_POLICY=""
    3.17  JEDIT_SESSION_DIRS=""
    3.18  JEDIT_LOGIC=""
    3.19 @@ -144,7 +142,7 @@
    3.20  function getoptions()
    3.21  {
    3.22    OPTIND=1
    3.23 -  while getopts "D:J:P:bd:fj:l:m:np:s" OPT
    3.24 +  while getopts "D:J:bd:fj:l:m:np:s" OPT
    3.25    do
    3.26      case "$OPT" in
    3.27        D)
    3.28 @@ -153,9 +151,6 @@
    3.29        J)
    3.30          JAVA_ARGS["${#JAVA_ARGS[@]}"]="$OPTARG"
    3.31          ;;
    3.32 -      P)
    3.33 -        JAVA_PROCESS_POLICY="$OPTARG"
    3.34 -        ;;
    3.35        b)
    3.36          BUILD_ONLY=true
    3.37          ;;
    3.38 @@ -373,5 +368,5 @@
    3.39    export JEDIT_SESSION_DIRS JEDIT_LOGIC JEDIT_PRINT_MODE JEDIT_BUILD_MODE
    3.40    export JEDIT_ML_PROCESS_POLICY="$ML_PROCESS_POLICY"
    3.41    classpath "$JEDIT_HOME/dist/jedit.jar"
    3.42 -  exec $JAVA_PROCESS_POLICY isabelle java "${JAVA_ARGS[@]}" isabelle.Main "${ARGS[@]}"
    3.43 +  exec isabelle java "${JAVA_ARGS[@]}" isabelle.Main "${ARGS[@]}"
    3.44  fi