summaryrefslogtreecommitdiff
path: root/nextstep
diff options
context:
space:
mode:
Diffstat (limited to 'nextstep')
-rw-r--r--nextstep/ChangeLog.14
-rw-r--r--nextstep/GNUstep/Emacs.base/Resources/README5
-rw-r--r--nextstep/GNUstep/Emacs.base/Resources/emacs.tiffbin9464 -> 16751 bytes
-rw-r--r--nextstep/INSTALL31
-rw-r--r--nextstep/Makefile.in24
-rw-r--r--nextstep/README2
-rw-r--r--nextstep/templates/Info.plist.in22
7 files changed, 75 insertions, 13 deletions
diff --git a/nextstep/ChangeLog.1 b/nextstep/ChangeLog.1
index 0eb4a146716..86583d227e0 100644
--- a/nextstep/ChangeLog.1
+++ b/nextstep/ChangeLog.1
@@ -14,7 +14,7 @@
2014-11-03 Jan Djärv <jan.h.d@swipnet.se>
- * INSTALL: Remove univeral binary section.
+ * INSTALL: Remove universal binary section.
2014-10-20 Glenn Morris <rgm@gnu.org>
@@ -312,7 +312,7 @@
;; coding: utf-8
;; End:
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+ Copyright (C) 2008-2022 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nextstep/GNUstep/Emacs.base/Resources/README b/nextstep/GNUstep/Emacs.base/Resources/README
index 6b1e94bde6d..4f80e00ace0 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/README
+++ b/nextstep/GNUstep/Emacs.base/Resources/README
@@ -1,5 +1,6 @@
COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
File: emacs.tiff
- This is a version of the Emacs 23 icon (see etc/images/icons/README)
- by Kentaro Ohkouchi <nanasess@fsm.ne.jp>.
+ Automatically converted from the Emacs 25 icon
+ etc/images/icons/hicolor/scalable/apps/emacs.svg
+ and subject to the same conditions.
diff --git a/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff b/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff
index 42e89cedc05..29381adbde7 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff
+++ b/nextstep/GNUstep/Emacs.base/Resources/emacs.tiff
Binary files differ
diff --git a/nextstep/INSTALL b/nextstep/INSTALL
index 326e02a5502..945d67faa47 100644
--- a/nextstep/INSTALL
+++ b/nextstep/INSTALL
@@ -1,4 +1,4 @@
-Copyright (C) 2008-2017 Free Software Foundation, Inc.
+Copyright (C) 2008-2022 Free Software Foundation, Inc.
See the end of the file for license conditions.
@@ -45,6 +45,35 @@ files will be installed under whatever 'prefix' is set to (defaults to
require 'sudo' for "make install").
+Targeting different macOS versions
+----------------------------------
+
+The Emacs build process automatically enables or disables macOS
+features according to the version of macOS it is being built on. It
+is possible to override this automatic configuration if you are
+targeting a different version of macOS, or wish to build one
+executable that is able to enable or disable features at run-time.
+
+To build a version compatible with an older version of macOS use this
+flag:
+
+ -DMAC_OS_X_VERSION_MIN_REQUIRED=x
+
+and to build for a newer version of macOS:
+
+ -DMAC_OS_X_VERSION_MAX_ALLOWED=x
+
+For example, to enable run-time checks for features available between
+macOS 10.6, and 10.12 inclusive:
+
+ ./configure --with-ns CFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1060 \
+ -DMAC_OS_X_VERSION_MAX_ALLOWED=101200 -g3 -O2"
+
+The macOS version numbers are formatted as 10x0 for macOS up to 10.10,
+and 10xx00 for macOS 10.10 and above. A full list is provided in
+/usr/include/AvailabilityMacros.h.
+
+
Installation
------------
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 5ddf484fe8f..82bf13bc929 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -1,6 +1,6 @@
### @configure_input@
-## Copyright (C) 2012-2017 Free Software Foundation, Inc.
+## Copyright (C) 2012-2022 Free Software Foundation, Inc.
## This file is part of GNU Emacs.
@@ -26,6 +26,7 @@ srcdir = @srcdir@
abs_builddir = @abs_builddir@
abs_top_builddir = @abs_top_builddir@
EXEEXT = @EXEEXT@
+DUMPING = @DUMPING@
# abs_top_srcdir may contain ".."
top_srcdir_abs = $(shell cd @top_srcdir@; pwd -P)
@@ -36,6 +37,7 @@ MKDIR_P = @MKDIR_P@
ns_appdir = @ns_appdir@
## GNUstep: ns_appdir; macOS: ns_appdir/Contents/MacOS
ns_appbindir = @ns_appbindir@
+ns_applibexecdir = @ns_applibexecdir@
## GNUstep/Emacs.base or Cocoa/Emacs.base.
ns_appsrc = @ns_appsrc@
## GNUstep: GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -44,9 +46,15 @@ ns_check_file = @ns_appdir@/@ns_check_file@
.PHONY: all
-all: ${ns_appdir} ${ns_appbindir}/Emacs
+ifeq ($(DUMPING),pdumper)
+ns_pdmp_target = ${ns_applibexecdir}/Emacs.pdmp
+endif
-${ns_check_file} ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc}
+all: ${ns_appdir} ${ns_appbindir}/Emacs ${ns_pdmp_target}
+
+${ns_check_file}: ${ns_appdir}
+
+${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc}
rm -rf ${ns_appdir}
${MKDIR_P} ${ns_appdir}
( cd ${srcdir}/${ns_appsrc} ; tar cfh - . ) | \
@@ -63,6 +71,12 @@ ${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT}
${MKDIR_P} ${ns_appbindir}
cp -f ../src/emacs${EXEEXT} $@
+# FIXME: Don't install the dump file into the app bundle when
+# self-contained install is disabled.
+${ns_applibexecdir}/Emacs.pdmp: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT}.pdmp
+ ${MKDIR_P} ${ns_applibexecdir}
+ cp -f ../src/emacs${EXEEXT}.pdmp $@
+
.PHONY: FORCE
../src/emacs${EXEEXT}: FORCE
@@ -76,13 +90,13 @@ links: ../src/emacs${EXEEXT}
for d in $(shell cd ${srcdir}/${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done
for f in $(shell cd ${srcdir}/${ns_appsrc}; find . -type f); do ln -s $(shell cd ${srcdir}; pwd -P)/${ns_appsrc}/$$f ${ns_appdir}/$$f; done
for d in $(shell cd ${ns_appsrc}; find . -type d); do ${MKDIR_P} ${ns_appdir}/$$d; done
- for f in $(shell cd ${ns_appsrc}; find . -type f); do ln -s $(shell cd ${ns_appsrc}; pwd -P)/$$f ${ns_appdir}/$$f; done
+ for f in $(shell cd ${ns_appsrc}; find . -type f); do rm -f ${ns_appdir}/$$f; ln -s $(shell cd ${ns_appsrc}; pwd -P)/$$f ${ns_appdir}/$$f; done
ln -s $(top_srcdir_abs)/lisp ${ns_appdir}/Contents/Resources
ln -s $(top_srcdir_abs)/info ${ns_appdir}/Contents/Resources
${MKDIR_P} ${ns_appbindir}
ln -s $(abs_top_builddir)/src/emacs${EXEEXT} ${ns_appbindir}/Emacs
ln -s $(abs_top_builddir)/lib-src ${ns_appbindir}/bin
- ln -s $(abs_top_builddir)/lib-src ${ns_appbindir}/libexec
+ ln -s $(abs_top_builddir)/lib-src ${ns_applibexecdir}
${MKDIR_P} ${ns_appdir}/Contents/Resources/etc
for f in $(shell cd $(top_srcdir_abs)/etc; ls); do ln -s $(top_srcdir_abs)/etc/$$f ${ns_appdir}/Contents/Resources/etc; done
ln -s $(abs_top_builddir)/etc/DOC ${ns_appdir}/Contents/Resources/etc
diff --git a/nextstep/README b/nextstep/README
index 03d69b16b27..3ee437949c2 100644
--- a/nextstep/README
+++ b/nextstep/README
@@ -105,7 +105,7 @@ future development.
----------------------------------------------------------------------
-Copyright 2008-2017 Free Software Foundation, Inc.
+Copyright 2008-2022 Free Software Foundation, Inc.
This file is part of GNU Emacs.
diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in
index 5d2eb7def3f..170db67c118 100644
--- a/nextstep/templates/Info.plist.in
+++ b/nextstep/templates/Info.plist.in
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright (C) 2008-2017 Free Software Foundation, Inc.
+Copyright (C) 2008-2022 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -555,7 +555,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
<key>UTTypeIdentifier</key>
<string>org.orgmode.org</string>
<key>UTTypeReferenceURL</key>
- <string>http://orgmode.org</string>
+ <string>https://orgmode.org</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
@@ -675,5 +675,23 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
</array>
<key>NSAppleScriptEnabled</key>
<string>YES</string>
+ <key>NSAppleEventsUsageDescription</key>
+ <string>Emacs requires permission to send AppleEvents to other applications.</string>
+ <!-- For xwidget webkit to browse remote url,
+ but this set no restriction at all. Consult apple's documentation
+ for detail information about `NSApplicationDefinedMask'. -->
+ <key>NSAppTransportSecurity</key>
+ <dict>
+ <key>NSAllowsArbitraryLoads</key>
+ <true/>
+ </dict>
+ <key>NSDesktopFolderUsageDescription</key>
+ <string>Emacs requires permission to access the Desktop folder.</string>
+ <key>NSDocumentsFolderUsageDescription</key>
+ <string>Emacs requires permission to access the Documents folder.</string>
+ <key>NSDownloadsFolderUsageDescription</key>
+ <string>Emacs requires permission to access the Downloads folder.</string>
+ <key>NSRemovableVolumesUsageDescription</key>
+ <string>Emacs requires permission to access files on Removable Volumes.</string>
</dict>
</plist>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 08:44:25 +0000