From f3ab232ef86bfdb7ef858e042ed13e709a219b12 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 17 Apr 2026 03:47:09 +0300 Subject: [PATCH 22/22] Drop granularity from tarball and installation See RM #1996 Signed-off-by: Marko Lindqvist --- data/Makefile.am | 5 ++--- data/granularity/Makefile.am | 22 ---------------------- meson.build | 7 ------- tests/rs_test_res/ruleset_list_dist.txt | 1 - tests/rs_test_res/ruleset_list_opt.txt | 1 + translations/core/POTFILES.in | 9 --------- 6 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 data/granularity/Makefile.am diff --git a/data/Makefile.am b/data/Makefile.am index bf845c43de..a380b70620 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -41,8 +41,7 @@ SRV_RE_FILES = \ multiplayer.modpack \ alien.modpack \ civ2civ3.modpack \ - sandbox.modpack \ - granularity.modpack + sandbox.modpack if SERVER SERVER_FILES = $(SRV_RE_FILES) @@ -86,7 +85,7 @@ CLIENTDATADIRS = endif SRV_RE_DATADIRS = default classic civ1 civ2 sandbox multiplayer \ - alien civ2civ3 granularity stub nation + alien civ2civ3 stub nation if SERVER SERVERDATADIRS = $(SRV_RE_DATADIRS) scenarios else diff --git a/data/granularity/Makefile.am b/data/granularity/Makefile.am deleted file mode 100644 index 03673bba01..0000000000 --- a/data/granularity/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Override automake so that "make install" puts these in proper place: -pkgdatadir = $(datadir)/$(PACKAGE)/granularity - -pkgdata_DATA = \ - actions.ruleset \ - buildings.ruleset \ - cities.ruleset \ - effects.ruleset \ - script.lua \ - parser.lua \ - styles.ruleset \ - game.ruleset \ - governments.ruleset \ - nations.ruleset \ - techs.ruleset \ - terrain.ruleset \ - units.ruleset \ - README.granularity - -EXTRA_DIST = $(pkgdata_DATA) diff --git a/meson.build b/meson.build index ff3295deb3..81c959ad70 100644 --- a/meson.build +++ b/meson.build @@ -4499,7 +4499,6 @@ rulesets = [ 'sandbox', 'civ1', 'civ2', - 'granularity', 'stub' ] @@ -4528,7 +4527,6 @@ install_data( 'data/sandbox.modpack', 'data/civ1.modpack', 'data/civ2.modpack', - 'data/granularity.modpack', install_dir : join_paths(get_option('datadir'), 'freeciv') ) @@ -4562,11 +4560,6 @@ install_data( install_dir : join_paths(get_option('datadir'), 'freeciv/alien') ) -install_data( - 'data/granularity/README.granularity', - install_dir : join_paths(get_option('datadir'), 'freeciv/granularity') - ) - install_data( 'data/alien/nation/adventurers.ruleset', 'data/alien/nation/galacticsound.ruleset', diff --git a/tests/rs_test_res/ruleset_list_dist.txt b/tests/rs_test_res/ruleset_list_dist.txt index 6328a44738..a4264f2033 100644 --- a/tests/rs_test_res/ruleset_list_dist.txt +++ b/tests/rs_test_res/ruleset_list_dist.txt @@ -5,5 +5,4 @@ civ2civ3 classic multiplayer sandbox -granularity stub diff --git a/tests/rs_test_res/ruleset_list_opt.txt b/tests/rs_test_res/ruleset_list_opt.txt index fdc556bd5e..e7bacdef85 100644 --- a/tests/rs_test_res/ruleset_list_opt.txt +++ b/tests/rs_test_res/ruleset_list_opt.txt @@ -1,2 +1,3 @@ goldkeep webperimental +granularity diff --git a/translations/core/POTFILES.in b/translations/core/POTFILES.in index b53d85ebfd..52de81dfef 100644 --- a/translations/core/POTFILES.in +++ b/translations/core/POTFILES.in @@ -323,15 +323,6 @@ data/multiplayer/styles.ruleset data/multiplayer/techs.ruleset data/multiplayer/terrain.ruleset data/multiplayer/units.ruleset -data/granularity/actions.ruleset -data/granularity/buildings.ruleset -data/granularity/cities.ruleset -data/granularity/game.ruleset -data/granularity/governments.ruleset -data/granularity/styles.ruleset -data/granularity/techs.ruleset -data/granularity/terrain.ruleset -data/granularity/units.ruleset data/nation/american.ruleset data/nation/animals.ruleset data/nation/apache.ruleset -- 2.53.0