From 5f1be50eb11b24d9de01342dc0f9b30c6b1f4f38 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 20 Jan 2022 16:48:50 +0200 Subject: [PATCH 37/37] Include stub ruleset to the distribution See osdn #43618 Signed-off-by: Marko Lindqvist --- configure.ac | 2 ++ data/Makefile.am | 5 +++-- data/stub/.gitignore | 2 ++ data/stub/Makefile.am | 22 ++++++++++++++++++++++ data/stub/nations/.gitignore | 2 ++ data/stub/nations/Makefile.am | 10 ++++++++++ meson.build | 9 ++++++++- 7 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 data/stub/.gitignore create mode 100644 data/stub/Makefile.am create mode 100644 data/stub/nations/.gitignore create mode 100644 data/stub/nations/Makefile.am diff --git a/configure.ac b/configure.ac index 7922420943..b8b9dfe706 100644 --- a/configure.ac +++ b/configure.ac @@ -1773,6 +1773,8 @@ AC_CONFIG_FILES([Makefile data/civ2civ3/Makefile data/civ1/Makefile data/civ2/Makefile + data/stub/Makefile + data/stub/nations/Makefile data/scenarios/Makefile data/nation/Makefile data/ruledit/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 8e773e33ec..10749f456a 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -78,7 +78,8 @@ else CLIENTDATADIRS = endif -SRV_RE_DATADIRS = default classic civ1 civ2 sandbox multiplayer alien civ2civ3 nation +SRV_RE_DATADIRS = default classic civ1 civ2 sandbox multiplayer \ + alien civ2civ3 stub nation if SERVER SERVERDATADIRS = $(SRV_RE_DATADIRS) scenarios else @@ -98,7 +99,7 @@ endif if CLIENT ICONS = freeciv-client.png else -ICONS = +ICONS = endif icondir = $(prefix)/share/pixmaps diff --git a/data/stub/.gitignore b/data/stub/.gitignore new file mode 100644 index 0000000000..9ee6454019 --- /dev/null +++ b/data/stub/.gitignore @@ -0,0 +1,2 @@ +/Makefile.in +/Makefile diff --git a/data/stub/Makefile.am b/data/stub/Makefile.am new file mode 100644 index 0000000000..ea148ef257 --- /dev/null +++ b/data/stub/Makefile.am @@ -0,0 +1,22 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/stub + +SUBDIRS = nations + +pkgdata_DATA = \ + buildings.ruleset \ + cities.ruleset \ + effects.ruleset \ + script.lua \ + parser.lua \ + styles.ruleset \ + game.ruleset \ + governments.ruleset \ + nations.ruleset \ + techs.ruleset \ + terrain.ruleset \ + units.ruleset + +EXTRA_DIST = $(pkgdata_DATA) diff --git a/data/stub/nations/.gitignore b/data/stub/nations/.gitignore new file mode 100644 index 0000000000..9ee6454019 --- /dev/null +++ b/data/stub/nations/.gitignore @@ -0,0 +1,2 @@ +/Makefile.in +/Makefile diff --git a/data/stub/nations/Makefile.am b/data/stub/nations/Makefile.am new file mode 100644 index 0000000000..ab14ea96be --- /dev/null +++ b/data/stub/nations/Makefile.am @@ -0,0 +1,10 @@ +## Process this file with automake to produce Makefile.in + +## Override automake so that "make install" puts these in proper place: +pkgdatadir = $(datadir)/$(PACKAGE)/stub/nations + +pkgdata_DATA = \ + barbarian.ruleset \ + generic.ruleset + +EXTRA_DIST = $(pkgdata_DATA) diff --git a/meson.build b/meson.build index b9203e932e..cbae771343 100644 --- a/meson.build +++ b/meson.build @@ -2976,7 +2976,8 @@ rulesets = [ 'alien', 'sandbox', 'civ1', - 'civ2' + 'civ2', + 'stub' ] ruleset_files = [ @@ -3042,6 +3043,12 @@ install_data( install_dir : join_paths(get_option('datadir'), 'freeciv/alien/nation') ) +install_data( + 'data/stub/nations/barbarian.ruleset', + 'data/stub/nations/generic.ruleset', + install_dir : join_paths(get_option('datadir'), 'freeciv/stub/nations') + ) + install_data( 'data/sandbox/README.sandbox', 'data/sandbox/luadata.txt', -- 2.34.1