clarified script name;
authorwenzelm
Fri, 10 Jan 2020 16:37:47 +0100
changeset 71363 ce3409dfb18c
parent 71362 597059a44d6f
child 71364 aecea7c4bda1
clarified script name;
Admin/Linux/Isabelle.c
Admin/Linux/Isabelle.run
Admin/Linux/Isabelle_app
Admin/components/bundled-linux
Admin/components/components.sha1
src/Pure/Admin/build_release.scala
--- a/Admin/Linux/Isabelle.c	Fri Jan 10 15:42:13 2020 +0100
+++ b/Admin/Linux/Isabelle.c	Fri Jan 10 16:37:47 2020 +0100
@@ -20,19 +20,19 @@
 
 int main(int argc, char *argv[])
 {
-  char **cmd_line = NULL, *cmd = NULL, *dcmd = NULL, *bcmd = NULL, *dname = NULL, *bname = NULL;
+  char **cmd_line = NULL, *cmd = NULL, *dcmd = NULL, *dname = NULL;
   int i = 0;
 
-  dcmd = strdup(argv[0]); dname = dirname(dcmd);
-  bcmd = strdup(argv[0]); bname = basename(bcmd);
+  dcmd = strdup(argv[0]);
+  dname = dirname(dcmd);
 
   cmd_line = malloc(sizeof(char *) * (argc + 1));
   if (cmd_line == NULL) fail("Failed to allocate command line");
 
   cmd = cmd_line[0];
-  cmd = malloc(strlen(dname) + strlen(bname) + strlen("/lib/scripts/.run") + 1);
+  cmd = malloc(strlen(dname) + strlen("/lib/scripts/Isabelle_app") + 1);
   if (cmd == NULL) fail("Failed to allocate command name");
-  sprintf(cmd, "%s/lib/scripts/%s.run", dname, bname);
+  sprintf(cmd, "%s/lib/scripts/Isabelle_app", dname);
 
   for (i = 1; i < argc; i++) cmd_line[i] = argv[i];
 
--- a/Admin/Linux/Isabelle.run	Fri Jan 10 15:42:13 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-#
-# Author: Makarius
-#
-# Main Isabelle application script.
-
-# minimal Isabelle environment
-
-ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)/../.."; pwd)"
-source "$ISABELLE_HOME/lib/scripts/isabelle-platform"
-
-
-# Java runtime options
-
-ISABELLE_NAME="$(basename "$0" .run)"
-declare -a JAVA_OPTIONS=($(perl -p -e 's,#.*$,,g;' "$ISABELLE_HOME/${ISABELLE_NAME}.options"))
-
-
-# main
-
-#paranoia setting -- avoid problems of Java/Swing versus XIM/IBus etc.
-unset XMODIFIERS
-
-exec "$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/bin/java" \
-  "-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
-  -classpath "{CLASSPATH}" \
-  "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
-  isabelle.Main "$@"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/Linux/Isabelle_app	Fri Jan 10 16:37:47 2020 +0100
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#
+# Author: Makarius
+#
+# Main Isabelle application script.
+
+# minimal Isabelle environment
+
+ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)/../.."; pwd)"
+source "$ISABELLE_HOME/lib/scripts/isabelle-platform"
+
+
+# Java runtime options
+
+ISABELLE_NAME="$(basename "$0" .run)"
+declare -a JAVA_OPTIONS=($(perl -p -e 's,#.*$,,g;' "$ISABELLE_HOME/${ISABELLE_NAME}.options"))
+
+
+# main
+
+#paranoia setting -- avoid problems of Java/Swing versus XIM/IBus etc.
+unset XMODIFIERS
+
+exec "$ISABELLE_HOME/contrib/jdk/x86_64-linux/jre/bin/java" \
+  "-Disabelle.root=$ISABELLE_HOME" "${JAVA_OPTIONS[@]}" \
+  -classpath "{CLASSPATH}" \
+  "-splash:$ISABELLE_HOME/lib/logo/isabelle.gif" \
+  isabelle.Main "$@"
--- a/Admin/components/bundled-linux	Fri Jan 10 15:42:13 2020 +0100
+++ b/Admin/components/bundled-linux	Fri Jan 10 16:37:47 2020 +0100
@@ -1,2 +1,2 @@
 #additional components to be bundled for release
-linux_app-20191223
+linux_app-20200110
--- a/Admin/components/components.sha1	Fri Jan 10 15:42:13 2020 +0100
+++ b/Admin/components/components.sha1	Fri Jan 10 16:37:47 2020 +0100
@@ -176,6 +176,7 @@
 5f95c96bb99927f3a026050f85bd056f37a9189e  kodkodi-1.5.2.tar.gz
 377e36efb8608e6c828c7718d890e97fde2006a4  linux_app-20131007.tar.gz
 759848095e2ad506083d92b5646947e3c32f27a0  linux_app-20191223.tar.gz
+1a449ce69ac874e21804595d16aaaf5a0d0d0c10  linux_app-20200110.tar.gz
 0aab4f73ff7f5e36f33276547e10897e1e56fb1d  macos_app-20130716.tar.gz
 ad5d0e640ce3609a885cecab645389a2204e03bb  macos_app-20150916.tar.gz
 400af57ec5cd51f96928d9de00d077524a6fe316  macos_app-20181205.tar.gz
--- a/src/Pure/Admin/build_release.scala	Fri Jan 10 15:42:13 2020 +0100
+++ b/src/Pure/Admin/build_release.scala	Fri Jan 10 16:37:47 2020 +0100
@@ -509,10 +509,9 @@
             File.write(isabelle_target + Path.explode(isabelle_name + ".options"),
               terminate_lines(java_options_title :: java_options))
 
-            val isabelle_run =
-              isabelle_target + Path.explode("lib/scripts/" + isabelle_name + ".run")
+            val isabelle_run = isabelle_target + Path.explode("lib/scripts/Isabelle_app")
             File.write(isabelle_run,
-              File.read(Path.explode("~~/Admin/Linux/Isabelle.run"))
+              File.read(Path.explode("~~/Admin/Linux/Isabelle_app"))
                 .replaceAllLiterally("{CLASSPATH}",
                   classpath.map("$ISABELLE_HOME/" + _).mkString(":"))
                 .replaceAllLiterally("/jdk/", "/" + jdk_component + "/"))