chore(release): 0.5.2

Apple's codesign CLI tool will throw an error when signing application
bundles, if any folder within the app's Contents/MacOS folder contains
two dots.

The recent relocation of the native-lisp folder from
Contents/Resources/native-lisp to
Contents/MacOS/lib/emacs/28.0.50/native-lisp is causing code signing to
fail.

The workaround here simply replaces dots (.) with hyphens (-), causing
the following folder renames:

    Contents/MacOS/lib/emacs/28.0.50/native-lisp/28.0.50-852ecda2 --> Contents/MacOS/lib/emacs/28.0.50/native-lisp/28-0-50-852ecda2
    Contents/MacOS/lib/emacs/28.0.50 --> Contents/MacOS/lib/emacs/28-0-50

To ensure Emacs can still find the bundled native-lisp files, we use a
symlink:

    Contents/native-lisp -> MacOS/lib/emacs/28-0-50/native-lisp

This type of fix is not ideal, but its the only way I know of getting
around this issue right now.

And we're already doing a similar thing for the embedded gcc libraries.

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.5.2](https://github.com/jimeh/build-emacs-for-macos/compare/v0.5.1...v0.5.2) (2021-06-27)
+
+
+### Bug Fixes
+
+* **native_comp:** rename native-lisp folder paths to appease Apple's codesign ([eeca7b7](https://github.com/jimeh/build-emacs-for-macos/commit/eeca7b798de236a3ffc1ab04b0f7735a37ce5af4))
+
+### [0.5.1](https://github.com/jimeh/build-emacs-for-macos/compare/v0.5.0...v0.5.1) (2021-06-27)
+
+
+### Bug Fixes
+
+* **native_comp:** symlink creation was missing a conditional check ([ca73ab7](https://github.com/jimeh/build-emacs-for-macos/commit/ca73ab7202877acefd97289f3d28e7c025e36b9d))
+
 ## [0.5.0](https://github.com/jimeh/build-emacs-for-macos/compare/v0.4.17...v0.5.0) (2021-06-21)
 
 

build-emacs-for-macos

@@ -103,7 +103,7 @@ class Build
     app = compile_source(@source_dir)
     build_dir, app = create_build_dir(app)
 
-    symlink_internals(app)
+    handle_native_lisp(app)
     add_cli_helper(app)
 
     LibEmbedder.new(app, brew_dir, extra_libs).embed
@@ -405,10 +405,12 @@ class Build
     [target_dir, File.join(target_dir, File.basename(app))]
   end
 
-  def symlink_internals(app)
+  def handle_native_lisp(app)
     return unless options[:native_comp]
 
-    FileUtils.cd(File.join(app, 'Contents')) do
+    contents_dir = File.join(app, 'Contents')
+
+    FileUtils.cd(contents_dir) do
       # Skip creation of symlinks if *.eln files are located under
       # Resources/native-lisp. Emacs is capable of finding lisp sources and
       # *.eln cache files without symlinks.
@@ -420,7 +422,46 @@ class Build
 
       source = Dir['MacOS/libexec/emacs/**/eln-cache',
                    'MacOS/lib/emacs/**/native-lisp'].first
-      err 'Failed to find native-lisp cache directory for symlink creation.'
+
+      if source.nil?
+        err 'Failed to find native-lisp cache directory for symlink creation.'
+      end
+
+      # Check for folder name containing two dots (.), as this causes Apple's
+      # codesign CLI tool to fail signing the Emacs.app bundle, complaining with
+      # q "bundle format unrecognized" error.
+      #
+      # The workaround for now is to rename the folder replacing the dots with
+      # hyphens (-), and create the native-lisp symlink pointing to the new
+      # location.
+      if source.match(%r{/.+\..+\..+/})
+        # Dig deeper into native-lisp directory
+        eln_dir = File.dirname(Dir[File.join(source, '**', '*.eln')].first)
+
+        base = File.basename(eln_dir)
+        parent = File.dirname(eln_dir)
+
+        until ['.', '/', contents_dir].include?(parent)
+          if base.match(/\..+\./)
+            old_name = File.join(parent, base)
+            new_name = File.join(parent, base.gsub(/\.(.+)\./, '-\\1-'))
+
+            info "Renaming: #{old_name} --> #{new_name}"
+            FileUtils.mv(old_name, new_name)
+          end
+
+          base = File.basename(parent)
+          parent = File.dirname(parent)
+        end
+
+        # Find native-lisp directory again after it has been renamed.
+        source = Dir['MacOS/libexec/emacs/**/eln-cache',
+                     'MacOS/lib/emacs/**/native-lisp'].first
+
+        if source.nil?
+          err 'Failed to find native-lisp cache directory for symlink creation.'
+        end
+      end
 
       target = File.basename(source)
       FileUtils.ln_s(source, target) unless File.exist?(target)