From 615b8f33420f4304bc5fd05e8a34e2eb9f9a1979 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 7 Aug 2023 08:56:28 +0800 Subject: [PATCH] Disable building the feature/android branch * configure.ac: Disable building Emacs from this branch. * README: Mention that this branch is no longer receiving updates. --- ChangeLog.android | 4 ++++ README | 4 ++++ configure.ac | 3 +++ 3 files changed, 11 insertions(+) diff --git a/ChangeLog.android b/ChangeLog.android index 3cb88b6f10c..2dfe9b540d0 100644 --- a/ChangeLog.android +++ b/ChangeLog.android @@ -1,5 +1,9 @@ 2023-08-07 Po Lu + * configure.ac: Disable building Emacs from this branch. + + * README: Mention that this branch is no longer receiving updates. + * nt/mingw-cfg.site: Remove additions for Gnulib printf. * m4, lib: Update from Gnulib. diff --git a/README b/README index 694b3aa4c94..512af970603 100644 --- a/README +++ b/README @@ -1,3 +1,7 @@ +The feature/android branch is no longer being updated. +Android support has been integrated into the 'master' branch, +and will be released in conjunction with Emacs 30.1. + Copyright (C) 2001-2023 Free Software Foundation, Inc. See the end of the file for license conditions. 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. AC_INIT([GNU Emacs], [30.0.50], [bug-gnu-emacs@gnu.org], [], [https://www.gnu.org/software/emacs/]) +AC_MSG_ERROR([The feature/android branch is no longer being updated,\ + as the Android support has been introduced to `master'.]) + if test "$XCONFIGURE" = "android"; then # configure is being called recursively to configure Emacs for # Android! -- 2.39.2