From e97f1b0946e3723b3e18ce394b5fda766ca24095 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 13 Feb 2022 19:46:29 +0200 Subject: [PATCH 42/42] Drop .serv files that only set rulesetdir Set the rulesetdir directly in the .modpack file instead. See osdn #43439 Signed-off-by: Marko Lindqvist --- data/Makefile.am | 9 +-------- data/alien.modpack | 2 +- data/alien.serv | 4 ---- data/civ1.modpack | 2 +- data/civ1.serv | 8 -------- data/civ2.modpack | 2 +- data/civ2.serv | 8 -------- data/civ2civ3.modpack | 2 +- data/civ2civ3.serv | 4 ---- data/classic.modpack | 2 +- data/classic.serv | 6 ------ data/goldkeep.modpack | 2 +- data/goldkeep.serv | 3 --- data/multiplayer.modpack | 2 +- data/multiplayer.serv | 6 ------ data/sandbox.modpack | 2 +- data/sandbox.serv | 4 ---- data/webperimental.modpack | 2 +- meson.build | 6 +++++- 19 files changed, 15 insertions(+), 61 deletions(-) delete mode 100644 data/alien.serv delete mode 100644 data/civ1.serv delete mode 100644 data/civ2.serv delete mode 100644 data/civ2civ3.serv delete mode 100644 data/classic.serv delete mode 100644 data/goldkeep.serv delete mode 100644 data/multiplayer.serv delete mode 100644 data/sandbox.serv diff --git a/data/Makefile.am b/data/Makefile.am index 5c76717ee0..d8d4c3902a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -29,19 +29,12 @@ endif SRV_RE_FILES = \ civ1.modpack \ - civ1.serv \ civ2.modpack \ - civ2.serv \ classic.modpack \ - classic.serv \ default.serv \ multiplayer.modpack \ - multiplayer.serv \ alien.modpack \ - alien.serv \ - civ2civ3.modpack \ - civ2civ3.serv \ - sandbox.serv + civ2civ3.modpack if SERVER SERVER_FILES = $(SRV_RE_FILES) diff --git a/data/alien.modpack b/data/alien.modpack index 4feb39eb15..525f63f946 100644 --- a/data/alien.modpack +++ b/data/alien.modpack @@ -9,4 +9,4 @@ name = "alien" ruleset = TRUE [ruleset] -serv = "alien.serv" +rulesetdir = "alien" diff --git a/data/alien.serv b/data/alien.serv deleted file mode 100644 index 1931e91ad9..0000000000 --- a/data/alien.serv +++ /dev/null @@ -1,4 +0,0 @@ -# Server commands for Freeciv Alien World ruleset -# - -rulesetdir alien diff --git a/data/civ1.modpack b/data/civ1.modpack index f8622d5a03..607b671775 100644 --- a/data/civ1.modpack +++ b/data/civ1.modpack @@ -9,4 +9,4 @@ name = "civ1" ruleset = TRUE [ruleset] -serv = "civ1.serv" +rulesetdir = "civ1" diff --git a/data/civ1.serv b/data/civ1.serv deleted file mode 100644 index c807221288..0000000000 --- a/data/civ1.serv +++ /dev/null @@ -1,8 +0,0 @@ -# Server commands to make rules similar to Civ1. -# -# Use this as, eg, "./fcser -r data/civ1.serv" -# -# Civ1 start: -rulesetdir civ1 - -# changed game settings are defined in game.ruleset diff --git a/data/civ2.modpack b/data/civ2.modpack index 94152cd926..86f6603f48 100644 --- a/data/civ2.modpack +++ b/data/civ2.modpack @@ -9,4 +9,4 @@ name = "civ2" ruleset = TRUE [ruleset] -serv = "civ2.serv" +rulesetdir = "civ2" diff --git a/data/civ2.serv b/data/civ2.serv deleted file mode 100644 index a1b912b66e..0000000000 --- a/data/civ2.serv +++ /dev/null @@ -1,8 +0,0 @@ -# Server commands to make rules similar to Civ2. -# -# Use this as, eg, "./fcser -r data/civ2.serv" -# -# Civ2 start: -rulesetdir civ2 - -# changed game settings are defined in game.ruleset diff --git a/data/civ2civ3.modpack b/data/civ2civ3.modpack index a9c8e0e3f2..19752d701b 100644 --- a/data/civ2civ3.modpack +++ b/data/civ2civ3.modpack @@ -9,4 +9,4 @@ name = "civ2civ3" ruleset = TRUE [ruleset] -serv = "civ2civ3.serv" +rulesetdir = "civ2civ3" diff --git a/data/civ2civ3.serv b/data/civ2civ3.serv deleted file mode 100644 index 3e2f9caf8f..0000000000 --- a/data/civ2civ3.serv +++ /dev/null @@ -1,4 +0,0 @@ -# Server commands to make Civ2Civ3 Freeciv rules -# - -rulesetdir civ2civ3 diff --git a/data/classic.modpack b/data/classic.modpack index 9982db196c..ad06fcd9a2 100644 --- a/data/classic.modpack +++ b/data/classic.modpack @@ -9,4 +9,4 @@ name = "classic" ruleset = TRUE [ruleset] -serv = "classic.serv" +rulesetdir = "classic" diff --git a/data/classic.serv b/data/classic.serv deleted file mode 100644 index 18a8cb98cb..0000000000 --- a/data/classic.serv +++ /dev/null @@ -1,6 +0,0 @@ -# Server commands to use classic Freeciv rules -# - -rulesetdir classic - -# changed game settings are defined in game.ruleset diff --git a/data/goldkeep.modpack b/data/goldkeep.modpack index 249bf16361..7dae123b31 100644 --- a/data/goldkeep.modpack +++ b/data/goldkeep.modpack @@ -9,4 +9,4 @@ name = "goldkeep" ruleset = TRUE [ruleset] -serv = "goldkeep.serv" +rulesetdir = "goldkeep" diff --git a/data/goldkeep.serv b/data/goldkeep.serv deleted file mode 100644 index 78e4737dda..0000000000 --- a/data/goldkeep.serv +++ /dev/null @@ -1,3 +0,0 @@ -# Server commands to start with an goldkeep ruleset -# Use this as, eg, "./fcser -r data/goldkeep.serv" -rulesetdir goldkeep diff --git a/data/multiplayer.modpack b/data/multiplayer.modpack index 66de221ebb..09418c70bc 100644 --- a/data/multiplayer.modpack +++ b/data/multiplayer.modpack @@ -9,4 +9,4 @@ name = "multiplayer" ruleset = TRUE [ruleset] -serv = "multiplayer.serv" +rulesetdir = "multiplayer" diff --git a/data/multiplayer.serv b/data/multiplayer.serv deleted file mode 100644 index c875282d7b..0000000000 --- a/data/multiplayer.serv +++ /dev/null @@ -1,6 +0,0 @@ -# Server commands to make multiplayer Freeciv rules -# - -rulesetdir multiplayer - -# changed game settings are defined in game.ruleset diff --git a/data/sandbox.modpack b/data/sandbox.modpack index 7fa3785bd0..45a60a9c0b 100644 --- a/data/sandbox.modpack +++ b/data/sandbox.modpack @@ -9,4 +9,4 @@ name = "sandbox" ruleset = TRUE [ruleset] -serv = "sandbox.serv" +rulesetdir = "sandbox" diff --git a/data/sandbox.serv b/data/sandbox.serv deleted file mode 100644 index da9107489a..0000000000 --- a/data/sandbox.serv +++ /dev/null @@ -1,4 +0,0 @@ -# Server commands to make sandbox Freeciv rules -# - -rulesetdir sandbox diff --git a/data/webperimental.modpack b/data/webperimental.modpack index 7c5dc818a7..ba4ab23590 100644 --- a/data/webperimental.modpack +++ b/data/webperimental.modpack @@ -9,4 +9,4 @@ name = "webperimental" ruleset = TRUE [ruleset] -serv = "webperimental.serv" +rulesetdir = "webperimental" diff --git a/meson.build b/meson.build index e28bcb5100..080305f80a 100644 --- a/meson.build +++ b/meson.build @@ -3034,7 +3034,6 @@ ruleset_files = [ foreach rs : rulesets install_data( - join_paths('data', rs + '.serv'), join_paths('data', rs + '.modpack'), install_dir : join_paths(get_option('datadir'), 'freeciv') ) @@ -3046,6 +3045,11 @@ foreach rs : rulesets endforeach endforeach +install_data( + 'data/stub.serv', + install_dir : join_paths(get_option('datadir'), 'freeciv') + ) + install_data( 'data/civ2civ3/README.civ2civ3', install_dir : join_paths(get_option('datadir'), 'freeciv/civ2civ3') -- 2.34.1