From 5ec4017f5a60ddaf749713177c49b8006db1e843 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 18 Feb 2023 17:54:55 +0200 Subject: [PATCH] Abandon master branch See osdn #44375 Signed-off-by: Marko Lindqvist --- README.md | 2 ++ configure.ac | 7 +++++++ meson.build | 4 ++++ meson_options.txt | 5 +++++ 4 files changed, 18 insertions(+) diff --git a/README.md b/README.md index 18ff529980..26ada751ba 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Freeciv ======= +This branch ('master') has been abandoned. Use 'main' instead. + [![Build Status](https://github.com/freeciv/freeciv/workflows/continuous%20integration/badge.svg)](https://github.com/freeciv/freeciv/actions?query=workflow%3A%22continuous+integration%22) [![License: GPL v2](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html) diff --git a/configure.ac b/configure.ac index b0371d9974..3d12b469a4 100644 --- a/configure.ac +++ b/configure.ac @@ -110,6 +110,13 @@ if test "x$fc_cv_malloc_zero_ok" = "xyes" ; then AC_DEFINE([MALLOC_ZERO_OK], [1], [It's ok to call malloc() for zero bytes]) fi +AC_ARG_ENABLE([abandoned-master], + AS_HELP_STRING([--enable-abandoned-master], [build abandoned master brach]), + [ if test "x${enableval}" != "xyes" ; then + AC_MSG_ERROR([Unsupported value ${enableval} for --enable-abandoned-master]) + fi ], + [AC_MSG_ERROR([Freeciv master branch has been abandoned. Use 'main' instead])]) + dnl set default values fcdb_all=no fcdb_mysql=no diff --git a/meson.build b/meson.build index 32f485eecc..74b790beb8 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,10 @@ project('freeciv', ['c', 'cpp'], meson_version: '>= 0.57.0') +if not get_option('abandoned_master') + error('Freeciv master branch has been abandoned. Use "main" instead.') +endif + c_compiler = meson.get_compiler('c') cxx_compiler = meson.get_compiler('cpp') diff --git a/meson_options.txt b/meson_options.txt index db171b8f38..8bc0eb9cab 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -85,3 +85,8 @@ option('min-win-ver', type: 'string', value: '', description: 'Minimum Windows version to support') + +option('abandoned_master', + type: 'boolean', + value: false, + description: 'Still build abandoned master branch') -- 2.39.1