# HG changeset patch
# User wenzelm
# Date 1544275694 -3600
# Node ID 840f0cadeba8923397c6d22a312dc1acbf438e2a
# Parent 472af2d7835d9faf7520f37ac4537b1de340816d
clarified application bundling: discontinued redundant archives;
diff -r 472af2d7835d -r 840f0cadeba8 src/Pure/Admin/build_release.scala
--- a/src/Pure/Admin/build_release.scala Fri Dec 07 21:42:08 2018 +0100
+++ b/src/Pure/Admin/build_release.scala Sat Dec 08 14:28:14 2018 +0100
@@ -40,9 +40,9 @@
def bundle_info(platform: Platform.Family.Value): Bundle_Info =
platform match {
case Platform.Family.linux =>
- Bundle_Info(platform, "Linux", dist_name + "_app.tar.gz", None)
+ Bundle_Info(platform, "Linux", dist_name + "_linux.tar.gz", None)
case Platform.Family.macos =>
- Bundle_Info(platform, "Mac OS X", dist_name + ".dmg", Some(dist_name + "_dmg.tar.gz"))
+ Bundle_Info(platform, "Mac OS X", dist_name + ".dmg", Some(dist_name + "_macos.tar.gz"))
case Platform.Family.windows =>
Bundle_Info(platform, "Windows", dist_name + ".exe", None)
}
@@ -404,7 +404,7 @@
val isabelle_name = release.dist_name
val platform = bundle_info.platform
- progress.echo("\nApplication bundle for " + platform + ": " + bundle_archive)
+ progress.echo("\nApplication bundle for " + platform)
Isabelle_System.with_tmp_dir("build_release")(tmp_dir =>
{
@@ -464,7 +464,7 @@
val jedit_props = Path.explode("src/Tools/jEdit/dist/properties/jEdit.props")
- // platform-specific setup (inside archive)
+ // application bundling
platform match {
case Platform.Family.linux =>
@@ -484,8 +484,13 @@
isabelle_target + Path.explode(isabelle_name))
Isabelle_System.rm_tree(linux_app)
+ val archive_name = isabelle_name + "_linux.tar.gz"
+ progress.echo("Packaging " + archive_name + " ...")
+ execute_tar(tmp_dir,
+ "-czf " + File.bash_path(release.dist_dir + Path.explode(archive_name)) + " " +
+ Bash.string(isabelle_name))
+
case Platform.Family.macos =>
- File.move(isabelle_target + Path.explode("contrib/macos_app"), tmp_dir)
File.write(isabelle_target + jedit_props,
File.read(isabelle_target + jedit_props)
.replaceAll("lookAndFeel=.*", "lookAndFeel=com.apple.laf.AquaLookAndFeel")
@@ -493,100 +498,14 @@
.replaceAll("delete.shortcut2=.*", "delete.shortcut2=A+d")
.replaceAll("plugin-blacklist.MacOSX.jar=true", "plugin-blacklist.MacOSX.jar="))
- case Platform.Family.windows =>
- val app_template = Path.explode("~~/Admin/Windows/launch4j")
- val cygwin_template = Path.explode("~~/Admin/Windows/Cygwin")
- File.move(isabelle_target + Path.explode("contrib/windows_app"), tmp_dir)
-
- File.write(isabelle_target + jedit_props,
- File.read(isabelle_target + jedit_props)
- .replaceAll("lookAndFeel=.*",
- "lookAndFeel=com.sun.java.swing.plaf.windows.WindowsLookAndFeel")
- .replaceAll("foldPainter=.*", "foldPainter=Square"))
-
- File.write(isabelle_target + Path.explode(isabelle_name + ".l4j.ini"),
- (java_options_title :: java_options).map(_ + "\r\n").mkString)
-
- val isabelle_xml = Path.explode("isabelle.xml")
- val isabelle_exe = Path.explode(isabelle_name + ".exe")
-
- File.write(tmp_dir + isabelle_xml,
- File.read(app_template + isabelle_xml)
- .replaceAllLiterally("{ISABELLE_NAME}", isabelle_name)
- .replaceAllLiterally("{OUTFILE}",
- File.platform_path(isabelle_target + isabelle_exe))
- .replaceAllLiterally("{ICON}",
- File.platform_path(app_template + Path.explode("isabelle_transparent.ico")))
- .replaceAllLiterally("{SPLASH}",
- File.platform_path(app_template + Path.explode("isabelle.bmp")))
- .replaceAllLiterally("{CLASSPATH}",
- cat_lines(classpath.map(cp =>
- " %EXEDIR%\\" + File.platform_path(cp).replace('/', '\\') + "")))
- .replaceAllLiterally("\\jdk\\", "\\" + jdk_component + "\\"))
-
- execute(tmp_dir,
- "\"windows_app/launch4j-${ISABELLE_PLATFORM_FAMILY}/launch4j\" isabelle.xml")
-
- File.copy(app_template + Path.explode("manifest.xml"),
- isabelle_target + isabelle_exe.ext("manifest"))
-
-
- File.copy(cygwin_template + Path.explode("Cygwin-Terminal.bat"), isabelle_target)
-
- val cygwin_mirror =
- File.read(isabelle_target + Path.explode("contrib/cygwin/isabelle/cygwin_mirror"))
+ // MacOS application bundle
- val cygwin_bat = Path.explode("Cygwin-Setup.bat")
- File.write(isabelle_target + cygwin_bat,
- File.read(cygwin_template + cygwin_bat)
- .replaceAllLiterally("{MIRROR}", cygwin_mirror))
- File.executable(isabelle_target + cygwin_bat)
-
- for (name <- List("isabelle/postinstall", "isabelle/rebaseall")) {
- val path = Path.explode(name)
- File.copy(cygwin_template + path,
- isabelle_target + Path.explode("contrib/cygwin") + path)
- }
-
- execute(isabelle_target,
- """find . -type f -not -name "*.exe" -not -name "*.dll" """ +
- (if (Platform.is_macos) "-perm +100" else "-executable") +
- " -print0 > contrib/cygwin/isabelle/executables")
-
- execute(isabelle_target,
- """find . -type l -exec echo "{}" ";" -exec readlink "{}" ";" """ +
- """> contrib/cygwin/isabelle/symlinks""")
-
- execute(isabelle_target, """find . -type l -exec rm "{}" ";" """)
+ File.move(isabelle_target + Path.explode("contrib/macos_app"), tmp_dir)
+ val dmg_dir = tmp_dir + Path.explode("macos_app/dmg")
- File.write(isabelle_target + Path.explode("contrib/cygwin/isabelle/uninitialized"), "")
- }
-
-
- // archive
-
- val archive_name = isabelle_name + "_" + platform + ".tar.gz"
- progress.echo("Packaging " + archive_name + " ...")
- execute_tar(tmp_dir,
- "-czf " + File.bash_path(release.dist_dir + Path.explode(archive_name)) + " " +
- Bash.string(isabelle_name))
-
-
- // platform-specific application (outside archive)
-
- progress.echo("Application for " + platform + " ...")
-
- platform match {
- case Platform.Family.linux =>
- File.link(
- Path.explode(isabelle_name + "_linux.tar.gz"),
- release.dist_dir + Path.explode(isabelle_name + "_app.tar.gz"),
- force = true)
-
- case Platform.Family.macos =>
- val dmg_dir = tmp_dir + Path.explode("macos_app/dmg")
- val app_dir = dmg_dir + Path.explode(isabelle_name + ".app")
+ val isabelle_app = Path.explode(isabelle_name + ".app")
+ val app_dir = dmg_dir + isabelle_app
File.move(dmg_dir + Path.explode("Isabelle.app"), app_dir)
val app_contents = app_dir + Path.explode("Contents")
@@ -622,33 +541,118 @@
app_dir + Path.explode("Isabelle"),
force = true)
- val dmg = Path.explode(isabelle_name + ".dmg")
- (release.dist_dir + dmg).file.delete
+
+ // application archive: dmg or .tar.gz
- val dmg_archive = Path.explode(isabelle_name + "_dmg.tar.gz")
- execute_tar(dmg_dir, "-czf " + File.bash_path(release.dist_dir + dmg_archive) + " .")
+ val isabelle_dmg = Path.explode(isabelle_name + ".dmg")
+ (release.dist_dir + isabelle_dmg).file.delete
remote_mac match {
case SSH.Target(user, host) =>
- progress.echo("Building dmg on " + quote(host) + " ...")
+ progress.echo("Packaging " + isabelle_dmg + " (via host " + quote(host) + ") ...")
using(SSH.open_session(options, host = host, user = user))(ssh =>
{
+ val dmg_archive = Path.explode("dmg.tar")
+ execute_tar(dmg_dir, "-cf " + File.bash_path(tmp_dir + dmg_archive) + " .")
+
ssh.with_tmp_dir(remote_dir =>
{
val cd = "cd " + ssh.bash_path(remote_dir) + "; "
- ssh.write_file(remote_dir + dmg_archive, release.dist_dir + dmg_archive)
+ ssh.write_file(remote_dir + dmg_archive, tmp_dir + dmg_archive)
ssh.execute(
- cd + "mkdir root && tar -C root -xzf " + ssh.bash_path(dmg_archive)).check
+ cd + "mkdir dmg && tar -C dmg -xf " + ssh.bash_path(dmg_archive)).check
ssh.execute(
- cd + "hdiutil create -srcfolder root -volname Isabelle " +
- ssh.bash_path(dmg)).check
- ssh.read_file(remote_dir + dmg, release.dist_dir + dmg)
+ cd + "hdiutil create -srcfolder dmg -volname Isabelle " +
+ ssh.bash_path(isabelle_dmg)).check
+ ssh.read_file(remote_dir + isabelle_dmg, release.dist_dir + isabelle_dmg)
})
})
case _ =>
+ val archive_name = isabelle_name + "_macos.tar.gz"
+ progress.echo("Packaging " + archive_name + " ...")
+ execute_tar(dmg_dir,
+ "-czf " + File.bash_path(release.dist_dir + Path.explode(archive_name)) + " " +
+ File.bash_path(isabelle_app))
}
case Platform.Family.windows =>
+ File.write(isabelle_target + jedit_props,
+ File.read(isabelle_target + jedit_props)
+ .replaceAll("lookAndFeel=.*",
+ "lookAndFeel=com.sun.java.swing.plaf.windows.WindowsLookAndFeel")
+ .replaceAll("foldPainter=.*", "foldPainter=Square"))
+
+
+ // application launcher
+
+ File.move(isabelle_target + Path.explode("contrib/windows_app"), tmp_dir)
+
+ val app_template = Path.explode("~~/Admin/Windows/launch4j")
+
+ File.write(isabelle_target + Path.explode(isabelle_name + ".l4j.ini"),
+ (java_options_title :: java_options).map(_ + "\r\n").mkString)
+
+ val isabelle_xml = Path.explode("isabelle.xml")
+ val isabelle_exe = Path.explode(isabelle_name + ".exe")
+
+ File.write(tmp_dir + isabelle_xml,
+ File.read(app_template + isabelle_xml)
+ .replaceAllLiterally("{ISABELLE_NAME}", isabelle_name)
+ .replaceAllLiterally("{OUTFILE}",
+ File.platform_path(isabelle_target + isabelle_exe))
+ .replaceAllLiterally("{ICON}",
+ File.platform_path(app_template + Path.explode("isabelle_transparent.ico")))
+ .replaceAllLiterally("{SPLASH}",
+ File.platform_path(app_template + Path.explode("isabelle.bmp")))
+ .replaceAllLiterally("{CLASSPATH}",
+ cat_lines(classpath.map(cp =>
+ " %EXEDIR%\\" + File.platform_path(cp).replace('/', '\\') + "")))
+ .replaceAllLiterally("\\jdk\\", "\\" + jdk_component + "\\"))
+
+ execute(tmp_dir,
+ "\"windows_app/launch4j-${ISABELLE_PLATFORM_FAMILY}/launch4j\" isabelle.xml")
+
+ File.copy(app_template + Path.explode("manifest.xml"),
+ isabelle_target + isabelle_exe.ext("manifest"))
+
+
+ // Cygwin setup
+
+ val cygwin_template = Path.explode("~~/Admin/Windows/Cygwin")
+
+ File.copy(cygwin_template + Path.explode("Cygwin-Terminal.bat"), isabelle_target)
+
+ val cygwin_mirror =
+ File.read(isabelle_target + Path.explode("contrib/cygwin/isabelle/cygwin_mirror"))
+
+ val cygwin_bat = Path.explode("Cygwin-Setup.bat")
+ File.write(isabelle_target + cygwin_bat,
+ File.read(cygwin_template + cygwin_bat)
+ .replaceAllLiterally("{MIRROR}", cygwin_mirror))
+ File.executable(isabelle_target + cygwin_bat)
+
+ for (name <- List("isabelle/postinstall", "isabelle/rebaseall")) {
+ val path = Path.explode(name)
+ File.copy(cygwin_template + path,
+ isabelle_target + Path.explode("contrib/cygwin") + path)
+ }
+
+ execute(isabelle_target,
+ """find . -type f -not -name "*.exe" -not -name "*.dll" """ +
+ (if (Platform.is_macos) "-perm +100" else "-executable") +
+ " -print0 > contrib/cygwin/isabelle/executables")
+
+ execute(isabelle_target,
+ """find . -type l -exec echo "{}" ";" -exec readlink "{}" ";" """ +
+ """> contrib/cygwin/isabelle/symlinks""")
+
+ execute(isabelle_target, """find . -type l -exec rm "{}" ";" """)
+
+ File.write(isabelle_target + Path.explode("contrib/cygwin/isabelle/uninitialized"), "")
+
+
+ // executable archive (self-extracting 7z)
+
val exe_archive = tmp_dir + Path.explode(isabelle_name + ".7z")
exe_archive.file.delete
@@ -656,7 +660,6 @@
"7z -y -bd a " + File.bash_path(exe_archive) + " " + Bash.string(isabelle_name))
if (!exe_archive.is_file) error("Failed to create archive: " + exe_archive)
- val isabelle_exe = Path.explode(isabelle_name + ".exe")
val sfx_exe = tmp_dir + Path.explode("windows_app/7zsd_All_x64.sfx")
val sfx_txt =
File.read(Path.explode("~~/Admin/Windows/Installer/sfx.txt")).