Convert the Makefile.am and image_info changes to be patches. Update installation instructions to reflect this change.
SilverNexus
parent
52c02fd1d4
commit
3a5931047d
|
|
@ -1,116 +0,0 @@
|
||||||
pkgstatedir = @pkgstatedir@
|
|
||||||
pkgconfdir = @pkgconfdir@
|
|
||||||
|
|
||||||
dist_noinst_SCRIPTS = collect util.pl
|
|
||||||
dist_pkgdata_DATA = \
|
|
||||||
arch/artifacts \
|
|
||||||
arch/attackmess \
|
|
||||||
arch/formulae \
|
|
||||||
arch/image_info \
|
|
||||||
arch/materials \
|
|
||||||
arch/messages \
|
|
||||||
arch/races \
|
|
||||||
def_help \
|
|
||||||
animations archetypes bmaps.paths crossfire.0 crossfire.1 crossfire.2 faces smooth treasures
|
|
||||||
|
|
||||||
CONF_FILES = \
|
|
||||||
config/ban_file \
|
|
||||||
config/dm_file \
|
|
||||||
config/exp_table \
|
|
||||||
config/forbid \
|
|
||||||
config/metaserver2 \
|
|
||||||
config/motd \
|
|
||||||
config/news \
|
|
||||||
config/rules \
|
|
||||||
config/settings \
|
|
||||||
config/stat_bonus
|
|
||||||
|
|
||||||
VAR_FILES = highscore banish_file bookarch temp.maps clockdata
|
|
||||||
EXTRA_DIST = README .collect-stamp $(CONF_FILES)
|
|
||||||
|
|
||||||
helpdir=$(pkgdatadir)/help
|
|
||||||
dist_help_DATA = help/*.en help/*.fr
|
|
||||||
|
|
||||||
wizhelpdir=$(pkgdatadir)/wizhelp
|
|
||||||
dist_wizhelp_DATA = wizhelp/*.en wizhelp/*.fr
|
|
||||||
|
|
||||||
admdir=$(pkgdatadir)/adm
|
|
||||||
dist_adm_SCRIPTS = adm/archsearch.pl adm/collect_images.pl
|
|
||||||
|
|
||||||
i18ndir=$(pkgdatadir)/i18n
|
|
||||||
dist_i18n_DATA = i18n/messages.en \
|
|
||||||
i18n/messages.fr
|
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = archetypes faces .collect-stamp \
|
|
||||||
animations smooth treasures bmaps.paths crossfire.0 crossfire.1 crossfire.2
|
|
||||||
|
|
||||||
PERL = @PERL@
|
|
||||||
|
|
||||||
crossfire.0: bmaps.paths
|
|
||||||
$(PERL) $(srcdir)/adm/collect_images.pl -src $(srcdir) -png
|
|
||||||
|
|
||||||
.collect-stamp:
|
|
||||||
touch .collect-stamp
|
|
||||||
|
|
||||||
do-collect:
|
|
||||||
$(PERL) -I$(srcdir) collect $(builddir)/arch
|
|
||||||
$(PERL) $(srcdir)/adm/collect_images.pl -src $(srcdir) -png
|
|
||||||
|
|
||||||
archonly:
|
|
||||||
$(PERL) -I$(srcdir) collect $(builddir)/arch ARCHONLY
|
|
||||||
|
|
||||||
archetypes faces animations bmaps.paths smooth: .collect-stamp
|
|
||||||
touch .collect-stamp
|
|
||||||
$(MAKE) do-collect
|
|
||||||
|
|
||||||
install-data-local: archetypes crossfire.0 faces animations smooth collect util.pl
|
|
||||||
@$(NORMAL_INSTALL)
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
|
|
||||||
for i in $(CONF_FILES); do \
|
|
||||||
if [ ! -f $(DESTDIR)$(pkgconfdir)/`basename $$i` ]; then \
|
|
||||||
echo "Installing $$i"; \
|
|
||||||
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(pkgconfdir); \
|
|
||||||
fi \
|
|
||||||
done
|
|
||||||
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(pkgstatedir)
|
|
||||||
for i in $(VAR_FILES) ; do \
|
|
||||||
touch $(DESTDIR)$(pkgstatedir)/$$i ; \
|
|
||||||
done
|
|
||||||
|
|
||||||
@for i in account datafiles players unique-items template-maps maps; do \
|
|
||||||
if [ ! -d $(DESTDIR)$(pkgstatedir)/$$i ]; then \
|
|
||||||
echo "Creating directory $(pkgstatedir)/$$i"; \
|
|
||||||
$(mkinstalldirs) $(DESTDIR)$(pkgstatedir)/$$i; \
|
|
||||||
fi; \
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
# Uninstall unchanged config/var files so make distcheck is happy
|
|
||||||
# but leave changed file, so no configuration/game state is lost
|
|
||||||
uninstall-local:
|
|
||||||
-for i in $(CONF_FILES); do \
|
|
||||||
if test ! -f $(DESTDIR)$(pkgconfdir)/$$i ; then \
|
|
||||||
continue ; \
|
|
||||||
fi ; \
|
|
||||||
if diff -q $(srcdir)/$$i $(DESTDIR)$(pkgconfdir)/$$i ; then \
|
|
||||||
rm -f $(DESTDIR)$(pkgconfdir)/$$i ; \
|
|
||||||
fi ; \
|
|
||||||
done
|
|
||||||
-for i in $(VAR_FILES) ; do \
|
|
||||||
if test ! -f $(DESTDIR)$(pkgstatedir)/$$i ; then \
|
|
||||||
continue ;\
|
|
||||||
fi ; \
|
|
||||||
if test `wc -c $(DESTDIR)$(pkgstatedir)/$$i|$(AWK) '{ print $$1 }'` -eq "0" ; then \
|
|
||||||
rm -f $(DESTDIR)$(pkgstatedir)/$$i ; \
|
|
||||||
fi ; \
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
# This block makes the archive of the arch directory.
|
|
||||||
archive::
|
|
||||||
$(AMTAR) -ch --exclude=dev --exclude=.svn -f ${PACKAGE}-arch-${VERSION}.tar arch
|
|
||||||
|
|
||||||
libArch:
|
|
||||||
tar cvf A`perl puredate.pl`.tar arch treasures
|
|
||||||
gzip A`perl puredate.pl`.tar
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
Index: lib/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- lib/Makefile.am (revision 21494)
|
||||||
|
+++ lib/Makefile.am (working copy)
|
||||||
|
@@ -11,7 +11,7 @@
|
||||||
|
arch/messages \
|
||||||
|
arch/races \
|
||||||
|
def_help \
|
||||||
|
- animations archetypes bmaps.paths crossfire.0 crossfire.1 faces smooth treasures
|
||||||
|
+ animations archetypes bmaps.paths crossfire.0 crossfire.1 crossfire.2 faces smooth treasures
|
||||||
|
|
||||||
|
CONF_FILES = \
|
||||||
|
config/ban_file \
|
||||||
|
@@ -42,7 +42,7 @@
|
||||||
|
i18n/messages.fr
|
||||||
|
|
||||||
|
MAINTAINERCLEANFILES = archetypes faces .collect-stamp \
|
||||||
|
- animations smooth treasures bmaps.paths crossfire.0 crossfire.1
|
||||||
|
+ animations smooth treasures bmaps.paths crossfire.0 crossfire.1 crossfire.2
|
||||||
|
|
||||||
|
PERL = @PERL@
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
How to install the retro image set into an existing server:
|
How to install the retro image set into an existing server:
|
||||||
|
|
||||||
1. Extract/copy image_info and the folders of images into an existing arch directory.
|
1. Apply image_info.patch and merge the folders of images into an existing arch directory.
|
||||||
2. Copy Makefile.server.lib.am to your server's lib folder, and merge it with the Makefile.am there.
|
2. Apply Makefile.server.lib.am.patch to lib/Makefile.am in the server code.
|
||||||
3. Run autogen.sh at the top level of the server to regenerate the Makefiles.
|
3. Run autogen.sh at the top level of the server to regenerate the Makefiles.
|
||||||
4. Ensure that there is a link to arch (or your arch folder is directly stored) in the lib folder.
|
4. Ensure that there is a link to arch (or your arch folder is directly stored) in the lib folder.
|
||||||
5. Run `make do-collect` from the lib folder of the server.
|
5. Run `make do-collect` from the lib folder of the server.
|
||||||
|
|
|
||||||
31
image_info
31
image_info
|
|
@ -1,31 +0,0 @@
|
||||||
# "$Id: image_info 21127 2020-03-03 03:40:26Z partmedia $";
|
|
||||||
#
|
|
||||||
# This file describes the various image files installed.
|
|
||||||
# For more information on how all this works and about adding new
|
|
||||||
# image sets, see the doc/Developer/images file.
|
|
||||||
#
|
|
||||||
# The format of each line:
|
|
||||||
# num:extension:long name:fallback:geometry:extension:description
|
|
||||||
# num is the set number.
|
|
||||||
# extension is the extension that image set uses (eg, base, clsc)
|
|
||||||
# long name is just that - a longer (more english) name, eg, classic instead
|
|
||||||
# of clsc. This is really just used by the client for it to map the
|
|
||||||
# image names. Its not really intuitive for users to say -image clsc
|
|
||||||
# fallback is what set to fallback to if the image does not exist in
|
|
||||||
# that set. In the end, all sets must fall back to set 0.
|
|
||||||
# geometry is in width x height form. This is used by the client so it
|
|
||||||
# knows the spacing to use. Images in the set could be of different
|
|
||||||
# sizes (eg, a 4 spaces image would be larger), but this is the normal
|
|
||||||
# spacing that the client should use.
|
|
||||||
# extension is for future use - it is passed to the client. This is mostly
|
|
||||||
# here so that the client can know specific information about certain
|
|
||||||
# image sets.
|
|
||||||
# description is just a longer description that the client can display to the
|
|
||||||
# user.
|
|
||||||
#
|
|
||||||
# NOTE: lines can not be continued with \ - everything must be on one line
|
|
||||||
# for things to work.
|
|
||||||
# Lines that start with # are obviously ignored.
|
|
||||||
0:base:standard:0:32x32:none:The standard image set.
|
|
||||||
1:clsc:classic:0:32x32:none:Classic and new styling.
|
|
||||||
2:rtro:retro:1:24x24:none:XPM-era nostalgia
|
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
Index: image_info
|
||||||
|
===================================================================
|
||||||
|
--- image_info (revision 21435)
|
||||||
|
+++ image_info (working copy)
|
||||||
|
@@ -28,3 +28,4 @@
|
||||||
|
# Lines that start with # are obviously ignored.
|
||||||
|
0:base:standard:0:32x32:none:The standard image set.
|
||||||
|
1:clsc:classic:0:32x32:none:Classic and new styling.
|
||||||
|
+2:rtro:retro:1:24x24:none:XPM-era nostalgia
|
||||||
Loading…
Reference in New Issue