aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPo Lu2023-08-07 08:56:28 +0800
committerPo Lu2023-08-07 08:56:28 +0800
commit615b8f33420f4304bc5fd05e8a34e2eb9f9a1979 (patch)
treeb9ea253b594c1d343e3f3f92eec1bbd284f68fa2
parent9a9f73041d09d2da7ed562c7ffae0d9519562fba (diff)
downloademacs-feature/android.tar.gz
emacs-feature/android.zip
Disable building the feature/android branchfeature/android
* configure.ac: Disable building Emacs from this branch. * README: Mention that this branch is no longer receiving updates.
-rw-r--r--ChangeLog.android4
-rw-r--r--README4
-rw-r--r--configure.ac3
3 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog.android b/ChangeLog.android
index 3cb88b6f10c..2dfe9b540d0 100644
--- a/ChangeLog.android
+++ b/ChangeLog.android
@@ -1,5 +1,9 @@
12023-08-07 Po Lu <luangruo@yahoo.com> 12023-08-07 Po Lu <luangruo@yahoo.com>
2 2
3 * configure.ac: Disable building Emacs from this branch.
4
5 * README: Mention that this branch is no longer receiving updates.
6
3 * nt/mingw-cfg.site: Remove additions for Gnulib printf. 7 * nt/mingw-cfg.site: Remove additions for Gnulib printf.
4 8
5 * m4, lib: Update from Gnulib. 9 * m4, lib: Update from Gnulib.
diff --git a/README b/README
index 694b3aa4c94..512af970603 100644
--- a/README
+++ b/README
@@ -1,3 +1,7 @@
1The feature/android branch is no longer being updated.
2Android support has been integrated into the 'master' branch,
3and will be released in conjunction with Emacs 30.1.
4
1Copyright (C) 2001-2023 Free Software Foundation, Inc. 5Copyright (C) 2001-2023 Free Software Foundation, Inc.
2See the end of the file for license conditions. 6See the end of the file for license conditions.
3 7
diff --git a/configure.ac b/configure.ac
index c77fab3eefd..c6081f73de2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,9 @@ dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
26AC_INIT([GNU Emacs], [30.0.50], [bug-gnu-emacs@gnu.org], [], 26AC_INIT([GNU Emacs], [30.0.50], [bug-gnu-emacs@gnu.org], [],
27 [https://www.gnu.org/software/emacs/]) 27 [https://www.gnu.org/software/emacs/])
28 28
29AC_MSG_ERROR([The feature/android branch is no longer being updated,\
30 as the Android support has been introduced to `master'.])
31
29if test "$XCONFIGURE" = "android"; then 32if test "$XCONFIGURE" = "android"; then
30 # configure is being called recursively to configure Emacs for 33 # configure is being called recursively to configure Emacs for
31 # Android! 34 # Android!