[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1b88404 2/2: Fix NS self contained eln location (bug#49271)
From: |
Alan Third |
Subject: |
master 1b88404 2/2: Fix NS self contained eln location (bug#49271) |
Date: |
Thu, 1 Jul 2021 17:14:47 -0400 (EDT) |
branch: master
commit 1b88404acc4b6399b617dac2b14f1eaa78135670
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Fix NS self contained eln location (bug#49271)
* Makefile.in:
* configure.ac: Change eln file install location to
Contents/Frameworks.
* src/comp.c (hash_native_abi): Replace dots with underscores in the
eln install location as the macOS code-signing tool won't sign the
files if the parent directories have dots.
---
Makefile.in | 2 +-
configure.ac | 4 ++--
src/comp.c | 28 +++++++++++++++++++++++++++-
3 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 8fccdf7..8c14c5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -333,7 +333,7 @@ BIN_DESTDIR='$(DESTDIR)${bindir}/'
ELN_DESTDIR = $(DESTDIR)${libdir}/emacs/${version}/
else
BIN_DESTDIR='${ns_appbindir}/'
-ELN_DESTDIR = ${ns_applibdir}/emacs/${version}/
+ELN_DESTDIR = ${ns_applibdir}/
endif
all: ${SUBDIR} info
diff --git a/configure.ac b/configure.ac
index 6e2cda9..c924634 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1895,7 +1895,7 @@ if test "${with_ns}" != no; then
ns_appdir=`pwd`/nextstep/Emacs.app
ns_appbindir=${ns_appdir}/Contents/MacOS
ns_applibexecdir=${ns_appdir}/Contents/MacOS/libexec
- ns_applibdir=${ns_appdir}/Contents/MacOS/lib
+ ns_applibdir=${ns_appdir}/Contents/Frameworks
ns_appresdir=${ns_appdir}/Contents/Resources
ns_appsrc=Cocoa/Emacs.base
ns_fontfile=macfont.o
@@ -1954,7 +1954,7 @@ fail;
ns_appdir=`pwd`/nextstep/Emacs.app
ns_appbindir=${ns_appdir}
ns_applibexecdir=${ns_appdir}/libexec
- ns_applibdir=${ns_appdir}/lib
+ ns_applibdir=${ns_appdir}/Frameworks
ns_appresdir=${ns_appdir}/Resources
ns_appsrc=GNUstep/Emacs.base
ns_fontfile=nsfont.o
diff --git a/src/comp.c b/src/comp.c
index ea05952..c380346 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -744,8 +744,34 @@ hash_native_abi (void)
Vsystem_configuration_options),
Fmapconcat (intern_c_string ("comp--subr-signature"),
Vcomp_subr_list, build_string (""))));
+
+ Lisp_Object version = Vemacs_version;
+
+#ifdef NS_SELF_CONTAINED
+ /* MacOS self contained app bundles do not like having dots in the
+ directory names under the Contents/Frameworks directory, so
+ convert them to underscores. */
+ version = STRING_MULTIBYTE (Vemacs_version)
+ ? make_uninit_multibyte_string (SCHARS (Vemacs_version),
+ SBYTES (Vemacs_version))
+ : make_uninit_string (SBYTES (Vemacs_version));
+
+ const unsigned char *from = SDATA (Vemacs_version);
+ unsigned char *to = SDATA (version);
+
+ while (from < SDATA (Vemacs_version) + SBYTES (Vemacs_version))
+ {
+ unsigned char c = *from++;
+
+ if (c == '.')
+ c = '_';
+
+ *to++ = c;
+ }
+#endif
+
Vcomp_native_version_dir =
- concat3 (Vemacs_version, build_string ("-"), Vcomp_abi_hash);
+ concat3 (version, build_string ("-"), Vcomp_abi_hash);
}
static void