--- a/Admin/Release/CHECKLIST Wed Mar 31 12:02:52 2021 +0200
+++ b/Admin/Release/CHECKLIST Wed Mar 31 17:15:54 2021 +0200
@@ -74,7 +74,7 @@
- fully-automated packaging (e.g. on lxcisa0):
- hg up -r DISTNAME && Admin/build_release -b HOL -l -O -R DISTNAME /home/isabelle/dist
+ hg up -r DISTNAME && Admin/build_release -b HOL -l -R DISTNAME /home/isabelle/dist
- Docker image:
--- a/src/Pure/Admin/build_release.scala Wed Mar 31 12:02:52 2021 +0200
+++ b/src/Pure/Admin/build_release.scala Wed Mar 31 17:15:54 2021 +0200
@@ -54,15 +54,14 @@
private val ISABELLE_ID = """ISABELLE_ID="(.+)"""".r
- def patch_release(release: Release, is_official: Boolean): Unit =
+ def patch_release(release: Release): Unit =
{
val dir = release.isabelle_dir
for (name <- List("src/Pure/System/distribution.ML", "src/Pure/System/distribution.scala"))
{
File.change(dir + Path.explode(name),
- _.replace("val is_identified = false", "val is_identified = true")
- .replace("val is_official = false", "val is_official = " + is_official))
+ _.replace("val is_identified = false", "val is_identified = true"))
}
File.change(dir + getsettings_path,
@@ -380,7 +379,6 @@
progress: Progress = new Progress,
rev: String = "",
afp_rev: String = "",
- official_release: Boolean = false,
proper_release_name: Option[String] = None,
platform_families: List[Platform.Family.Value] = default_platform_families,
more_components: List[Path] = Nil,
@@ -453,7 +451,7 @@
progress.echo_warning("Preparing distribution " + quote(release.dist_name))
- patch_release(release, proper_release_name.isDefined && official_release)
+ patch_release(release)
if (proper_release_name.isEmpty) make_announce(release)
@@ -858,7 +856,6 @@
Command_Line.tool {
var afp_rev = ""
var components_base: Path = Components.default_components_base
- var official_release = false
var proper_release_name: Option[String] = None
var website: Option[Path] = None
var build_sessions: List[String] = Nil
@@ -876,7 +873,6 @@
-A REV corresponding AFP changeset id
-C DIR base directory for Isabelle components (default: """ +
Components.default_components_base + """)
- -O official release (not release-candidate)
-R RELEASE proper release with name
-W WEBSITE produce minimal website in given directory
-b SESSIONS build platform-specific session images (separated by commas)
@@ -891,7 +887,6 @@
""",
"A:" -> (arg => afp_rev = arg),
"C:" -> (arg => components_base = Path.explode(arg)),
- "O" -> (_ => official_release = true),
"R:" -> (arg => proper_release_name = Some(arg)),
"W:" -> (arg => website = Some(Path.explode(arg))),
"b:" -> (arg => build_sessions = space_explode(',', arg)),
@@ -916,7 +911,7 @@
error("Building for windows requires 7z")
build_release(Path.explode(base_dir), options, components_base = components_base,
- progress = progress, rev = rev, afp_rev = afp_rev, official_release = official_release,
+ progress = progress, rev = rev, afp_rev = afp_rev,
proper_release_name = proper_release_name, website = website,
platform_families =
if (platform_families.isEmpty) default_platform_families
--- a/src/Pure/System/distribution.ML Wed Mar 31 12:02:52 2021 +0200
+++ b/src/Pure/System/distribution.ML Wed Mar 31 17:15:54 2021 +0200
@@ -8,5 +8,4 @@
struct
val version = "repository version";
val is_identified = false;
- val is_official = false;
end;
--- a/src/Pure/System/distribution.scala Wed Mar 31 12:02:52 2021 +0200
+++ b/src/Pure/System/distribution.scala Wed Mar 31 17:15:54 2021 +0200
@@ -11,5 +11,4 @@
{
val version = "repository version"
val is_identified = false
- val is_official = false
}
--- a/src/Tools/jEdit/src/plugin.scala Wed Mar 31 12:02:52 2021 +0200
+++ b/src/Tools/jEdit/src/plugin.scala Wed Mar 31 17:15:54 2021 +0200
@@ -326,12 +326,6 @@
if (startup_failure.isEmpty) {
message match {
case msg: EditorStarted =>
- if (Distribution.is_identified && !Distribution.is_official) {
- GUI.warning_dialog(jEdit.getActiveView, "Isabelle version for testing",
- "This is " + Distribution.version + ".",
- "It is for testing only, not for production use.")
- }
-
if (resources.session_errors.nonEmpty) {
GUI.warning_dialog(jEdit.getActiveView,
"Bad session structure: may cause problems with theory imports",