chore(release): 0.6.33

chore(deps): update gon package to 0.2.5
chore(release): 0.6.32
2026-02-19 13:06:38 +00:00 · 2022-04-30 19:37:01 +01:00 · 2022-04-30 19:35:21 +01:00 · 2022-04-30 17:46:51 +01:00 · 2022-04-30 17:46:06 +01:00 · 2022-04-30 17:45:21 +01:00
32 changed files with 1473 additions and 341 deletions
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -75,6 +75,9 @@ issues:
    - source: "`json:"
      linters:
        - lll
+    - source: "`yaml:"
+      linters:
+        - lll

 run:
  skip-dirs:
--- a/2
+++ b/2
@@ -3,6 +3,7 @@
 brew 'autoconf'
 brew 'coreutils'
 brew 'curl'
+brew 'dbus'
 brew 'expat'
 brew 'gcc'
 brew 'gmp'
@@ -22,5 +23,6 @@ brew 'make'
 brew 'ncurses'
 brew 'nettle'
 brew 'pkg-config'
+brew 'sqlite'
 brew 'texinfo'
 brew 'zlib'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,171 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+### [0.6.33](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.32...v0.6.33) (2022-04-30)
+
+### [0.6.32](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.31...v0.6.32) (2022-04-30)
+
+
+### Features
+
+* **dbus:** add flag to explicitly disable dbus support ([8ad3ff4](https://github.com/jimeh/build-emacs-for-macos/commit/8ad3ff4f53505408aa097527177032a1fd6008e0)), closes [#69](https://github.com/jimeh/build-emacs-for-macos/issues/69)
+* **deps:** add sqlite brew dependency for Emacs 29.x ([a20a845](https://github.com/jimeh/build-emacs-for-macos/commit/a20a8456ab1e8de6357d5d121b9565ba65a6dd71))
+
+
+### Bug Fixes
+
+* **native-comp:** support libgccjit 11.3.0 ([e31f5aa](https://github.com/jimeh/build-emacs-for-macos/commit/e31f5aaf9355b674c2a86b8eda35f6513f344b72)), closes [#71](https://github.com/jimeh/build-emacs-for-macos/issues/71)
+
+### [0.6.31](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.30...v0.6.31) (2022-02-25)
+
+
+### Bug Fixes
+
+* set source-directory correctly ([07e0e3d](https://github.com/jimeh/build-emacs-for-macos/commit/07e0e3dacddfbdb7a59aceaa2dc9cdf503ac2bcc)), closes [#68](https://github.com/jimeh/build-emacs-for-macos/issues/68)
+
+### [0.6.30](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.29...v0.6.30) (2022-02-08)
+
+
+### Bug Fixes
+
+* **site-lisp:** add Homebrew's site-lisp directory to locallisppath ([cbd8cb2](https://github.com/jimeh/build-emacs-for-macos/commit/cbd8cb27b6ceff2e128c38cd1cc8f8380b9b4bfb))
+
+### [0.6.29](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.28...v0.6.29) (2022-02-07)
+
+
+### Features
+
+* **cask:** add support for pretest builds ([084776d](https://github.com/jimeh/build-emacs-for-macos/commit/084776db6b7e61958088d7b2a2588e9889e60c21))
+
+### [0.6.28](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.27...v0.6.28) (2022-01-15)
+
+
+### Features
+
+* **build:** add dbus dependency to enable support in Emacs builds ([68ef4c0](https://github.com/jimeh/build-emacs-for-macos/commit/68ef4c066c3fd1a7337198e8f773866088b4f481))
+
+### [0.6.27](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.26...v0.6.27) (2021-12-05)
+
+
+### Features
+
+* **plan:** add support for pretest and release candidate builds ([743b10c](https://github.com/jimeh/build-emacs-for-macos/commit/743b10c751e146ec7569f39a475c20a0489955f4))
+
+### [0.6.26](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.25...v0.6.26) (2021-11-27)
+
+
+### Features
+
+* **build:** re-link eln files by default again ([4ae288c](https://github.com/jimeh/build-emacs-for-macos/commit/4ae288cae34c5e1d291dad7b6b654fe37c4a221f))
+* **native-comp:** no longer require gcc homebrew formula ([3bd78d1](https://github.com/jimeh/build-emacs-for-macos/commit/3bd78d130a5419a6530a7d30e271569e501870fb)), closes [#53](https://github.com/jimeh/build-emacs-for-macos/issues/53)
+
+
+### Bug Fixes
+
+* **embed:** relink shared libraries with [@rpath](https://github.com/rpath) instead of [@executable](https://github.com/executable)_path ([fb5362c](https://github.com/jimeh/build-emacs-for-macos/commit/fb5362ce183ce43e52afcc0fc721cf2145f9c85b))
+
+### [0.6.25](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.24...v0.6.25) (2021-11-25)
+
+### [0.6.24](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.23...v0.6.24) (2021-11-24)
+
+
+### Bug Fixes
+
+* **embedding:** embedding GCC fails when paths do not require sanitizing ([8a467b0](https://github.com/jimeh/build-emacs-for-macos/commit/8a467b0d43140f6956d53c27e2319ae1b572868c))
+
+### [0.6.23](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.22...v0.6.23) (2021-11-10)
+
+
+### Bug Fixes
+
+* **build:** do not re-link eln files by default ([d338c13](https://github.com/jimeh/build-emacs-for-macos/commit/d338c136db8acc4378154cf66ed7db5462787602)), closes [#60](https://github.com/jimeh/build-emacs-for-macos/issues/60)
+
+### [0.6.22](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.21...v0.6.22) (2021-11-10)
+
+
+### Features
+
+* **patch:** add support for posix-spawn patch from emacs-plus ([4030ceb](https://github.com/jimeh/build-emacs-for-macos/commit/4030ceb9cab6749af3c28161ac97caec90a8aed0))
+
+### [0.6.21](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.20...v0.6.21) (2021-10-27)
+
+### [0.6.20](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.19...v0.6.20) (2021-10-23)
+
+
+### Bug Fixes
+
+* **notarization:** explicitly only copy *.c and *.h C source files ([591c39e](https://github.com/jimeh/build-emacs-for-macos/commit/591c39e629c9556adcf296cd5c15dd0b17c4d986))
+
+### [0.6.19](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.18...v0.6.19) (2021-10-23)
+
+
+### Bug Fixes
+
+* **patch:** resolve emacs-29 symlink patches to their real URL ([bcbd017](https://github.com/jimeh/build-emacs-for-macos/commit/bcbd01778d416b99205c51f348a543489889f66d))
+
+### [0.6.18](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.17...v0.6.18) (2021-10-23)
+
+
+### Features
+
+* **docs:** embed C source files and set source-directory accordingly ([67b8c5f](https://github.com/jimeh/build-emacs-for-macos/commit/67b8c5f3974e178e31519846d46af82d9770ad6e))
+
+
+### Bug Fixes
+
+* **patches:** correctly use emacs 28.x and 29.x patches ([4dad581](https://github.com/jimeh/build-emacs-for-macos/commit/4dad5812fa2b67adc7262a778829013995a904bc))
+
+### [0.6.17](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.16...v0.6.17) (2021-10-10)
+
+
+### Features
+
+* **release:** tweak GitHub release description ([a956dc1](https://github.com/jimeh/build-emacs-for-macos/commit/a956dc1b42b2648e2663f5b48c72d7428fe75f19))
+
+### [0.6.16](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.15...v0.6.16) (2021-10-10)
+
+
+### Features
+
+* **build:** handle macOS Big Sur and later version number ([2e2f9bc](https://github.com/jimeh/build-emacs-for-macos/commit/2e2f9bc98acdc972a22add3d1015bd80cad20b41))
+* **cask:** make cask template helpers more flexible ([d63cd54](https://github.com/jimeh/build-emacs-for-macos/commit/d63cd545aab3a35e0cbbbcabd862525acbc414b8))
+* **plan:** allow build plan to be output as YAML or JSON ([1bbfe5d](https://github.com/jimeh/build-emacs-for-macos/commit/1bbfe5d3ea810215b417e5b80d2902f03d68f366))
+* **release:** add description to GitHub Releases ([7118ed8](https://github.com/jimeh/build-emacs-for-macos/commit/7118ed856053de06ddcdfba2a2d6fa40f58c17ab))
+* **release:** force-replace existing asset files by default ([e7a991e](https://github.com/jimeh/build-emacs-for-macos/commit/e7a991ef92a5c546106a8badaf9c60247a1397b5))
+
+
+### Bug Fixes
+
+* **release:** publish arguments are not handled as asset files to upload ([b4c5184](https://github.com/jimeh/build-emacs-for-macos/commit/b4c5184cefe43fdc54b1ad5c8a1970f104137644))
+
+### [0.6.15](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.14...v0.6.15) (2021-08-05)
+
+
+### Bug Fixes
+
+* **build:** another --relink-eln-files flag fix ([3622df5](https://github.com/jimeh/build-emacs-for-macos/commit/3622df550c72fc9da70235005239b278b5822cf6))
+
+### [0.6.14](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.13...v0.6.14) (2021-08-05)
+
+
+### Bug Fixes
+
+* **build:** silly typo ([1fc7faa](https://github.com/jimeh/build-emacs-for-macos/commit/1fc7faac1f040466fa4474a873d2290273780ee2))
+
+### [0.6.13](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.12...v0.6.13) (2021-08-04)
+
+
+### Bug Fixes
+
+* **native_comp:** add option to enable/disable relinking *.eln files ([ac943c4](https://github.com/jimeh/build-emacs-for-macos/commit/ac943c430c58e0761ac44e8d25d4d55a461d01a2))
+
+### [0.6.12](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.11...v0.6.12) (2021-08-02)
+
+
+### Bug Fixes
+
+* **sign:** resolve signing issue caused by re-linking shared lib in *.eln files ([e6b1e5a](https://github.com/jimeh/build-emacs-for-macos/commit/e6b1e5a554fd0f776bd01c17cfb1ebbbdf7a7831))
+
 ### [0.6.11](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.10...v0.6.11) (2021-07-17)


--- a/README.md
+++ b/README.md
@@ -17,21 +17,10 @@ Use this script at your own risk.
  built from the `master` branch. This script allows you to choose any branch,
  tag, or git ref you want.

-## Status
+## Binary Builds

-As of writing (2021-04-25) it works for me on my machine. Your luck may vary.
-
-I have successfully built:
-
- `emacs-27.1` release git tag
- `master` branch (Emacs 28.x)
- `feature/native-comp` branch (Emacs 28.x)
-
-For reference, my machine is:
-
- 13-inch MacBook Pro (2020), 10th-gen 2.3 GHz Quad-Core Intel Core i7 (4c/8t)
- macOS Big Sur 11.2.3 (20D91)
- Xcode 12.4 (12D4e)
+Nightly and stable binary builds produced with this build script are available
+from [jimeh/emacs-builds](https://github.com/jimeh/emacs-builds).

 ## Limitations

@@ -41,14 +30,9 @@ The build produced does have some limitations:
  application will be that of the machine it was built on.
 - The minimum required macOS version of the built application will be the same
  as that of the machine it was built on.
- The application is not signed, so running it on machines other than the one
-  that built the application will yield warnings. If you want to make a signed
-  Emacs.app, google is you friend for finding signing instructions.
-
-## Binary Builds
-
-Nightly and stable binary builds produced with this build script are available
-from [jimeh/emacs-builds](https://github.com/jimeh/emacs-builds).
+- The application is not signed automatically, but the CLI tool used to sign the
+  nightly builds is available. Run `go run ./cmd/emacs-builder package --help`
+  for details. More detailed instructions will come soon.

 ## Requirements

@@ -66,6 +50,26 @@ from [jimeh/emacs-builds](https://github.com/jimeh/emacs-builds).
  brew install ruby
  ```

+## Status
+
+As of writing (2021-11-27) it works for me on my machine and for the nightly
+builds in [jimeh/emacs-builds](https://github.com/jimeh/emacs-builds). Your luck
+may vary.
+
+I have successfully built:
+
+- `emacs-28` release branch
+- `master` branch (Emacs 29.x)
+
+For reference, my machine is:
+
+- 13-inch MacBook Pro (2020), 10th-gen 2.3 GHz Quad-Core Intel Core i7 (4c/8t)
+- macOS Monterey 12.0.1 (21A559)
+- Xcode 13.1 (13A1030d)
+
+Nightly builds are built with GitHub Actions on GitHub-hosted runners, using
+`macos-10.15`.
+
 ## Usage

 ```
@@ -81,8 +85,10 @@ Options:
        --[no-]native-comp           Enable/disable native-comp (default: enabled if supported)
        --[no-]native-march          Enable/disable -march=native CFLAG(default: disabled)
        --[no-]native-full-aot       Enable/disable NATIVE_FULL_AOT / Ahead of Time compilation (default: disabled)
+        --[no-]relink-eln-files      Enable/disable re-linking shared libraries in bundled *.eln files (default: enabled)
        --[no-]rsvg                  Enable/disable SVG image support via librsvg (default: enabled)
        --no-titlebar                Apply no-titlebar patch (default: disabled)
+        --posix-spawn                Apply posix-spawn patch (default: disabled)
        --no-frame-refocus           Apply no-frame-refocus patch (default: disabled)
        --[no-]github-auth           Make authenticated GitHub API requests if GITHUB_TOKEN environment variable is set.(default: enabled)
        --work-dir DIR               Specify a working directory where tarballs, sources, and builds will be stored and worked with
@@ -90,7 +96,8 @@ Options:
        --build-name NAME            Override generated build name
        --dist-include x,y,z         List of extra files to copy from Emacs source into build folder/archive (default: COPYING)
        --[no-]archive               Enable/disable creating *.tbz archive (default: enabled)
-        --[no-]archive-keep          Enable/disable keeping source folder for archive (default: disabled)
+        --[no-]archive-keep-build-dir
+                                     Enable/disable keeping source folder for archive (default: disabled)
        --plan FILE                  Follow given plan file, instead of using given git ref/sha
 ```

--- a/358
+++ b/358
@@ -26,7 +26,7 @@ module Output
    if newline
      warn "==> #{msg}"
    else
-      STDERR.print "==> #{msg}"
+      $stderr.print "==> #{msg}"
    end
  end

@@ -35,6 +35,19 @@ module Output
  end
 end

+module System
+  include Output
+
+  def run_cmd(*args)
+    out("CMD: #{args.join(' ')}")
+    cmd(*args)
+  end
+
+  def cmd(*args)
+    system(*args) || err("Exit code: #{$CHILD_STATUS.exitstatus}")
+  end
+end
+
 class OS
  def self.version
    @version ||= OSVersion.new
@@ -53,7 +66,7 @@ class OSVersion
  end

  def to_s
-    @to_s ||= "#{major}.#{minor}"
+    @to_s ||= major >= 11 ? major.to_s : "#{major}.#{minor}"
  end

  def major
@@ -71,6 +84,7 @@ end

 class Build
  include Output
+  include System

  EMACS_MIRROR_REPO = 'emacs-mirror/emacs'
  DOWNLOAD_URL = 'https://github.com/emacs-mirror/emacs/tarball/%s'
@@ -105,9 +119,10 @@ class Build
    build_dir, app = create_build_dir(app)

    handle_native_lisp(app)
-    add_cli_helper(app)

-    LibEmbedder.new(app, brew_dir, extra_libs).embed
+    CLIHelperEmbedder.new(app).embed
+    CSourcesEmbedder.new(app, @source_dir).embed
+    LibEmbedder.new(app, brew_dir, extra_libs, options[:relink_eln]).embed
    GccLibEmbedder.new(app, gcc_info).embed if options[:native_comp]

    archive_build(build_dir) if options[:archive]
@@ -133,10 +148,6 @@ class Build
      @archive_filename = plan.dig('output', 'archive')
    end

-    if plan.dig('output', 'disk_image') || !plan.dig('output', 'archive')
-      options[:archive] = false
-    end
-
    @build_name = plan.dig('build', 'name') if plan.dig('build', 'name')
  end

@@ -157,11 +168,22 @@ class Build
  end

  def extra_libs
-    @extra_libs ||= [
+    return @extra_libs if @extra_libs
+
+    libs = [
      File.join(brew_dir, 'opt/expat/lib/libexpat.1.dylib'),
      File.join(brew_dir, 'opt/libiconv/lib/libiconv.2.dylib'),
      File.join(brew_dir, 'opt/zlib/lib/libz.1.dylib')
    ]
+
+    if options[:native_comp]
+      libgcc_s = File.join(
+        brew_dir, 'lib', 'gcc', gcc_info.major_version, 'libgcc_s.1.dylib'
+      )
+      libs << libgcc_s if File.exist?(libgcc_s)
+    end
+
+    @extra_libs = libs
  end

  def download_tarball(sha)
@@ -191,7 +213,7 @@ class Build
    end

    out "CMD: #{log_args.join(' ')}"
-    system(*args) || err("Exit code: #{$CHILD_STATUS.exitstatus}")
+    cmd(*args)

    target
  end
@@ -278,8 +300,6 @@ class Build
        verify_native_comp
        gcc_info.verify_libgccjit

-        apply_native_comp_env_setup_patch(source)
-
        ENV['CFLAGS'] = [
          "-I#{File.join(gcc_info.root_dir, 'include')}",
          "-I#{File.join(gcc_info.libgccjit_root_dir, 'include')}",
@@ -339,13 +359,15 @@ class Build
        '--with-modules',
        '--enable-locallisppath=' \
        '/Library/Application Support/Emacs/${version}/site-lisp:' \
-        '/Library/Application Support/Emacs/site-lisp'
+        '/Library/Application Support/Emacs/site-lisp:' \
+        '/usr/local/share/emacs/site-lisp'
      ]
      if options[:xwidgets] && supports_xwidgets?
        configure_flags << '--with-xwidgets'
      end
      configure_flags << native_comp_configure_flag if options[:native_comp]
      configure_flags << '--without-rsvg' if options[:rsvg] == false
+      configure_flags << '--without-dbus' if options[:dbus] == false

      run_cmd './configure', *configure_flags

@@ -394,13 +416,13 @@ class Build
    info "Copying \"#{app_name}\" to: #{target_dir}"

    FileUtils.mkdir_p(target_dir)
-    FileUtils.cp_r(app, target_dir)
+    cmd('cp', '-a', app, target_dir)

    options[:dist_include]&.each do |filename|
      src = File.join(source_dir, filename)
      if File.exist?(src)
        info "Copying \"#{filename}\" to: #{target_dir}"
-        FileUtils.cp_r(src, target_dir)
+        cmd('cp', '-pRL', src, target_dir)
      else
        info "Warning: #{filename} does not exist in #{source_dir}"
      end
@@ -425,7 +447,7 @@ class Build
      info 'Creating symlinks within Emacs.app needed for native-comp'

      if !File.exist?('lisp') && File.exist?('Resources/lisp')
-        FileUtils.ln_s('Resources/lisp', 'lisp')
+        run_cmd('ln', '-s', 'Resources/lisp', 'lisp')
      end

      # Check for folder name containing two dots (.), as this causes Apple's
@@ -447,7 +469,7 @@ class Build
            new_name = File.join(parent, base.gsub(/\.(.+)\./, '-\\1-'))

            info "Renaming: #{old_name} --> #{new_name}"
-            FileUtils.mv(old_name, new_name)
+            cmd('mv', old_name, new_name)
          end

          base = File.basename(parent)
@@ -471,7 +493,7 @@ class Build
      end

      target = File.basename(source)
-      FileUtils.ln_s(source, target) unless File.exist?(target)
+      run_cmd('ln', '-s', source, target) unless File.exist?(target)
    end
  end

@@ -498,18 +520,6 @@ class Build
    end
  end

-  def add_cli_helper(app)
-    source = File.join(__dir__, 'helper', 'emacs-cli.bash')
-    target = File.join(app, 'Contents', 'MacOS', 'bin', 'emacs')
-    dir = File.dirname(target)
-
-    info "Adding \"emacs\" CLI helper to #{dir}"
-
-    FileUtils.mkdir_p(dir)
-    FileUtils.cp(source, target)
-    FileUtils.chmod('+w', target)
-  end
-
  def build_name
    return @build_name if @build_name
    return @build_name = options[:build_name] if options[:build_name]
@@ -541,10 +551,10 @@ class Build
    if !File.exist?(archive_filename)
      info "Creating #{filename} archive in \"#{target_dir}\"..."
      FileUtils.cd(parent_dir) do
-        system('tar', '-cjf', archive_filename, build)
+        cmd('tar', '-cjf', archive_filename, build)

        if options[:archive_keep] == false
-          info "Removeing \"#{build}\" directory from #{parent_dir}"
+          info "Removing \"#{build}\" directory from #{parent_dir}"
          FileUtils.rm_rf(build_dir)
        end
      end
@@ -606,26 +616,6 @@ class Build
    response.body
  end

-  def run_cmd(*args)
-    out "CMD: #{args.join(' ')}"
-    system(*args) || err("Exit code: #{$CHILD_STATUS.exitstatus}")
-  end
-
-  def apply_native_comp_env_setup_patch(source)
-    term = 'native-compile-setup-environment-variables'
-    file = 'lisp/emacs-lisp/comp.el'
-    return if `grep '#{term}' '#{file}'`.strip.size.positive?
-
-    template = File.read(
-      File.join(__dir__, 'patches/native-comp-env-setup.diff.erb')
-    )
-    patch = ERB.new(template).result(gcc_info.get_binding)
-    patch_file = File.join(source, 'macos_patches/native-comp-env-setup.diff')
-
-    File.write(patch_file, patch)
-    apply_patch({ file: patch_file }, source)
-  end
-
  def effective_version
    @effective_version ||= begin
      case ref
@@ -633,8 +623,10 @@ class Build
        'emacs-26'
      when /^emacs-27.*/
        'emacs-27'
-      else
+      when /^emacs-28.*/
        'emacs-28'
+      else
+        'emacs-29'
      end
    end
  end
@@ -642,14 +634,14 @@ class Build
  def patches(opts = {})
    p = []

-    if %w[emacs-26 emacs-27 emacs-28].include?(effective_version)
+    if %w[emacs-26 emacs-27 emacs-28 emacs-29].include?(effective_version)
      p << {
        url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
             "patches/#{effective_version}/fix-window-role.patch"
      }
    end

-    if %w[emacs-27 emacs-28].include?(effective_version)
+    if %w[emacs-27 emacs-28 emacs-29].include?(effective_version)
      p << {
        url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
             "patches/#{effective_version}/system-appearance.patch"
@@ -670,6 +662,15 @@ class Build
      end
    end

+    if %w[emacs-28 emacs-29].include?(effective_version)
+      if options[:posix_spawn]
+        p << {
+          url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
+               "patches/#{effective_version}/posix-spawn.patch"
+        }
+      end
+    end
+
    if effective_version == 'emacs-27'
      p << {
        url: 'https://github.com/d12frosted/homebrew-emacs-plus/raw/master/' \
@@ -707,7 +708,14 @@ class Build
      info "Downloading patch: #{patch[:url]}"
      run_cmd('curl', '-L#', patch[:url], '-o', patch_file)

-      apply_patch({ file: patch_file }, target)
+      real_patch_url = detect_github_symlink_patch(patch[:url], patch_file)
+      if real_patch_url
+        FileUtils.rm(patch_file)
+        apply_patch({ url: real_patch_url }, target)
+      else
+        apply_patch({ file: patch_file }, target)
+      end
+
    elsif patch[:replace]
      err 'Patch replace input error' unless patch[:replace].size == 3

@@ -725,10 +733,35 @@ class Build
      f.close
    end
  end
+
+  # When downloading raw files from GitHub, if the target file is a symlink, it
+  # will return the actual target path of the symlink instead of the content of
+  # the target file. Hence we have to check if the patch file we have downloaded
+  # contains one and only one line, and if so, assume it's a symlink.
+  def detect_github_symlink_patch(original_url, patch_file)
+    lines = []
+
+    # read first two lines
+    File.open(patch_file) do |f|
+      lines << f.gets
+      lines << f.gets
+    end
+
+    # if the file contains more than one line of text, it's not a symlink.
+    return unless lines[1].nil?
+
+    symlink_target = lines[0].strip
+    # Assume patch file content is something along the lines of
+    # "../emacs-28/fix-window-role.patch", hence we resolve it relative to the
+    # original url.
+    info "patch is symlink to #{symlink_target}"
+    URI.join(original_url, symlink_target).to_s
+  end
 end

 class AbstractEmbedder
  include Output
+  include System

  attr_reader :app

@@ -739,27 +772,96 @@ class AbstractEmbedder
  end

  def invocation_dir
-    File.join(app, 'Contents', 'MacOS')
+    @invocation_dir ||= File.join(app, 'Contents', 'MacOS')
  end

  def bin
-    File.join(invocation_dir, 'Emacs')
+    @bin ||= File.join(invocation_dir, 'Emacs')
+  end
+
+  def bin_dir
+    @bin_dir ||= File.join(invocation_dir, 'bin')
  end

  def lib_dir
-    File.join(app, 'Contents', 'Frameworks')
+    @lib_dir ||= frameworks_dir
+  end
+
+  def frameworks_dir
+    @frameworks_dir ||= File.join(app, 'Contents', 'Frameworks')
+  end
+
+  def resources_dir
+    @resources_dir ||= File.join(app, 'Contents', 'Resources')
+  end
+end
+
+class CLIHelperEmbedder < AbstractEmbedder
+  def embed
+    source = File.join(__dir__, 'helper', 'emacs-cli.bash')
+    target = File.join(bin_dir, 'emacs')
+    dir = File.dirname(target)
+
+    info 'Adding "emacs" CLI helper to Emacs.app'
+
+    FileUtils.mkdir_p(dir)
+    run_cmd('cp', '-pRL', source, target)
+    run_cmd('chmod', '+w', target)
+  end
+end
+
+class CSourcesEmbedder < AbstractEmbedder
+  PATH_PATCH = <<~ELISP
+    ;; Allow Emacs to find bundled C sources.
+    (setq source-directory
+      (expand-file-name ".." (file-name-directory load-file-name)))
+  ELISP
+
+  attr_reader :source_dir
+
+  def initialize(app, source_dir)
+    super(app)
+
+    @source_dir = source_dir
+  end
+
+  def embed
+    info 'Embedding C source files into Emacs.app for documentation purposes'
+
+    src_dir = File.join(source_dir, 'src')
+    Dir[File.join(src_dir, '**', '*.{c,h}')].each do |f|
+      rel = f[src_dir.size + 1..-1]
+      target = File.join(resources_dir, 'src', rel)
+      FileUtils.mkdir_p(File.dirname(target))
+      cmd('cp', '-pRL', f, target)
+    end
+
+    return if File.exist?(site_start_el_file) &&
+              File.read(site_start_el_file).include?(PATH_PATCH)
+
+    File.open(site_start_el_file, 'a') do |f|
+      f.puts("\n#{PATH_PATCH}")
+    end
+  end
+
+  private
+
+  def site_start_el_file
+    @site_start_el_file ||= File.join(resources_dir, 'lisp', 'site-start.el')
  end
 end

 class LibEmbedder < AbstractEmbedder
  attr_reader :lib_source
  attr_reader :extra_libs
+  attr_reader :relink_eln_files

-  def initialize(app, lib_source, extra_libs = [])
+  def initialize(app, lib_source, extra_libs = [], relink_eln_files = true)
    super(app)

    @lib_source = lib_source
    @extra_libs = extra_libs
+    @relink_eln_files = relink_eln_files
  end

  def embed
@@ -769,15 +871,20 @@ class LibEmbedder < AbstractEmbedder
    binary ||= bin

    FileUtils.cd(File.dirname(app)) do
+      rel_path = Pathname.new(lib_dir).relative_path_from(
+        Pathname.new(File.dirname(binary))
+      ).to_s
+      rpath = File.join('@executable_path', rel_path)
+
+      set_rpath(binary, rpath)
      copy_libs(binary)
      copy_extra_libs(extra_libs, binary) if extra_libs.any?
-      if eln_files.any?
+
+      if relink_eln_files && eln_files.any?
        info "Embedding libraries for #{eln_files.size} *.eln files " \
             'within Emacs.app'
-        rel_path = Pathname.new(lib_dir).relative_path_from(
-          Pathname.new(File.dirname(binary))
-        ).to_s
-        eln_files.each { |f| copy_libs(f, rel_path) }
+
+        eln_files.each { |f| copy_libs(f) }
      end
    end
  end
@@ -788,21 +895,19 @@ class LibEmbedder < AbstractEmbedder
    @eln_files ||= Dir[File.join(app, 'Contents', '**', '*.eln')]
  end

-  def copy_libs(exe, rel_path = nil)
-    exe_file = File.basename(exe)
-    rel_path ||= Pathname.new(lib_dir).relative_path_from(
-      Pathname.new(File.dirname(exe))
-    ).to_s
+  def set_rpath(exe, rpath)
+    return if rpath.nil? || rpath == ''

-    rpath = File.join('@executable_path', rel_path)
    rpaths = `otool -l "#{exe}" | grep -A 2 'cmd LC_RPATH' | grep 'path'`
+    return if rpaths.include?(rpath)

-    unless rpaths.include?(rpath)
-      while_writable(exe) do
-        system('install_name_tool', '-add_rpath',
-               File.join('@executable_path', rel_path), exe)
-      end
+    while_writable(exe) do
+      cmd('install_name_tool', '-add_rpath', rpath, exe)
    end
+  end
+
+  def copy_libs(exe)
+    exe_file = File.basename(exe)

    `otool -L "#{exe}"`.split("\n")[1..-1].each do |line|
      match = line.match(%r{^\s+(.+/(lib[^/ ]+))\s})
@@ -810,41 +915,37 @@ class LibEmbedder < AbstractEmbedder

      while_writable(exe) do
        if match[2] == exe_file
-          system('install_name_tool', '-id',
-                 File.join('@executable_path', rel_path, match[2].to_s), exe)
+          cmd('install_name_tool', '-id',
+              File.join('@rpath', match[2].to_s), exe)
        else
-          system('install_name_tool', '-change', match[1],
-                 File.join('@executable_path', rel_path, match[2].to_s), exe)
+          cmd('install_name_tool', '-change', match[1],
+              File.join('@rpath', match[2].to_s), exe)
        end
      end

      next if match[2] == exe_file || File.exist?(File.join(lib_dir, match[2]))

      FileUtils.mkdir_p(lib_dir)
-      FileUtils.cp(match[1], lib_dir)
-      copy_libs(File.join(lib_dir, match[2].to_s), rel_path)
+      cmd('cp', '-pRL', match[1], lib_dir)
+      copy_libs(File.join(lib_dir, match[2].to_s))
    end
  end

-  def copy_extra_libs(extra_libs, exe, rel_path = nil)
-    rel_path ||= Pathname.new(lib_dir).relative_path_from(
-      Pathname.new(File.dirname(exe))
-    ).to_s
-
+  def copy_extra_libs(extra_libs, exe)
    extra_libs.each do |lib|
      lib_file = File.basename(lib)
      target = "#{lib_dir}/#{lib_file}"
      unless File.exist?(target)
        FileUtils.mkdir_p(lib_dir)
-        FileUtils.cp(lib, lib_dir)
+        cmd('cp', '-pRL', lib, lib_dir)
      end

      while_writable(target) do
-        system('install_name_tool', '-id',
-               File.join('@executable_path', rel_path, lib_file), target)
+        cmd('install_name_tool', '-id',
+            File.join('@rpath', lib_file), target)
      end

-      copy_libs(target, rel_path)
+      copy_libs(target)
    end
  end

@@ -853,7 +954,7 @@ class LibEmbedder < AbstractEmbedder
    File.chmod(0o775, file)
    yield
  ensure
-    File.chmod(mode, file)
+    File.chmod(mode, file) if File.exist?(file)
  end
 end

@@ -878,14 +979,51 @@ class GccLibEmbedder < AbstractEmbedder
    end

    FileUtils.mkdir_p(File.dirname(target_dir))
-    FileUtils.cp_r(source_dir, target_dir)
+    run_cmd('cp', '-pRL', source_dir, target_dir)
    FileUtils.rm(Dir[File.join(target_dir, '**', '.DS_Store')], force: true)
-    FileUtils.chmod_R('u+w', target_dir)
-    FileUtils.mv(source_darwin_dir, target_darwin_dir)
+    run_cmd('chmod', '-R', 'u+w', target_dir)
+    if source_darwin_dir != target_darwin_dir
+      run_cmd('mv', source_darwin_dir, target_darwin_dir)
+    end
+
+    env_setup = ERB.new(NATIVE_COMP_ENV_VAR_TPL).result(gcc_info.get_binding)
+    return if File.exist?(site_start_el_file) &&
+              File.read(site_start_el_file).include?(env_setup)
+
+    File.open(site_start_el_file, 'a') do |f|
+      f.puts("\n#{env_setup}")
+    end
  end

  private

+  NATIVE_COMP_ENV_VAR_TPL = <<~ELISP
+    ;; Set LIBRARY_PATH to point at bundled GCC and Xcode Command Line Tools to
+    ;; ensure native-comp works.
+    (when (and (eq system-type 'darwin)
+               (string-match-p "\\.app\\/Contents\\/MacOS\\/?$"
+                               invocation-directory))
+      (let* ((library-path-env (getenv "LIBRARY_PATH"))
+             (devtools-dir
+              "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib")
+             (gcc-dir (expand-file-name
+                       "<%= app_bundle_relative_lib_dir %>"
+                       invocation-directory))
+             (darwin-dir (expand-file-name
+                          "<%= app_bundle_relative_darwin_lib_dir %>"
+                          invocation-directory))
+             (lib-paths (list)))
+
+        (if library-path-env
+            (push library-path-env lib-paths))
+        (if (file-directory-p devtools-dir)
+            (push devtools-dir lib-paths))
+        (push darwin-dir lib-paths)
+        (push gcc-dir lib-paths)
+
+        (setenv "LIBRARY_PATH" (mapconcat 'identity lib-paths ":"))))
+  ELISP
+
  def embedded?
    Dir[File.join(target_dir, 'libgcc*')].any?
  end
@@ -909,6 +1047,10 @@ class GccLibEmbedder < AbstractEmbedder
  def relative_dir(path, root)
    Pathname.new(path).relative_path_from(Pathname.new(root)).to_s
  end
+
+  def site_start_el_file
+    @site_start_el_file ||= File.join(resources_dir, 'lisp', 'site-start.el')
+  end
 end

 class GccInfo
@@ -930,7 +1072,7 @@ class GccInfo
  end

  def relative_lib_dir
-    @relative_lib_dir ||= relative_dir(lib_dir, root_dir)
+    @relative_lib_dir ||= relative_dir(lib_dir, File.join(root_dir, 'lib'))
  end

  def darwin_lib_dir
@@ -945,7 +1087,9 @@ class GccInfo
  end

  def relative_darwin_lib_dir
-    @relative_darwin_lib_dir ||= relative_dir(darwin_lib_dir, root_dir)
+    @relative_darwin_lib_dir ||= relative_dir(
+      darwin_lib_dir, File.join(root_dir, 'lib')
+    )
  end

  # Sanitize folder name with full "MAJOR.MINOR.PATCH" version number to just
@@ -983,7 +1127,8 @@ class GccInfo

  def libgccjit_lib_dir
    @libgccjit_lib_dir ||= Dir[
-      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit.so*')
+      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit*.dylib'),
+      File.join(libgccjit_root_dir, 'lib/gcc/*/libgccjit.so*'),
    ]
                           .map { |path| File.dirname(path) }
                           .select { |path| File.basename(path).match(/^\d+$/) }
@@ -1029,9 +1174,11 @@ if __FILE__ == $PROGRAM_NAME
  cli_options = {
    work_dir: File.expand_path(__dir__),
    native_full_aot: false,
+    relink_eln: true,
    native_march: false,
    parallel: Etc.nprocessors,
    rsvg: true,
+    dbus: true,
    xwidgets: true,
    github_auth: true,
    dist_include: ['COPYING'],
@@ -1086,16 +1233,31 @@ if __FILE__ == $PROGRAM_NAME
        cli_options[:native_full_aot] = v
      end

+      opts.on('--[no-]relink-eln-files',
+              'Enable/disable re-linking shared libraries in bundled *.eln ' \
+              'files (default: enabled)') do |v|
+        cli_options[:relink_eln] = v
+      end
+
      opts.on('--[no-]rsvg',
              'Enable/disable SVG image support via librsvg ' \
              '(default: enabled)') do |v|
        cli_options[:rsvg] = v
      end

+      opts.on('--[no-]dbus',
+              'Enable/disable dbus support (default: enabled)') do |v|
+        cli_options[:dbus] = v
+      end
+
      opts.on('--no-titlebar', 'Apply no-titlebar patch (default: disabled)') do
        cli_options[:no_titlebar] = true
      end

+      opts.on('--posix-spawn', 'Apply posix-spawn patch (default: disabled)') do
+        cli_options[:posix_spawn] = true
+      end
+
      opts.on('--no-frame-refocus',
              'Apply no-frame-refocus patch (default: disabled)') do
        cli_options[:no_frame_refocus] = true
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/hexops/gotextdiff v1.0.3
 	github.com/jimeh/undent v1.1.0
 	github.com/mattn/go-isatty v0.0.13 // indirect
-	github.com/mitchellh/gon v0.2.3
+	github.com/mitchellh/gon v0.2.5
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli/v2 v2.3.0
--- a/go.sum
+++ b/go.sum
@@ -160,8 +160,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
 github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
 github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/gon v0.2.3 h1:fObN7hD14VacGG++t27GzTW6opP0lwI7TsgTPL55wBo=
-github.com/mitchellh/gon v0.2.3/go.mod h1:Ua18ZhqjZHg8VyqZo8kNHAY331ntV6nNJ9mT3s2mIo8=
+github.com/mitchellh/gon v0.2.5 h1:mVWtqTzV03W0avJqmqjk9M0qls3TDUXfc9ETJaPIOWY=
+github.com/mitchellh/gon v0.2.5/go.mod h1:Ua18ZhqjZHg8VyqZo8kNHAY331ntV6nNJ9mT3s2mIo8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
--- a/helper/emacs-cli.bash
+++ b/helper/emacs-cli.bash
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 resolve_link() {
-  "$(type -p greadlink readlink | head -1)" "$1"
+  "$(command -v greadlink || command -v readlink)" "$1"
 }

 abs_dirname() {
--- a/patches/native-comp-env-setup.diff.erb
+++ b/patches/native-comp-env-setup.diff.erb
@@ -1,57 +0,0 @@
-diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
-index 638d4b274c..2599211936 100644
--- a/lisp/emacs-lisp/comp.el
-+++ b/lisp/emacs-lisp/comp.el
-@@ -4224,6 +4224,52 @@ native-compile-async
-   (let ((load (not (not load))))
-     (native--compile-async files recursively load selector)))
- 
-+;;;###autoload
-+(defun native-compile-setup-environment-variables (&rest _args)
-+  "Ensure LIBRARY_PATH is set correctly when libgccjit is bundled."
-+  (when (and (eq system-type 'darwin)
-+             (string-match-p "\.app\/Contents\/MacOS\/?$"
-+                             invocation-directory))
-+    (let* ((library-path-env (getenv "LIBRARY_PATH"))
-+           (devtools-dir
-+            "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib")
-+           (gcc-dir (expand-file-name
-+                     "<%= app_bundle_relative_lib_dir %>"
-+                     invocation-directory))
-+           (darwin-dir (expand-file-name
-+                        "<%= app_bundle_relative_darwin_lib_dir %>"
-+                        invocation-directory))
-+           (lib-paths (list)))
-+
-+      (if library-path-env
-+          (push library-path-env lib-paths))
-+      (if (file-directory-p devtools-dir)
-+          (push devtools-dir lib-paths))
-+      (push darwin-dir lib-paths)
-+      (push gcc-dir lib-paths)
-+
-+      (setenv "LIBRARY_PATH" (mapconcat 'identity lib-paths ":"))))
-+
-+  ;; Remove advice, as it only needs to run once.
-+  (advice-remove 'native-compile
-+                 'native-compile-setup-environment-variables)
-+  (advice-remove 'comp--native-compile
-+                 'native-compile-setup-environment-variables)
-+  (advice-remove 'native-compile-async
-+                 'native-compile-setup-environment-variables)
-+  (advice-remove 'native--compile-async
-+                 'native-compile-setup-environment-variables))
-+
-+;; Ensure environment setup runs before any native compilation.
-+(advice-add 'native-compile :before
-+            'native-compile-setup-environment-variables)
-+(advice-add 'comp--native-compile :before
-+            'native-compile-setup-environment-variables)
-+(advice-add 'native-compile-async :before
-+            'native-compile-setup-environment-variables)
-+(advice-add 'native--compile-async :before
-+            'native-compile-setup-environment-variables)
-+
- (provide 'comp)
- 
- ;; LocalWords: limplified limplified limplification limplify Limple LIMPLE libgccjit elc eln
--- a/pkg/cask/release_info.go
+++ b/pkg/cask/release_info.go
@@ -11,9 +11,11 @@ type ReleaseInfo struct {
 	Assets  map[string]*ReleaseAsset
 }

-func (s *ReleaseInfo) Asset(nameMatch string) *ReleaseAsset {
-	if a, ok := s.Assets[nameMatch]; ok {
-		return a
+func (s *ReleaseInfo) Asset(needles ...string) *ReleaseAsset {
+	if len(needles) == 1 {
+		if a, ok := s.Assets[needles[0]]; ok {
+			return a
+		}
 	}

 	// Dirty and inefficient way to ensure assets are searched in a predictable
@@ -27,16 +29,20 @@ func (s *ReleaseInfo) Asset(nameMatch string) *ReleaseAsset {
 	})

 	for _, a := range assets {
-		if strings.Contains(a.Filename, nameMatch) {
-			return a
+		for _, needle := range needles {
+			if !strings.Contains(a.Filename, needle) {
+				continue
+			}
 		}
+
+		return a
 	}

 	return nil
 }

-func (s *ReleaseInfo) DownloadURL(nameMatch string) string {
-	a := s.Asset(nameMatch)
+func (s *ReleaseInfo) DownloadURL(needles ...string) string {
+	a := s.Asset(needles...)
 	if a == nil {
 		return ""
 	}
@@ -44,8 +50,8 @@ func (s *ReleaseInfo) DownloadURL(nameMatch string) string {
 	return a.DownloadURL
 }

-func (s *ReleaseInfo) SHA256(nameMatch string) string {
-	a := s.Asset(nameMatch)
+func (s *ReleaseInfo) SHA256(needles ...string) string {
+	a := s.Asset(needles...)
 	if a == nil {
 		return ""
 	}
--- a/pkg/cask/update.go
+++ b/pkg/cask/update.go
@@ -393,9 +393,7 @@ func (s *Updater) renderCask(
 		filename := asset.GetName()
 		s.logger.Debug("processing asset", "filename", filename)

-		if strings.HasSuffix(filename, ".sha256") {
-			filename = strings.TrimSuffix(filename, ".sha256")
-		}
+		filename = strings.TrimSuffix(filename, ".sha256")

 		if _, ok := info.Assets[filename]; !ok {
 			info.Assets[filename] = &ReleaseAsset{
--- a/pkg/cli/cask.go
+++ b/pkg/cli/cask.go
@@ -112,7 +112,7 @@ func caskUpdateCmd() *cli2.Command {

 func caskUpdateAction(
 	c *cli2.Context,
-	opts *Options,
+	_ *Options,
 	cOpts *caskOptions,
 ) error {
 	updateOpts := &cask.UpdateOptions{
--- a/pkg/cli/cli.go
+++ b/pkg/cli/cli.go
@@ -46,6 +46,7 @@ func New(version, commit, date string) *CLI {
 			Commands: []*cli2.Command{
 				planCmd(),
 				signCmd(),
+				signFilesCmd(),
 				notarizeCmd(),
 				packageCmd(),
 				releaseCmd(),
--- a/pkg/cli/notarize.go
+++ b/pkg/cli/notarize.go
@@ -52,7 +52,7 @@ func notarizeCmd() *cli2.Command {
 	}
 }

-func notarizeAction(c *cli2.Context, opts *Options) error {
+func notarizeAction(c *cli2.Context, _ *Options) error {
 	options := &notarize.Options{
 		File:     c.Args().Get(0),
 		BundleID: c.String("bundle-id"),
--- a/pkg/cli/plan.go
+++ b/pkg/cli/plan.go
@@ -1,6 +1,7 @@
 package cli

 import (
+	"fmt"
 	"os"
 	"path/filepath"

@@ -37,6 +38,12 @@ func planCmd() *cli2.Command {
 				Name:  "sha",
 				Usage: "override commit SHA of specified git branch/tag",
 			},
+			&cli2.StringFlag{
+				Name:    "format",
+				Aliases: []string{"f"},
+				Usage:   "output format of build plan (yaml or json)",
+				Value:   "yaml",
+			},
 			&cli2.StringFlag{
 				Name: "output",
 				Usage: "output filename to write plan to instead of printing " +
@@ -102,7 +109,18 @@ func planAction(c *cli2.Context, opts *Options) error {
 		return err
 	}

-	planYAML, err := p.YAML()
+	format := c.String("format")
+	var plan string
+	switch format {
+	case "yaml", "yml":
+		format = "yaml"
+		plan, err = p.YAML()
+	case "json":
+		format = "json"
+		plan, err = p.JSON()
+	default:
+		err = fmt.Errorf("--format must be yaml or json")
+	}
 	if err != nil {
 		return err
 	}
@@ -111,7 +129,7 @@ func planAction(c *cli2.Context, opts *Options) error {
 	out = os.Stdout
 	if f := c.String("output"); f != "" {
 		logger.Info("writing plan", "file", f)
-		logger.Debug("content", "yaml", planYAML)
+		logger.Debug("content", format, plan)
 		out, err = os.Create(f)
 		if err != nil {
 			return err
@@ -119,7 +137,7 @@ func planAction(c *cli2.Context, opts *Options) error {
 		defer out.Close()
 	}

-	_, err = out.WriteString(planYAML)
+	_, err = out.WriteString(plan)
 	if err != nil {
 		return err
 	}
--- a/pkg/cli/release.go
+++ b/pkg/cli/release.go
@@ -43,7 +43,7 @@ func releaseCmd() *cli2.Command {
 				Usage: "owner/name of GitHub repo to check for release, " +
 					"ignored if a plan is provided",
 				EnvVars: []string{"GITHUB_REPOSITORY"},
-				Value:   "jimeh/emacs-builds",
+				Value:   "",
 			},
 			&cli2.StringFlag{
 				Name:    "name",
@@ -108,7 +108,7 @@ func releaseCheckCmd() *cli2.Command {

 func releaseCheckAction(
 	c *cli2.Context,
-	opts *Options,
+	_ *Options,
 	rOpts *releaseOptions,
 ) error {
 	rlsOpts := &release.CheckOptions{
@@ -153,6 +153,12 @@ func releasePublishCmd() *cli2.Command {
 					"specified",
 				Value: "",
 			},
+			&cli2.BoolFlag{
+				Name: "asset-size-check",
+				Usage: "Do not replace existing asset files if local and " +
+					"remote file sizes match.",
+				Value: false,
+			},
 		},
 		Action: releaseActionWrapper(releasePublishAction),
 	}
@@ -160,16 +166,17 @@ func releasePublishCmd() *cli2.Command {

 func releasePublishAction(
 	c *cli2.Context,
-	opts *Options,
+	_ *Options,
 	rOpts *releaseOptions,
 ) error {
 	rlsOpts := &release.PublishOptions{
-		Repository:   rOpts.Repository,
-		CommitRef:    c.String("release-sha"),
-		ReleaseName:  rOpts.Name,
-		ReleaseTitle: c.String("title"),
-		AssetFiles:   c.Args().Slice(),
-		GithubToken:  rOpts.GithubToken,
+		Repository:     rOpts.Repository,
+		CommitRef:      c.String("release-sha"),
+		ReleaseName:    rOpts.Name,
+		ReleaseTitle:   c.String("title"),
+		AssetFiles:     c.Args().Slice(),
+		AssetSizeCheck: c.Bool("asset-size-check"),
+		GithubToken:    rOpts.GithubToken,
 	}

 	rlsType := c.String("type")
@@ -184,7 +191,13 @@ func releasePublishAction(
 		return fmt.Errorf("invalid --type \"%s\"", rlsType)
 	}

+	if c.Args().Len() > 0 {
+		rlsOpts.AssetFiles = c.Args().Slice()
+	}
+
 	if rOpts.Plan != nil {
+		rlsOpts.Source = rOpts.Plan.Source
+
 		if rOpts.Plan.Release != nil {
 			rlsOpts.ReleaseName = rOpts.Plan.Release.Name
 			rlsOpts.ReleaseTitle = rOpts.Plan.Release.Title
@@ -196,7 +209,8 @@ func releasePublishAction(
 			}
 		}

-		if rOpts.Plan.Output != nil {
+		// Set asset files based on plan if no file arguments were given.
+		if len(rlsOpts.AssetFiles) == 0 && rOpts.Plan.Output != nil {
 			rlsOpts.AssetFiles = []string{
 				filepath.Join(
 					rOpts.Plan.Output.Directory,
@@ -235,7 +249,7 @@ func releaseBulkCmd() *cli2.Command {

 func releaseBulkAction(
 	c *cli2.Context,
-	opts *Options,
+	_ *Options,
 	rOpts *releaseOptions,
 ) error {
 	bulkOpts := &release.BulkOptions{
--- a/pkg/cli/sign.go
+++ b/pkg/cli/sign.go
@@ -112,3 +112,49 @@ func signAction(c *cli2.Context, opts *Options) error {

 	return sign.Emacs(c.Context, app, signOpts)
 }
+
+func signFilesCmd() *cli2.Command {
+	signCmd := signCmd()
+
+	var flags []cli2.Flag
+	for _, f := range signCmd.Flags {
+		n := f.Names()
+		if len(n) > 0 && n[0] == "plan" {
+			continue
+		}
+
+		flags = append(flags, f)
+	}
+
+	return &cli2.Command{
+		Name:      "sign-files",
+		Usage:     "sign files with codesign",
+		ArgsUsage: "<file> [<file>...]",
+		Hidden:    true,
+		Flags:     flags,
+		Action:    actionWrapper(signFilesAction),
+	}
+}
+
+func signFilesAction(c *cli2.Context, opts *Options) error {
+	signOpts := &sign.Options{
+		Identity:    c.String("sign"),
+		Options:     c.StringSlice("options"),
+		Deep:        c.Bool("deep"),
+		Timestamp:   c.Bool("timestamp"),
+		Force:       c.Bool("force"),
+		Verbose:     c.Bool("verbose"),
+		CodeSignCmd: c.String("codesign"),
+	}
+
+	if v := c.StringSlice("entitlements"); len(v) > 0 {
+		e := sign.Entitlements(v)
+		signOpts.Entitlements = &e
+	}
+
+	if !opts.quiet {
+		signOpts.Output = os.Stdout
+	}
+
+	return sign.Files(c.Context, c.Args().Slice(), signOpts)
+}
--- a/pkg/commit/commit.go
+++ b/pkg/commit/commit.go
@@ -8,11 +8,11 @@ import (
 )

 type Commit struct {
-	SHA       string     `yaml:"sha"`
-	Date      *time.Time `yaml:"date"`
-	Author    string     `yaml:"author"`
-	Committer string     `yaml:"committer"`
-	Message   string     `yaml:"message"`
+	SHA       string     `yaml:"sha" json:"sha"`
+	Date      *time.Time `yaml:"date" json:"date"`
+	Author    string     `yaml:"author" json:"author"`
+	Committer string     `yaml:"committer" json:"committer"`
+	Message   string     `yaml:"message" json:"message"`
 }

 func New(rc *github.RepositoryCommit) *Commit {
--- a/pkg/osinfo/osinfo.go
+++ b/pkg/osinfo/osinfo.go
@@ -2,13 +2,14 @@ package osinfo

 import (
 	"os/exec"
+	"strconv"
 	"strings"
 )

 type OSInfo struct {
-	Name    string `yaml:"name"`
-	Version string `yaml:"version"`
-	Arch    string `yaml:"arch"`
+	Name    string `yaml:"name" json:"name"`
+	Version string `yaml:"version" json:"version"`
+	Arch    string `yaml:"arch" json:"arch"`
 }

 func New() (*OSInfo, error) {
@@ -29,8 +30,17 @@ func New() (*OSInfo, error) {
 	}, nil
 }

-func (s *OSInfo) MajorMinor() string {
+// DistinctVersion returns macOS version down to a distinct "major"
+// version. For macOS 10.x, this will include the first two numeric parts of the
+// version (10.15), while for 11.x and later, the first numeric part is enough
+// (11).
+func (s *OSInfo) DistinctVersion() string {
 	parts := strings.Split(s.Version, ".")
+
+	if n, _ := strconv.Atoi(parts[0]); n >= 11 {
+		return parts[0]
+	}
+
 	max := len(parts)
 	if max > 2 {
 		max = 2
--- a/pkg/plan/create.go
+++ b/pkg/plan/create.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"regexp"
+	"strconv"
 	"strings"

 	"github.com/hashicorp/go-hclog"
@@ -13,9 +14,13 @@ import (
 	"github.com/jimeh/build-emacs-for-macos/pkg/osinfo"
 	"github.com/jimeh/build-emacs-for-macos/pkg/release"
 	"github.com/jimeh/build-emacs-for-macos/pkg/repository"
+	"github.com/jimeh/build-emacs-for-macos/pkg/sanitize"
+	"github.com/jimeh/build-emacs-for-macos/pkg/source"
 )

-var nonAlphaNum = regexp.MustCompile(`[^\w_-]+`)
+var gitTagMatcher = regexp.MustCompile(
+	`^emacs(-.*)?-((\d+\.\d+)(?:\.(\d+))?(-rc\d+)?(.+)?)$`,
+)

 type TestBuildType string

@@ -36,7 +41,7 @@ type Options struct {
 	Output        io.Writer
 }

-func Create(ctx context.Context, opts *Options) (*Plan, error) {
+func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 	logger := hclog.FromContext(ctx).Named("plan")

 	repo, err := repository.NewGitHub(opts.EmacsRepo)
@@ -65,19 +70,36 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) {
 		return nil, err
 	}

-	version := fmt.Sprintf(
+	absoluteVersion := fmt.Sprintf(
 		"%s.%s.%s",
 		commitInfo.DateString(),
 		commitInfo.ShortSHA(),
-		sanitizeString(opts.Ref),
+		sanitize.String(opts.Ref),
 	)

-	releaseName := fmt.Sprintf("Emacs.%s", version)
+	version, channel, err := parseGitRef(opts.Ref)
+	if err != nil {
+		return nil, err
+	}
+
+	var releaseName string
+	switch channel {
+	case release.Stable, release.RC:
+		releaseName = "Emacs-" + version
+	case release.Pretest:
+		version += "-pretest"
+		absoluteVersion += "-pretest"
+		releaseName = "Emacs-" + version
+	default:
+		version = absoluteVersion
+		releaseName = "Emacs." + version
+	}
+
 	buildName := fmt.Sprintf(
 		"Emacs.%s.%s.%s",
-		version,
-		sanitizeString(osInfo.Name+"-"+osInfo.MajorMinor()),
-		sanitizeString(osInfo.Arch),
+		absoluteVersion,
+		sanitize.String(osInfo.Name+"-"+osInfo.DistinctVersion()),
+		sanitize.String(osInfo.Arch),
 	)
 	diskImage := buildName + ".dmg"

@@ -85,18 +107,19 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) {
 		Build: &Build{
 			Name: buildName,
 		},
-		Source: &Source{
+		Source: &source.Source{
 			Ref:        opts.Ref,
 			Repository: repo,
 			Commit:     commitInfo,
-			Tarball: &Tarball{
+			Tarball: &source.Tarball{
 				URL: repo.TarballURL(commitInfo.SHA),
 			},
 		},
 		OS: osInfo,
 		Release: &Release{
 			Name:       releaseName,
-			Prerelease: true,
+			Prerelease: channel != release.Stable,
+			Channel:    channel,
 		},
 		Output: &Output{
 			Directory: opts.OutputDir,
@@ -104,28 +127,18 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) {
 		},
 	}

-	// If given git ref is a stable release tag (emacs-23.2b, emacs-27.2, etc.)
-	// we modify release properties accordingly.
-	if v, err := release.GitRefToStableVersion(opts.Ref); err == nil {
-		plan.Release.Prerelease = false
-		plan.Release.Name, err = release.VersionToName(v)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	if opts.TestBuild != "" {
-		testName := sanitizeString(opts.TestBuild)
+		testName := sanitize.String(opts.TestBuild)

 		plan.Build.Name += ".test." + testName
-		plan.Release.Title = "Test Builds"
+		plan.Release.Title = "Test Builds (" + testName + ")"
 		plan.Release.Name = "test-builds"

-		plan.Release.Prerelease = true
-		plan.Release.Draft = false
-		if opts.TestBuildType == Draft {
-			plan.Release.Prerelease = false
-			plan.Release.Draft = true
+		plan.Release.Prerelease = false
+		plan.Release.Draft = true
+		if opts.TestBuildType == Prerelease {
+			plan.Release.Prerelease = true
+			plan.Release.Draft = false
 		}

 		index := strings.LastIndex(diskImage, ".")
@@ -136,6 +149,35 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) {
 	return plan, nil
 }

-func sanitizeString(s string) string {
-	return nonAlphaNum.ReplaceAllString(s, "-")
+func parseGitRef(ref string) (string, release.Channel, error) {
+	m := gitTagMatcher.FindStringSubmatch(ref)
+
+	if len(m) == 0 {
+		return "", release.Nightly, nil
+	}
+
+	if strings.Contains(m[1], "pretest") {
+		return m[2], release.Pretest, nil
+	}
+
+	if m[4] != "" {
+		n, err := strconv.Atoi(m[4])
+		if err != nil {
+			return "", "", err
+		}
+
+		if n >= 90 {
+			return m[2], release.Pretest, nil
+		}
+	}
+
+	if strings.HasPrefix(m[5], "-rc") {
+		return m[2], release.RC, nil
+	}
+
+	if m[2] == m[3] {
+		return m[2], release.Stable, nil
+	}
+
+	return "", "", nil
 }
--- a/pkg/plan/create_test.go
+++ b/pkg/plan/create_test.go
@@ -0,0 +1,421 @@
+package plan
+
+import (
+	"testing"
+
+	"github.com/jimeh/build-emacs-for-macos/pkg/release"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_parseGitRef(t *testing.T) {
+	t.Parallel()
+
+	type args struct {
+		ref string
+	}
+	type want struct {
+		version string
+		channel release.Channel
+		err     string
+	}
+	tests := []struct {
+		name string
+		args args
+		want want
+	}{
+		{
+			name: "master",
+			args: args{ref: "master"},
+			want: want{version: "", channel: release.Nightly, err: ""},
+		},
+		{
+			name: "emacs-28",
+			args: args{ref: "emacs-28"},
+			want: want{version: "", channel: release.Nightly, err: ""},
+		},
+		{
+			name: "emacs-27",
+			args: args{ref: "emacs-27"},
+			want: want{version: "", channel: release.Nightly, err: ""},
+		},
+		{
+			name: "emacs-26",
+			args: args{ref: "emacs-26"},
+			want: want{version: "", channel: release.Nightly, err: ""},
+		},
+		{
+			name: "emacs-24",
+			args: args{ref: "emacs-24"},
+			want: want{version: "", channel: release.Nightly, err: ""},
+		},
+		{
+			name: "feature/native-comp",
+			args: args{ref: "feature/native-comp"},
+			want: want{version: "", channel: release.Nightly, err: ""},
+		},
+		{
+			name: "feature/pgtk",
+			args: args{ref: "feature/pgtk"},
+			want: want{version: "", channel: release.Nightly, err: ""},
+		},
+		{
+			name: "emacs-19.34",
+			args: args{ref: "emacs-19.34"},
+			want: want{version: "19.34", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-20.4",
+			args: args{ref: "emacs-20.4"},
+			want: want{version: "20.4", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-22.3",
+			args: args{ref: "emacs-22.3"},
+			want: want{version: "22.3", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-23.4",
+			args: args{ref: "emacs-23.4"},
+			want: want{version: "23.4", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-24.0.97",
+			args: args{ref: "emacs-24.0.97"},
+			want: want{version: "24.0.97", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-24.2",
+			args: args{ref: "emacs-24.2"},
+			want: want{version: "24.2", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-24.2.90",
+			args: args{ref: "emacs-24.2.90"},
+			want: want{version: "24.2.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-24.2.93",
+			args: args{ref: "emacs-24.2.93"},
+			want: want{version: "24.2.93", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-24.3",
+			args: args{ref: "emacs-24.3"},
+			want: want{version: "24.3", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-24.3-rc1",
+			args: args{ref: "emacs-24.3-rc1"},
+			want: want{version: "24.3-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-24.3.90",
+			args: args{ref: "emacs-24.3.90"},
+			want: want{version: "24.3.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-24.3.94",
+			args: args{ref: "emacs-24.3.94"},
+			want: want{version: "24.3.94", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-24.4",
+			args: args{ref: "emacs-24.4"},
+			want: want{version: "24.4", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-24.4-rc1",
+			args: args{ref: "emacs-24.4-rc1"},
+			want: want{version: "24.4-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-24.4.90",
+			args: args{ref: "emacs-24.4.90"},
+			want: want{version: "24.4.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-24.4.91",
+			args: args{ref: "emacs-24.4.91"},
+			want: want{version: "24.4.91", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-24.5",
+			args: args{ref: "emacs-24.5"},
+			want: want{version: "24.5", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-24.5-rc1",
+			args: args{ref: "emacs-24.5-rc1"},
+			want: want{version: "24.5-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-24.5-rc3",
+			args: args{ref: "emacs-24.5-rc3"},
+			want: want{version: "24.5-rc3", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-24.5-rc3-fixed",
+			args: args{ref: "emacs-24.5-rc3-fixed"},
+			want: want{version: "24.5-rc3-fixed", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-25.0.90",
+			args: args{ref: "emacs-25.0.90"},
+			want: want{version: "25.0.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-25.0.95",
+			args: args{ref: "emacs-25.0.95"},
+			want: want{version: "25.0.95", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-25.1",
+			args: args{ref: "emacs-25.1"},
+			want: want{version: "25.1", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-25.1-rc1",
+			args: args{ref: "emacs-25.1-rc1"},
+			want: want{version: "25.1-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-25.1-rc2",
+			args: args{ref: "emacs-25.1-rc2"},
+			want: want{version: "25.1-rc2", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-25.1.90",
+			args: args{ref: "emacs-25.1.90"},
+			want: want{version: "25.1.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-25.1.91",
+			args: args{ref: "emacs-25.1.91"},
+			want: want{version: "25.1.91", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-25.2",
+			args: args{ref: "emacs-25.2"},
+			want: want{version: "25.2", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-25.2-rc1",
+			args: args{ref: "emacs-25.2-rc1"},
+			want: want{version: "25.2-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-25.2-rc2",
+			args: args{ref: "emacs-25.2-rc2"},
+			want: want{version: "25.2-rc2", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-26.0.90",
+			args: args{ref: "emacs-26.0.90"},
+			want: want{version: "26.0.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-26.0.91",
+			args: args{ref: "emacs-26.0.91"},
+			want: want{version: "26.0.91", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-26.1",
+			args: args{ref: "emacs-26.1"},
+			want: want{version: "26.1", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-26.1-rc1",
+			args: args{ref: "emacs-26.1-rc1"},
+			want: want{version: "26.1-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-26.1.90",
+			args: args{ref: "emacs-26.1.90"},
+			want: want{version: "26.1.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-26.1.92",
+			args: args{ref: "emacs-26.1.92"},
+			want: want{version: "26.1.92", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-26.2",
+			args: args{ref: "emacs-26.2"},
+			want: want{version: "26.2", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-26.2.90",
+			args: args{ref: "emacs-26.2.90"},
+			want: want{version: "26.2.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-26.3",
+			args: args{ref: "emacs-26.3"},
+			want: want{version: "26.3", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-26.3-rc1",
+			args: args{ref: "emacs-26.3-rc1"},
+			want: want{version: "26.3-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-27.0.90",
+			args: args{ref: "emacs-27.0.90"},
+			want: want{version: "27.0.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-27.0.91",
+			args: args{ref: "emacs-27.0.91"},
+			want: want{version: "27.0.91", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-27.1",
+			args: args{ref: "emacs-27.1"},
+			want: want{version: "27.1", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-27.1-rc1",
+			args: args{ref: "emacs-27.1-rc1"},
+			want: want{version: "27.1-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-27.1-rc2",
+			args: args{ref: "emacs-27.1-rc2"},
+			want: want{version: "27.1-rc2", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-27.1.90",
+			args: args{ref: "emacs-27.1.90"},
+			want: want{version: "27.1.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-27.1.91",
+			args: args{ref: "emacs-27.1.91"},
+			want: want{version: "27.1.91", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-27.2",
+			args: args{ref: "emacs-27.2"},
+			want: want{version: "27.2", channel: release.Stable, err: ""},
+		},
+		{
+			name: "emacs-27.2-rc1",
+			args: args{ref: "emacs-27.2-rc1"},
+			want: want{version: "27.2-rc1", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-27.2-rc2",
+			args: args{ref: "emacs-27.2-rc2"},
+			want: want{version: "27.2-rc2", channel: release.RC, err: ""},
+		},
+		{
+			name: "emacs-28.0.90",
+			args: args{ref: "emacs-28.0.90"},
+			want: want{version: "28.0.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-21.0.100",
+			args: args{ref: "emacs-pretest-21.0.100"},
+			want: want{version: "21.0.100", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-21.0.106",
+			args: args{ref: "emacs-pretest-21.0.106"},
+			want: want{version: "21.0.106", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-21.0.90",
+			args: args{ref: "emacs-pretest-21.0.90"},
+			want: want{version: "21.0.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-21.0.99",
+			args: args{ref: "emacs-pretest-21.0.99"},
+			want: want{version: "21.0.99", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-22.0.90",
+			args: args{ref: "emacs-pretest-22.0.90"},
+			want: want{version: "22.0.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-22.0.99",
+			args: args{ref: "emacs-pretest-22.0.99"},
+			want: want{version: "22.0.99", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-22.0.990",
+			args: args{ref: "emacs-pretest-22.0.990"},
+			want: want{version: "22.0.990", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-22.1.90",
+			args: args{ref: "emacs-pretest-22.1.90"},
+			want: want{version: "22.1.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-22.2.90",
+			args: args{ref: "emacs-pretest-22.2.90"},
+			want: want{version: "22.2.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-23.0.90",
+			args: args{ref: "emacs-pretest-23.0.90"},
+			want: want{version: "23.0.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-23.1.90",
+			args: args{ref: "emacs-pretest-23.1.90"},
+			want: want{version: "23.1.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-23.2.90",
+			args: args{ref: "emacs-pretest-23.2.90"},
+			want: want{version: "23.2.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-23.2.91",
+			args: args{ref: "emacs-pretest-23.2.91"},
+			want: want{version: "23.2.91", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-23.2.93",
+			args: args{ref: "emacs-pretest-23.2.93"},
+			want: want{version: "23.2.93", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-23.2.93.1",
+			args: args{ref: "emacs-pretest-23.2.93.1"},
+			want: want{version: "23.2.93.1", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-23.3.90",
+			args: args{ref: "emacs-pretest-23.3.90"},
+			want: want{version: "23.3.90", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-24.0.05",
+			args: args{ref: "emacs-pretest-24.0.05"},
+			want: want{version: "24.0.05", channel: release.Pretest, err: ""},
+		},
+		{
+			name: "emacs-pretest-24.0.90",
+			args: args{ref: "emacs-pretest-24.0.90"},
+			want: want{version: "24.0.90", channel: release.Pretest, err: ""},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, gotChannel, err := parseGitRef(tt.args.ref)
+
+			assert.Equal(t, tt.want.version, got)
+			assert.Equal(t, tt.want.channel, gotChannel)
+
+			if tt.want.err == "" {
+				assert.NoError(t, err)
+			} else {
+				assert.EqualError(t, err, tt.want.err)
+			}
+		})
+	}
+}
--- a/pkg/plan/plan.go
+++ b/pkg/plan/plan.go
@@ -2,21 +2,22 @@ package plan

 import (
 	"bytes"
+	"encoding/json"
 	"io"
 	"os"

-	"github.com/jimeh/build-emacs-for-macos/pkg/commit"
 	"github.com/jimeh/build-emacs-for-macos/pkg/osinfo"
-	"github.com/jimeh/build-emacs-for-macos/pkg/repository"
+	"github.com/jimeh/build-emacs-for-macos/pkg/release"
+	"github.com/jimeh/build-emacs-for-macos/pkg/source"
 	"gopkg.in/yaml.v3"
 )

 type Plan struct {
-	Build   *Build         `yaml:"build,omitempty"`
-	Source  *Source        `yaml:"source,omitempty"`
-	OS      *osinfo.OSInfo `yaml:"os,omitempty"`
-	Release *Release       `yaml:"release,omitempty"`
-	Output  *Output        `yaml:"output,omitempty"`
+	Build   *Build         `yaml:"build,omitempty" json:"build,omitempty"`
+	Source  *source.Source `yaml:"source,omitempty" json:"source,omitempty"`
+	OS      *osinfo.OSInfo `yaml:"os,omitempty" json:"os,omitempty"`
+	Release *Release       `yaml:"release,omitempty" json:"release,omitempty"`
+	Output  *Output        `yaml:"output,omitempty" json:"output,omitempty"`
 }

 // Load attempts to loads a plan YAML from given filename.
@@ -54,29 +55,38 @@ func (s *Plan) YAML() (string, error) {
 	return buf.String(), nil
 }

+// WriteJSON writes plan in JSON format to given io.Writer.
+func (s *Plan) WriteJSON(w io.Writer) error {
+	enc := json.NewEncoder(w)
+	enc.SetIndent("", "  ")
+
+	return enc.Encode(s)
+}
+
+// JSON returns plan in JSON format.
+func (s *Plan) JSON() (string, error) {
+	var buf bytes.Buffer
+	err := s.WriteJSON(&buf)
+	if err != nil {
+		return "", err
+	}
+
+	return buf.String(), nil
+}
+
 type Build struct {
-	Name string `yaml:"name,omitempty"`
-}
-
-type Source struct {
-	Ref        string                 `yaml:"ref,omitempty"`
-	Repository *repository.Repository `yaml:"repository,omitempty"`
-	Commit     *commit.Commit         `yaml:"commit,omitempty"`
-	Tarball    *Tarball               `yaml:"tarball,omitempty"`
-}
-
-type Tarball struct {
-	URL string `yaml:"url,omitempty"`
+	Name string `yaml:"name,omitempty" json:"name,omitempty"`
 }

 type Release struct {
-	Name       string `yaml:"name"`
-	Title      string `yaml:"title,omitempty"`
-	Draft      bool   `yaml:"draft,omitempty"`
-	Prerelease bool   `yaml:"prerelease,omitempty"`
+	Name       string          `yaml:"name" json:"name"`
+	Title      string          `yaml:"title,omitempty" json:"title,omitempty"`
+	Draft      bool            `yaml:"draft,omitempty" json:"draft,omitempty"`
+	Prerelease bool            `yaml:"prerelease,omitempty" json:"prerelease,omitempty"`
+	Channel    release.Channel `yaml:"channel,omitempty" json:"channel,omitempty"`
 }

 type Output struct {
-	Directory string `yaml:"directory,omitempty"`
-	DiskImage string `yaml:"disk_image,omitempty"`
+	Directory string `yaml:"directory,omitempty" json:"directory,omitempty"`
+	DiskImage string `yaml:"disk_image,omitempty" json:"disk_image,omitempty"`
 }
--- a/pkg/release/channel.go
+++ b/pkg/release/channel.go
@@ -0,0 +1,11 @@
+package release
+
+type Channel string
+
+// Release channels
+const (
+	Stable  Channel = "stable"
+	RC      Channel = "release-candidate"
+	Pretest Channel = "pretest"
+	Nightly Channel = "nightly"
+)
--- a/pkg/release/publish.go
+++ b/pkg/release/publish.go
@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/go-hclog"
 	"github.com/jimeh/build-emacs-for-macos/pkg/gh"
 	"github.com/jimeh/build-emacs-for-macos/pkg/repository"
+	"github.com/jimeh/build-emacs-for-macos/pkg/source"
 )

 type releaseType int
@@ -40,15 +41,26 @@ type PublishOptions struct {
 	// draft)
 	ReleaseType releaseType

+	// Source contains the source used to build the asset files. When set a
+	// release body/description text will be generated based on source commit
+	// details.
+	Source *source.Source
+
 	// AssetFiles is a list of files which must all exist in the release for
 	// the check to pass.
 	AssetFiles []string

+	// AssetSizeCheck causes a file size check for any existing asset files on a
+	// release which have the same filename as a asset we want to upload. If the
+	// size of the local and remote files are the same, the existing asset file
+	// is left in place. When this is false, given asset files will always be
+	// uploaded, replacing any asset files with the same filename.
+	AssetSizeCheck bool
+
 	// GitHubToken is the OAuth token used to talk to the GitHub API.
 	GithubToken string
 }

-//nolint:funlen,gocyclo
 // Publish creates and publishes a GitHub release.
 func Publish(ctx context.Context, opts *PublishOptions) error {
 	logger := hclog.FromContext(ctx).Named("release")
@@ -68,6 +80,16 @@ func Publish(ctx context.Context, opts *PublishOptions) error {
 	prerelease := opts.ReleaseType == Prerelease
 	draft := opts.ReleaseType == Draft

+	body := ""
+	if opts.Source != nil {
+		body, err = releaseBody(opts)
+		if err != nil {
+			return err
+		}
+		logger.Debug("rendered release body", "content", body)
+	}
+
+	created := false
 	logger.Info("checking release", "tag", tagName)
 	release, resp, err := gh.Repositories.GetReleaseByTag(
 		ctx, opts.Repository.Owner(), opts.Repository.Name(), tagName,
@@ -77,6 +99,7 @@ func Publish(ctx context.Context, opts *PublishOptions) error {
 			return err
 		}

+		created = true
 		logger.Info("creating release", "tag", tagName, "name", name)

 		release, _, err = gh.Repositories.CreateRelease(
@@ -87,6 +110,7 @@ func Publish(ctx context.Context, opts *PublishOptions) error {
 				TargetCommitish: &opts.CommitRef,
 				Prerelease:      boolPtr(false),
 				Draft:           boolPtr(true),
+				Body:            &body,
 			},
 		)
 		if err != nil {
@@ -94,62 +118,9 @@ func Publish(ctx context.Context, opts *PublishOptions) error {
 		}
 	}

-	for _, fileName := range files {
-		fileIO, err2 := os.Open(fileName)
-		if err2 != nil {
-			return err2
-		}
-		defer fileIO.Close()
-
-		fileInfo, err2 := fileIO.Stat()
-		if err2 != nil {
-			return err2
-		}
-
-		fileBaseName := filepath.Base(fileName)
-		assetExists := false
-
-		for _, a := range release.Assets {
-			if a.GetName() != fileBaseName {
-				continue
-			}
-
-			if a.GetSize() == int(fileInfo.Size()) {
-				logger.Info("asset exists with correct size",
-					"file", fileBaseName,
-					"local_size", byteCountIEC(fileInfo.Size()),
-					"remote_size", byteCountIEC(int64(a.GetSize())),
-				)
-				assetExists = true
-			} else {
-				_, err = gh.Repositories.DeleteReleaseAsset(
-					ctx, opts.Repository.Owner(), opts.Repository.Name(),
-					a.GetID(),
-				)
-				if err != nil {
-					return err
-				}
-				logger.Info(
-					"deleted asset with wrong size", "file", fileBaseName,
-				)
-			}
-		}
-
-		if !assetExists {
-			logger.Info("uploading asset",
-				"file", fileBaseName,
-				"size", byteCountIEC(fileInfo.Size()),
-			)
-			_, _, err2 = gh.Repositories.UploadReleaseAsset(
-				ctx, opts.Repository.Owner(), opts.Repository.Name(),
-				release.GetID(),
-				&github.UploadOptions{Name: fileBaseName},
-				fileIO,
-			)
-			if err2 != nil {
-				return err2
-			}
-		}
+	err = uploadReleaseAssets(ctx, gh, release, files, opts)
+	if err != nil {
+		return err
 	}

 	changed := false
@@ -158,6 +129,11 @@ func Publish(ctx context.Context, opts *PublishOptions) error {
 		changed = true
 	}

+	if body != "" && release.GetBody() != body {
+		release.Body = &body
+		changed = true
+	}
+
 	if release.GetDraft() != draft {
 		release.Draft = &draft
 		changed = true
@@ -169,6 +145,7 @@ func Publish(ctx context.Context, opts *PublishOptions) error {
 	}

 	if changed {
+		logger.Info("updating release attributes", "url", release.GetHTMLURL())
 		release, _, err = gh.Repositories.EditRelease(
 			ctx, opts.Repository.Owner(), opts.Repository.Name(),
 			release.GetID(), release,
@@ -178,13 +155,89 @@ func Publish(ctx context.Context, opts *PublishOptions) error {
 		}
 	}

-	logger.Info("release created", "url", release.GetHTMLURL())
+	if created {
+		logger.Info("release created", "url", release.GetHTMLURL())
+	} else {
+		logger.Info("release updated", "url", release.GetHTMLURL())
+	}
+
+	return nil
+}
+
+func uploadReleaseAssets(
+	ctx context.Context,
+	gh *github.Client,
+	release *github.RepositoryRelease,
+	fileNames []string,
+	opts *PublishOptions,
+) error {
+	logger := hclog.FromContext(ctx).Named("release")
+
+	for _, fileName := range fileNames {
+		logger.Debug("processing asset", "file", filepath.Base(fileName))
+
+		fileIO, err := os.Open(fileName)
+		if err != nil {
+			return err
+		}
+		defer fileIO.Close()
+
+		fileInfo, err := fileIO.Stat()
+		if err != nil {
+			return err
+		}
+
+		fileBaseName := filepath.Base(fileName)
+		assetExists := false
+
+		for _, a := range release.Assets {
+			if a.GetName() != fileBaseName {
+				continue
+			}
+
+			if opts.AssetSizeCheck && a.GetSize() == int(fileInfo.Size()) {
+				logger.Info("asset exists with correct size",
+					"file", fileBaseName,
+					"local_size", byteCountIEC(fileInfo.Size()),
+					"remote_size", byteCountIEC(int64(a.GetSize())),
+				)
+				assetExists = true
+			} else {
+				logger.Info(
+					"deleting existing asset", "file", fileBaseName,
+				)
+				_, err = gh.Repositories.DeleteReleaseAsset(
+					ctx, opts.Repository.Owner(), opts.Repository.Name(),
+					a.GetID(),
+				)
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		if !assetExists {
+			logger.Info("uploading asset",
+				"file", fileBaseName,
+				"size", byteCountIEC(fileInfo.Size()),
+			)
+			_, _, err = gh.Repositories.UploadReleaseAsset(
+				ctx, opts.Repository.Owner(), opts.Repository.Name(),
+				release.GetID(),
+				&github.UploadOptions{Name: fileBaseName},
+				fileIO,
+			)
+			if err != nil {
+				return err
+			}
+		}
+	}

 	return nil
 }

 func publishFileList(files []string) ([]string, error) {
-	var output []string
+	results := map[string]struct{}{}
 	for _, file := range files {
 		var err error
 		file, err = filepath.Abs(file)
@@ -200,11 +253,10 @@ func publishFileList(files []string) ([]string, error) {
 			return nil, fmt.Errorf("\"%s\" is not a file", file)
 		}

-		output = append(output, file)
+		results[file] = struct{}{}
 		sumFile := file + ".sha256"

 		_, err = os.Stat(sumFile)
-		fmt.Printf("err: %+v\n", err)
 		if err != nil {
 			if os.IsNotExist(err) {
 				continue
@@ -212,7 +264,12 @@ func publishFileList(files []string) ([]string, error) {

 			return nil, err
 		}
-		output = append(output, sumFile)
+		results[sumFile] = struct{}{}
+	}
+
+	var output []string
+	for f := range results {
+		output = append(output, f)
 	}

 	return output, nil
--- a/pkg/release/release_body.go
+++ b/pkg/release/release_body.go
@@ -0,0 +1,78 @@
+package release
+
+import (
+	"bytes"
+	"os"
+	"strings"
+	"text/template"
+)
+
+var tplFuncs = template.FuncMap{
+	"indent": func(n int, s string) string {
+		pad := strings.Repeat(" ", n)
+
+		return pad + strings.ReplaceAll(s, "\n", "\n"+pad)
+	},
+}
+
+var bodyTpl = template.Must(template.New("body").Funcs(tplFuncs).Parse(`
+{{- $t := "` + "`" + `" -}}
+### Build Details
+
+{{ with .SourceURL -}}
+- Source: {{ . }}
+{{- end }}
+{{- if .CommitURL }}
+- Commit: {{ .CommitURL }}
+  {{- if .CommitSHA }} ({{ $t }}{{ .CommitSHA }}{{ $t }}){{ end }}
+{{- end }}
+{{- with .TarballURL }}
+- Tarball: {{ . }}
+{{- end }}
+{{- with .BuildLogURL }}
+- Build Log: {{ . }} (available for 90 days)
+{{- end }}`,
+))
+
+type bodyData struct {
+	SourceURL   string
+	CommitSHA   string
+	CommitURL   string
+	BuildLogURL string
+	TarballURL  string
+}
+
+func releaseBody(opts *PublishOptions) (string, error) {
+	src := opts.Source
+
+	if src.Repository == nil || src.Commit == nil {
+		return "", nil
+	}
+
+	data := &bodyData{
+		SourceURL:  src.Repository.TreeURL(src.Ref),
+		CommitSHA:  src.Commit.SHA,
+		CommitURL:  src.Repository.CommitURL(src.Commit.SHA),
+		TarballURL: src.Repository.TarballURL(src.Commit.SHA),
+	}
+
+	// If available, use the exact value from the build plan.
+	if src.Tarball != nil {
+		data.TarballURL = src.Tarball.URL
+	}
+
+	// If running within GitHub Actions, provide link to build log.
+	if opts.Repository != nil {
+		if id := os.Getenv("GITHUB_RUN_ID"); id != "" {
+			data.BuildLogURL = opts.Repository.ActionRunURL(id)
+		}
+	}
+
+	var buf bytes.Buffer
+	err := bodyTpl.Execute(&buf, data)
+	if err != nil {
+		return "", err
+	}
+
+	return buf.String(), nil
+}
--- a/pkg/release/version.go
+++ b/pkg/release/version.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"regexp"
+	"strings"
 )

 // Errors
@@ -18,7 +19,7 @@ var (

 var (
 	stableVersion = regexp.MustCompile(`^\d+\.\d+(?:[a-z]+)?$`)
-	stableGetRef  = regexp.MustCompile(`^emacs-(\d+\.\d+(?:[a-z]+)?)$`)
+	stableGitRef  = regexp.MustCompile(`^emacs-(\d+\.\d+(?:[a-z]+)?)$`)
 )

 func VersionToName(version string) (string, error) {
@@ -26,7 +27,8 @@ func VersionToName(version string) (string, error) {
 		return "", ErrEmptyVersion
 	}

-	if stableVersion.MatchString(version) {
+	if stableVersion.MatchString(version) ||
+		strings.HasSuffix(version, "-pretest") {
 		return "Emacs-" + version, nil
 	}

@@ -34,7 +36,7 @@ func VersionToName(version string) (string, error) {
 }

 func GitRefToStableVersion(ref string) (string, error) {
-	if m := stableGetRef.FindStringSubmatch(ref); len(m) > 1 {
+	if m := stableGitRef.FindStringSubmatch(ref); len(m) > 1 {
 		return m[1], nil
 	}

--- a/pkg/repository/repository.go
+++ b/pkg/repository/repository.go
@@ -22,8 +22,8 @@ const GitHub Type = "github"
 // Repository represents basic information about a repository with helper
 // methods to get various pieces of information from it.
 type Repository struct {
-	Type   Type   `yaml:"type,omitempty"`
-	Source string `yaml:"source,omitempty"`
+	Type   Type   `yaml:"type,omitempty" json:"type,omitempty"`
+	Source string `yaml:"source,omitempty" json:"source,omitempty"`
 }

 func NewGitHub(ownerAndName string) (*Repository, error) {
@@ -89,3 +89,54 @@ func (s *Repository) TarballURL(ref string) string {
 		return ""
 	}
 }
+
+func (s *Repository) CommitURL(ref string) string {
+	if ref == "" {
+		return ""
+	}
+
+	switch s.Type {
+	case GitHub:
+		return GitHubBaseURL + s.Source + "/commit/" + ref
+	default:
+		return ""
+	}
+}
+
+func (s *Repository) TreeURL(ref string) string {
+	if ref == "" {
+		return ""
+	}
+
+	switch s.Type {
+	case GitHub:
+		return GitHubBaseURL + s.Source + "/tree/" + ref
+	default:
+		return ""
+	}
+}
+
+func (s *Repository) ActionRunURL(runID string) string {
+	if runID == "" {
+		return ""
+	}
+
+	switch s.Type {
+	case GitHub:
+		return GitHubBaseURL + s.Source + "/actions/runs/" + runID
+	default:
+		return ""
+	}
+}
+
+func (s *Repository) ReleaseURL(releaseName string) string {
+	if releaseName == "" {
+		return ""
+	}
+	switch s.Type {
+	case GitHub:
+		return GitHubBaseURL + s.Source + "/releases/tag/" + releaseName
+	default:
+		return ""
+	}
+}
--- a/pkg/repository/repository_test.go
+++ b/pkg/repository/repository_test.go
@@ -0,0 +1,54 @@
+package repository
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRepository_ReleaseURL(t *testing.T) {
+	type fields struct {
+		Type   Type
+		Source string
+	}
+	type args struct {
+		releaseName string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   string
+	}{
+		{
+			name:   "empty name",
+			fields: fields{Type: GitHub, Source: "foo/bar"},
+			args:   args{releaseName: ""},
+			want:   "",
+		},
+		{
+			name:   "GitHub, foo/bar, v1.0.0",
+			fields: fields{Type: GitHub, Source: "foo/bar"},
+			args:   args{releaseName: "v1.0.0"},
+			want:   "https://github.com/foo/bar/releases/tag/v1.0.0",
+		},
+		{
+			name:   "Not GitHub, foo/bar, v1.0.0",
+			fields: fields{Type: Type("oops"), Source: "foo/bar"},
+			args:   args{releaseName: "v1.0.0"},
+			want:   "",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			repo := &Repository{
+				Type:   tt.fields.Type,
+				Source: tt.fields.Source,
+			}
+
+			got := repo.ReleaseURL(tt.args.releaseName)
+
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
--- a/pkg/sanitize/string.go
+++ b/pkg/sanitize/string.go
@@ -0,0 +1,9 @@
+package sanitize
+
+import "regexp"
+
+var nonAlphaNum = regexp.MustCompile(`[^\w_-]+`)
+
+func String(s string) string {
+	return nonAlphaNum.ReplaceAllString(s, "-")
+}
--- a/pkg/sign/entitlements.go
+++ b/pkg/sign/entitlements.go
@@ -14,6 +14,7 @@ var DefaultEmacsEntitlements = []string{
 	"com.apple.security.cs.allow-jit",
 	"com.apple.security.network.client",
 	"com.apple.security.cs.disable-library-validation",
+	"com.apple.security.cs.allow-dyld-environment-variables",
 	"com.apple.security.automation.apple-events",
 }

--- a/pkg/sign/entitlements_test.go
+++ b/pkg/sign/entitlements_test.go
@@ -50,6 +50,7 @@ var entitlementsTestCases = []struct {
 			"com.apple.security.cs.allow-jit",
 			"com.apple.security.network.client",
 			"com.apple.security.cs.disable-library-validation",
+			"com.apple.security.cs.allow-dyld-environment-variables",
 			"com.apple.security.automation.apple-events",
 		},
 		//nolint:lll
@@ -64,6 +65,8 @@ var entitlementsTestCases = []struct {
                <true/>
                <key>com.apple.security.cs.disable-library-validation</key>
                <true/>
+                <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+                <true/>
                <key>com.apple.security.automation.apple-events</key>
                <true/>
              </dict>
@@ -78,6 +81,7 @@ func TestDefaultEmacsEntitlements(t *testing.T) {
 			"com.apple.security.cs.allow-jit",
 			"com.apple.security.network.client",
 			"com.apple.security.cs.disable-library-validation",
+			"com.apple.security.cs.allow-dyld-environment-variables",
 			"com.apple.security.automation.apple-events",
 		},
 		DefaultEmacsEntitlements,
--- a/pkg/source/source.go
+++ b/pkg/source/source.go
@@ -0,0 +1,17 @@
+package source
+
+import (
+	"github.com/jimeh/build-emacs-for-macos/pkg/commit"
+	"github.com/jimeh/build-emacs-for-macos/pkg/repository"
+)
+
+type Source struct {
+	Ref        string                 `yaml:"ref,omitempty" json:"ref,omitempty"`
+	Repository *repository.Repository `yaml:"repository,omitempty" json:"repository,omitempty"`
+	Commit     *commit.Commit         `yaml:"commit,omitempty" json:"commit,omitempty"`
+	Tarball    *Tarball               `yaml:"tarball,omitempty" json:"tarball,omitempty"`
+}
+
+type Tarball struct {
+	URL string `yaml:"url,omitempty" json:"url,omitempty"`
+}
Author	SHA1	Message	Date
Jim Myhrberg	4f1e748df2	chore(release): 0.6.33	2022-04-30 19:37:01 +01:00
Jim Myhrberg	d984633991	chore(deps): update gon package to 0.2.5	2022-04-30 19:35:21 +01:00
Jim Myhrberg	616f74d624	chore(release): 0.6.32	2022-04-30 17:46:51 +01:00
Jim Myhrberg	d7963b7664	chore(helper): minor tweak to emacs helper launch script	2022-04-30 17:46:06 +01:00
Jim Myhrberg	a20a8456ab	feat(deps): add sqlite brew dependency for Emacs 29.x	2022-04-30 17:45:21 +01:00
Jim Myhrberg	8ad3ff4f53	feat(dbus): add flag to explicitly disable dbus support Fixes #69	2022-04-30 17:27:41 +01:00
Jim Myhrberg	e31f5aaf93	fix(native-comp): support libgccjit 11.3.0 The libgccjit shared library file was renamed from libgccjit.so to libgccjit.0.dylib in 11.3.0. Fixes #71	2022-04-30 17:13:50 +01:00
Jim Myhrberg	c2fb07fdb8	chore(release): 0.6.31	2022-02-25 10:33:12 +00:00
Jim Myhrberg	07e0e3dacd	fix: set source-directory correctly Fixes #68	2022-02-25 10:32:03 +00:00
Jim Myhrberg	efddb9ef92	chore(release): 0.6.30	2022-02-08 03:07:18 +00:00
Jim Myhrberg	f7f4c0433a	Merge pull request #66 from jimeh/add-homebrew-site-lisp-path	2022-02-08 03:05:31 +00:00
Jim Myhrberg	cbd8cb27b6	fix(site-lisp): add Homebrew's site-lisp directory to locallisppath This should allow mu4e to be loaded from the mu homebrew package, among other homebrew packages that provides emacs site-lisp files. Ref: https://github.com/jimeh/emacs-builds/issues/19	2022-02-08 00:44:09 +00:00
Jim Myhrberg	656b96510a	chore(release): 0.6.29	2022-02-07 21:07:10 +00:00
Jim Myhrberg	084776db6b	feat(cask): add support for pretest builds	2022-02-07 21:04:59 +00:00
Jim Myhrberg	1e6d6cc6cf	chore(release): 0.6.28	2022-01-15 23:19:07 +00:00
Jim Myhrberg	68ef4c066c	feat(build): add dbus dependency to enable support in Emacs builds Dbus support is automatically enabled if available on the system.	2022-01-15 23:17:25 +00:00
Jim Myhrberg	d476fd33ec	chore(release): 0.6.27	2021-12-05 12:57:03 +00:00
Jim Myhrberg	baa5930467	Merge pull request #63 from jimeh/add-pretest-build-support feat(plan): add support for pretest and release candidate builds	2021-12-05 12:54:33 +00:00
Jim Myhrberg	743b10c751	feat(plan): add support for pretest and release candidate builds Add support for naming release and builds accordingly when given a git ref for a pretest (90 or above patch number) or release candidate ("-rcX" at the end of the tag).	2021-12-05 12:52:08 +00:00
Jim Myhrberg	59f1bcd3e8	chore(release): 0.6.26	2021-11-27 05:01:57 +00:00
Jim Myhrberg	e767e284b7	Merge pull request #62 from jimeh/improve-shared-library-embedding	2021-11-27 05:01:16 +00:00
Jim Myhrberg	8129a2e93b	docs(readme): update Status section, and minor tweaks	2021-11-27 04:58:54 +00:00
Jim Myhrberg	4ae288cae3	feat(build): re-link eln files by default again This reverts commit `d338c136db`. Thanks to using relinking with @rpath, paths are shorting leaving enough room in all *.eln files to be signed.	2021-11-27 04:25:03 +00:00
Jim Myhrberg	3bd78d130a	feat(native-comp): no longer require gcc homebrew formula This finally makes Emacs.app with native-comp fully self-contained, no longer requiring the GCC Homebrew formula to be installed when loading .eln files that link against /usr/local/lib/gcc/11/libgcc_s.1.dylib. By adding the signing entitlement com.apple.security.cs.allow-dyld-environment-variables, which allows dynamic library loading to be controlled via DYLD_ environment variables. It seems the lack of this was preventing Emacs from loading the bundled libgcc_s.1.dylib file from Contents/Frameworks. Fixes #53	2021-11-27 04:01:23 +00:00
Jim Myhrberg	fb5362ce18	fix(embed): relink shared libraries with @rpath instead of @executable_path This allows much shorter shared library link paths within .eln files compared to when using @executable_path, which leaves enough space in them to sign all .eln files, while directly having them linked against the embedded copy of GCC shared libraries.	2021-11-27 03:47:43 +00:00
Jim Myhrberg	1a34a9504a	chore(release): 0.6.25	2021-11-25 23:38:52 +00:00
Jim Myhrberg	8513521d29	Merge pull request #61 from jimeh/refactor-file-operations	2021-11-25 23:36:55 +00:00
Jim Myhrberg	88bbefadc6	refactor(embed): use cp, mv, and chmod shell commands instead of FileUtils It seems like Ruby's FileUtils.cp_r method especially was messing with some file attributes, causing Emacs to print details about loading various elisp files on startup. While when Emacs.app is copied into the output build directory using "cp -a" instead of FileUtils.cp_r it does not exhibit this behavior.	2021-11-25 20:14:16 +00:00
Jim Myhrberg	f1bf1d93b8	chore(release): 0.6.24	2021-11-24 21:42:52 +00:00
Jim Myhrberg	8a467b0d43	fix(embedding): embedding GCC fails when paths do not require sanitizing It seems homebrew bottle of GCC for macOS Monterey (12.0) have changed their directory structure slightly, which caused an issue were we were trying to rename a specific directory to the same name it already had. This behavior is still required as it looks like GCC on macOS Catalina (10.15), the GCC homebrew bottle still uses the old directory structure.	2021-11-24 21:39:03 +00:00
Jim Myhrberg	9c29f721b4	chore(release): 0.6.23	2021-11-10 22:19:28 +00:00
Jim Myhrberg	4ac71ddf39	docs(readme): update usage section with latest help text	2021-11-10 22:19:06 +00:00
Jim Myhrberg	d338c136db	fix(build): do not re-link eln files by default Relinking is currently failing for some of the *.eln files. See #60 for details of the error. Long-term plan is to investigate native-comp's compilation options to hopefully resolve this issue.	2021-11-10 22:11:13 +00:00
Jim Myhrberg	d054a17fc7	chore(release): 0.6.22	2021-11-10 01:56:19 +00:00
Jim Myhrberg	4030ceb9ca	feat(patch): add support for posix-spawn patch from emacs-plus	2021-11-10 01:55:38 +00:00
Jim Myhrberg	ad1a7dd62c	chore(release): 0.6.21	2021-10-27 21:45:43 +01:00
Jim Myhrberg	665e6addec	Merge pull request #59 from jimeh/improve-native-comp-patch	2021-10-27 21:42:05 +01:00
Jim Myhrberg	7f2aba0e4e	chore(builder): add hidden sign-files command for testing purposes Useful when needing to sign singular files with same ease of signing a Emacs.app bundle.	2021-10-27 21:38:29 +01:00
Jim Myhrberg	be326b22aa	refactor(native-comp): improve native-comp env setup patch Instead of patching emacs sources before building Emacs, we can use site-start.el instead for a much cleaner way of setting LIBRARY_PATH before the user config is loaded.	2021-10-27 21:38:29 +01:00
Jim Myhrberg	ef4f2ad930	refactor: use site-start.el instead of abusing subdirs.el Set source-directory in site-start.el instead of subdirs.el which we were basically abusing to execute Elisp before the user config is loaded.	2021-10-27 21:38:28 +01:00
Jim Myhrberg	2293c87fc9	refactor(build): turn add_cli_helper function into a embedder class	2021-10-27 03:12:30 +01:00
Jim Myhrberg	97178bf77a	chore(release): 0.6.20	2021-10-23 20:35:09 +01:00
Jim Myhrberg	591c39e629	fix(notarization): explicitly only copy .c and .h C source files Previously we just copies the whole "src" directory from the workdir, it turns out it has some binary files after a successful build, which caused Apple's notarization process to fail. As we actually only care about the .c and .h files from the "src" directory, let's explicitly only copy those files.	2021-10-23 20:32:13 +01:00
Jim Myhrberg	d6c99f8c60	chore(release): 0.6.19	2021-10-23 17:26:50 +01:00
Jim Myhrberg	bcbd01778d	fix(patch): resolve emacs-29 symlink patches to their real URL Annoyingly, when downloading raw files from GitHub, symlinks do not return the content of the symlink target, but instead it simply returns the symlink target path (../emacs-28/fix-window-role.patch). Hence we have to check the patch file content, and if it contains only a single line of text, we assume it's a symlink, and resolve it relative to the original download URL.	2021-10-23 17:24:45 +01:00
Jim Myhrberg	5602475542	chore(release): 0.6.18	2021-10-23 16:20:44 +01:00
Jim Myhrberg	67b8c5f397	feat(docs): embed C source files and set source-directory accordingly This enables the original C source to be linked to when describing entities which are written in C.	2021-10-23 16:18:05 +01:00
Jim Myhrberg	4dad5812fa	fix(patches): correctly use emacs 28.x and 29.x patches The master branch is now Emacs 29.x, and Emacs 28.x lives on the "emacs-28" release branch.	2021-10-23 16:15:39 +01:00
Jim Myhrberg	65bdff0b6d	chore(release): 0.6.17	2021-10-10 22:42:01 +01:00
Jim Myhrberg	a956dc1b42	feat(release): tweak GitHub release description	2021-10-10 22:41:26 +01:00
Jim Myhrberg	af23b63518	chore(release): 0.6.16	2021-10-10 18:44:41 +01:00
Jim Myhrberg	9c20f77fe3	Merge pull request #58 from jimeh/release-improvements	2021-10-10 18:42:37 +01:00
Jim Myhrberg	2e2f9bc98a	feat(build): handle macOS Big Sur and later version number	2021-10-10 18:25:38 +01:00
Jim Myhrberg	d63cd545aa	feat(cask): make cask template helpers more flexible Helpers available in cask templates can now accept one or more strings as input, and first asset filename that matches all given strings is returned.	2021-10-10 18:25:38 +01:00
Jim Myhrberg	1bbfe5d3ea	feat(plan): allow build plan to be output as YAML or JSON	2021-10-10 18:25:37 +01:00
Jim Myhrberg	b4c5184cef	fix(release): publish arguments are not handled as asset files to upload	2021-10-10 18:25:37 +01:00
Jim Myhrberg	e7a991ef92	feat(release): force-replace existing asset files by default The file-size check is obviously not a very reliable way to determine if the local and remote files are different. Hence we now default to always uploading all given asset files, replacing any existing ones with the same file name. The size check logic is still available via the --asset-size-check flag.	2021-10-10 18:25:37 +01:00
Jim Myhrberg	7118ed8560	feat(release): add description to GitHub Releases The description includes links to the Emacs source repo used, the git ref, commit, tarball download URL, and build log (GitHub Actions Run).	2021-10-10 18:25:36 +01:00
Jim Myhrberg	a71cbda511	chore(release): remove default release repository value This should be explicitly provided via environment variable of command line flag.	2021-10-10 18:25:36 +01:00
Jim Myhrberg	4c0eb37353	chore(debug): remove left-over debug print statement	2021-10-10 18:25:36 +01:00
Jim Myhrberg	b81e101ca7	style(lint): Renamed unused function arguments to _	2021-10-10 18:25:35 +01:00
Jim Myhrberg	c760ffa25e	Merge pull request #55 from puzza007/patch-1 Fix typo in log message	2021-08-30 10:11:58 +01:00
Paul Oliver	931e6ddf9e	Fix typo in log message	2021-08-26 16:00:12 +12:00
Jim Myhrberg	f17f485b9f	chore(release): 0.6.15	2021-08-05 02:38:15 +01:00
Jim Myhrberg	3622df550c	fix(build): another --relink-eln-files flag fix I probably should not be doing these kind of changes after midnight as I get too lazy to test it as it takes like 20 minutes to do a build locally :P	2021-08-05 02:37:01 +01:00
Jim Myhrberg	2a9707ec89	chore(release): 0.6.14	2021-08-05 01:20:13 +01:00
Jim Myhrberg	1fc7faac1f	fix(build): silly typo	2021-08-05 01:19:39 +01:00
Jim Myhrberg	786d253df6	chore(plan): do not modify archive behavior based on plan disk image This allows archive creation (or not) to still be controlled via the --[no-]archive flag.	2021-08-05 00:21:17 +01:00
Jim Myhrberg	228ae0939c	chore(release): 0.6.13	2021-08-04 23:59:58 +01:00
Jim Myhrberg	ac943c430c	fix(native_comp): add option to enable/disable relinking .eln files Relinking the /usr/local/lib/gcc/10/libgcc_s.1.dylib shared library within bundled .eln files is still causing issues with code signing, so I'm adding an option to toggle *.eln file re-linking on/off, with it on by default.	2021-08-04 23:58:27 +01:00
Jim Myhrberg	bc3923c9ca	chore(release): 0.6.12	2021-08-03 00:19:21 +01:00
Jim Myhrberg	e6b1e5a554	fix(sign): resolve signing issue caused by re-linking shared lib in .eln files When shared libs are stored in `Contents/Frameworks`, the re-link path for `/usr/local/lib/gcc/11/libgcc_s.1.dylib` within bundled .eln files becomes `@executable_path/../Frameworks/libgcc_s.1.dylib`, which seems to not leave enough space in the .eln binary header to add a code signature with codesign. This used to work when shared libraries were bundled into `Contents/MacOS/lib`, leading to a shorter relink path of `@executable_path/lib/libgcc_s.1.dylib`, which does leave enough space to add a code signature to .eln files.	2021-08-03 00:13:10 +01:00