Project

General

Profile

Download (12.6 KB)

Feature #39 » 0037-Move-ruleset-loading-files-to-server-ruleset.patch

Marko Lindqvist, 12/09/2023 01:50 AM

View differences:

configure.ac
client/gui-qt/Makefile
client/gui-stub/Makefile
client/luascript/Makefile
server/Makefile
server/Makefile
server/advisors/Makefile
server/generator/Makefile
server/generator/Makefile
server/ruleset/Makefile
server/savegame/Makefile
server/scripting/Makefile
server/scripting/Makefile
tools/Makefile
tools/fcmp/Makefile
tools/manual/Makefile
meson.build
'common/aicore')
server_inc = [common_inc, include_directories('server', 'server/advisors',
'server/scripting', 'server/generator', 'server/savegame',
'ai', 'ai/classic')]
'server/scripting', 'server/generator', 'server/ruleset',
'server/savegame', 'ai', 'ai/classic')]
client_inc = [common_inc, include_directories('client', 'client/include',
'client/luascript', 'client/agents')]
......
'server/generator/mapgen_utils.c',
'server/generator/startpos.c',
'server/generator/temperature_map.c',
'server/ruleset/rscompat.c',
'server/ruleset/rssanity.c',
'server/ruleset/ruleload.c',
'server/savegame/savecompat.c',
'server/savegame/savegame2.c',
'server/savegame/savegame3.c',
......
'server/notify.c',
'server/plrhand.c',
'server/report.c',
'server/rscompat.c',
'server/rssanity.c',
'server/ruleset.c',
'server/sanitycheck.c',
'server/score.c',
'server/sernet.c',
server/Makefile.am
## Process this file with automake to produce Makefile.in
SUBDIRS = advisors generator savegame scripting
SUBDIRS = advisors generator savegame scripting ruleset
bin_PROGRAMS = freeciv-server
......
-I$(top_srcdir)/utility \
-I$(srcdir)/advisors \
-I$(srcdir)/generator \
-I$(srcdir)/ruleset \
-I$(srcdir)/savegame \
-I$(srcdir)/scripting \
-I$(top_srcdir)/dependencies/tinycthread \
......
plrhand.h \
report.c \
report.h \
rscompat.c \
rscompat.h \
rssanity.c \
rssanity.h \
ruleset.c \
ruleset.h \
sanitycheck.c \
sanitycheck.h \
score.c \
......
$(top_builddir)/ai/libaicommon.la \
$(top_builddir)/server/advisors/libadvisors.la \
$(top_builddir)/server/generator/libgenerator.la \
$(top_builddir)/server/ruleset/libruleload.la \
$(top_builddir)/server/savegame/libsavegame.la \
$(top_builddir)/server/scripting/libscripting_fcdb.la \
$(top_builddir)/server/scripting/libscripting_server.la
server/connecthand.c
#include "notify.h"
#include "plrhand.h"
#include "report.h"
#include "ruleset.h"
#include "ruleload.h"
#include "sernet.h"
#include "settings.h"
#include "srv_main.h"
server/ruleset/Makefile.am
## Process this file with automake to produce Makefile.in
noinst_LTLIBRARIES = libruleload.la
AM_CPPFLAGS = \
-I$(top_srcdir)/utility \
-I$(top_srcdir)/common \
-I$(top_srcdir)/common/aicore \
-I$(top_srcdir)/common/networking \
-I$(top_srcdir)/common/scriptcore \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/advisors \
-I$(top_srcdir)/server/scripting \
-I$(top_srcdir)/gen_headers/enums
libruleload_la_SOURCES = \
rscompat.c \
rscompat.h \
rssanity.c \
rssanity.h \
ruleload.c \
ruleload.h
server/rscompat.c → server/ruleset/rscompat.c
/* server */
#include "rssanity.h"
#include "ruleset.h"
#include "ruleload.h"
#include "settings.h"
#include "rscompat.h"
server/rscompat.h → server/ruleset/rscompat.h
#include "support.h"
/* server */
#include "ruleset.h"
#include "ruleload.h"
#include "settings.h"
#define RULESET_COMPAT_CAP "+Freeciv-ruleset-3.2-Devel-2022.Feb.02"
server/rssanity.c → server/ruleset/rssanity.c
#include "tech.h"
/* server */
#include "ruleset.h"
#include "ruleload.h"
#include "settings.h"
#include "rssanity.h"
server/ruleset.c → server/ruleset/ruleload.c
/* server/scripting */
#include "script_server.h"
#include "ruleset.h"
#include "ruleload.h"
/* RULESET_SUFFIX already used, no leading dot here */
#define RULES_SUFFIX "ruleset"
server/savegame/Makefile.am
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/advisors \
-I$(top_srcdir)/server/generator \
-I$(top_srcdir)/server/ruleset \
-I$(top_srcdir)/server/scripting \
-I$(top_srcdir)/ai \
-I$(top_srcdir)/dependencies/tinycthread \
server/savegame/savegame2.c
#include "notify.h"
#include "plrhand.h"
#include "report.h"
#include "ruleset.h"
#include "ruleload.h"
#include "sanitycheck.h"
#include "savecompat.h"
#include "score.h"
server/savegame/savegame3.c
#include "notify.h"
#include "plrhand.h"
#include "report.h"
#include "ruleset.h"
#include "ruleload.h"
#include "sanitycheck.h"
#include "savecompat.h"
#include "score.h"
server/srv_main.c
#include "notify.h"
#include "plrhand.h"
#include "report.h"
#include "ruleset.h"
#include "ruleload.h"
#include "sanitycheck.h"
#include "score.h"
#include "sernet.h"
server/stdinhand.c
#include "notify.h"
#include "plrhand.h"
#include "report.h"
#include "ruleset.h"
#include "ruleload.h"
#include "sanitycheck.h"
#include "score.h"
#include "sernet.h"
tools/Makefile.am
-I$(top_srcdir)/common/aicore \
-I$(top_srcdir)/common/networking \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/ruleset \
-I$(top_srcdir)/tools/ruleutil \
-I$(top_srcdir)/tools/shared \
-I$(top_srcdir)/dependencies/tinycthread \
tools/manual/Makefile.am
-I$(top_srcdir)/common/aicore \
-I$(top_srcdir)/common/networking \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/ruleset \
-I$(top_srcdir)/client \
-I$(top_srcdir)/client/include \
-I$(top_srcdir)/tools/shared \
tools/manual/fc_manual.c
#include "tilespec.h"
/* server */
#include "ruleset.h"
#include "ruleload.h"
#include "settings.h"
#include "sernet.h"
#include "srv_main.h"
tools/ruledit/Makefile.am
-I$(top_srcdir)/common/aicore \
-I$(top_srcdir)/common/networking \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/ruleset \
-I$(top_srcdir)/tools/shared \
-I$(top_srcdir)/tools/ruleutil \
-I$(top_srcdir)/dependencies/tinycthread \
tools/ruledit/ruledit_qt.cpp
#include "version.h"
// server
#include "ruleset.h"
#include "ruleload.h"
// ruledit
#include "conversion_log.h"
tools/ruleup.c
#include "fc_interface.h"
/* server */
#include "ruleset.h"
#include "ruleload.h"
#include "sernet.h"
#include "settings.h"
tools/ruleutil/Makefile.am
-I$(top_srcdir)/common/aicore \
-I$(top_srcdir)/common/networking \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/ruleset \
-I$(top_srcdir)/dependencies/tinycthread \
-I$(top_srcdir)/gen_headers/enums
tools/ruleutil/rulesave.c
#include "version.h"
/* server */
#include "ruleset.h"
#include "ruleload.h"
#include "settings.h"
/* tools/ruleutil */
    (1-1/1)